Skip to content

H
huaxin-rq
Commit d2019e2d authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

监测设备功能添加

parent 3d8735a8
Show whitespace changes
Inline Side-by-side
Showing with 430 additions and 127 deletions
huaxin-admin/src/main/java/com/zehong/web/controller/gasdata/TGasAlarmController.java
View file @ d2019e2d
......@@ -39,6 +39,17 @@ public class TGasAlarmController extends BaseController
return getDataTable(list);
}
/**
* 获取报警信息
* @param tGasAlarm
* @return
*/
@GetMapping("/getAlarmInfoList")
public AjaxResult getAlarmInfoList(TGasAlarm tGasAlarm) {
List<TGasAlarm> list = tGasAlarmService.selectTGasAlarmList(tGasAlarm);
return AjaxResult.success(list);
}
/**
* 导出报警器报警记录列表
*/
......
huaxin-system/src/main/java/com/zehong/system/domain/TGasData.java
View file @ d2019e2d
package com.zehong.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
......@@ -61,9 +62,22 @@ public class TGasData extends BaseEntity
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "位号", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createdAt;
@Excel(name = "经度")
private BigDecimal longitude;
@Excel(name = "纬度")
private BigDecimal latitude;
private String contacts;
@Excel(name = "联系人")
private String contactsName;
private String contactsTel;
/**上报状态*/
private String reportStatus;
......@@ -205,6 +219,46 @@ public class TGasData extends BaseEntity
this.type = type;
}
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public String getContacts() {
return contacts;
}
public void setContacts(String contacts) {
this.contacts = contacts;
}
public String getContactsName() {
return contactsName;
}
public void setContactsName(String contactsName) {
this.contactsName = contactsName;
}
public String getContactsTel() {
return contactsTel;
}
public void setContactsTel(String contactsTel) {
this.contactsTel = contactsTel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
huaxin-system/src/main/java/com/zehong/system/service/impl/TGasDataServiceImpl.java
View file @ d2019e2d
package com.zehong.system.service.impl;
import java.util.Date;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
......@@ -121,8 +122,8 @@ public class TGasDataServiceImpl implements ITGasDataService
* @return 结果
*/
@Override
public int insertTGasData(TGasData tGasData)
{
public int insertTGasData(TGasData tGasData) {
tGasData.setCreatedAt(new Date());
return tGasDataMapper.insertTGasData(tGasData);
}
......
huaxin-system/src/main/resources/mapper/system/TGasDataMapper.xml
View file @ d2019e2d
......@@ -17,10 +17,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unit" column="unit" />
<result property="tag" column="tag" />
<result property="createdAt" column="created_at" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="contacts" column="contacts" />
</resultMap>
<sql id="selectTGasDataVo">
select id, number,type, position, high_alarm, high_high_alarm, low_alarm, low_low_alarm, `range`, unit, tag, created_at from t_gas_data
SELECT
id,
number,
type,
position,
high_alarm,
high_high_alarm,
low_alarm,
low_low_alarm,
`range`,
unit,
tag,
created_at,
longitude,
latitude,
contacts,
(select GROUP_CONCAT(nick_name) from sys_user where find_in_set(user_id,contacts)) as contactsName,
(select GROUP_CONCAT(NULLIF(phonenumber, '')) from sys_user where find_in_set(user_id,contacts)) as contactsTel
FROM
t_gas_data
</sql>
<select id="selectTGasDataList" parameterType="TGasData" resultMap="TGasDataResult">
......@@ -59,6 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unit != null">unit,</if>
<if test="tag != null">tag,</if>
<if test="createdAt != null">created_at,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="contacts != null">contacts,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="number != null">#{number},</if>
......@@ -72,6 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unit != null">#{unit},</if>
<if test="tag != null">#{tag},</if>
<if test="createdAt != null">#{createdAt},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="contacts != null">#{contacts},</if>
</trim>
</insert>
......@@ -89,6 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="unit != null">unit = #{unit},</if>
<if test="tag != null">tag = #{tag},</if>
<if test="createdAt != null">created_at = #{createdAt},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="contacts != null">contacts = #{contacts},</if>
</trim>
where id = #{id}
</update>
......
huaxin-web/src/api/gasdata/alarm.js
View file @ d2019e2d
......@@ -9,6 +9,15 @@ export function listAlarm(query) {
})
}
//获取所有报警信息
export function getAlarmInfoList(query) {
return request({
url: '/gas/alarm/getAlarmInfoList',
method: 'get',
params: query
})
}
// 查询报警器报警记录详细
export function getAlarm(id) {
return request({
......
huaxin-web/src/views/gasdata/components/DetailInfo.vue
View file @ d2019e2d
<template>
<el-dialog title="设备详情" :visible.sync="detailOpen" width="800px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-dialog title="设备详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-row>
<el-col :span="14">
<el-form label-width="80px">
<el-row>
<el-col :span="12">
......@@ -65,6 +67,12 @@
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人">
<span v-if="detailInfo.contactsName">{{ detailInfo.contactsName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间">
<span v-if="detailInfo.createdAt">{{ detailInfo.createdAt }}</span>
......@@ -73,11 +81,20 @@
</el-col>
</el-row>
</el-form>
</el-col>
<el-col :span="10">
<div id="monitor_dev_map" style="width: 100%;height: 400px;border: 1px solid"></div>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
import { getData } from "@/api/gasdata/data";
import { EditorMap } from "@/utils/mapClass/map";
import { mapGetters } from "vuex";
export default {
name: "detail-info",
data(){
......@@ -95,10 +112,33 @@
getData(gasId).then(res =>{
if(res.code == 200){
this.detailInfo = res.data;
this.initMap();
}
})
},
initMap(){
this.$nextTick(() => {
const path = eval(this.systemSetting.map_center);
let map = new EditorMap(
"monitor_dev_map",
{
center: path,
//mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
zoom: 14.5,
},
this
);
if(this.detailInfo.longitude){
map.control = 1;
map.addDevice(this.detailInfo);
map.map.setCenter([this.detailInfo.longitude,this.detailInfo.latitude])
}
});
}
},
computed: {
...mapGetters(["systemSetting"]),
},
}
</script>
......
huaxin-web/src/views/gasdata/index.vue
View file @ d2019e2d
......@@ -48,7 +48,7 @@
</el-form-item>
</el-form>
<!--<el-row :gutter="10" class="mb8">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
......@@ -56,7 +56,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:data:add']"
v-hasPermi="['gas:data:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -67,7 +67,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:data:edit']"
v-hasPermi="['gas:data:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -78,7 +78,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:data:remove']"
v-hasPermi="['gas:data:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -89,11 +89,11 @@
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:data:export']"
v-hasPermi="['gas:data:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>-->
</el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
......@@ -137,20 +137,20 @@
icon="el-icon-document"
@click="handleDetail(scope.row)"
>详情</el-button>
<!--<el-button
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:data:edit']"
v-hasPermi="['gas:data:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:data:remove']"
>删除</el-button>-->
v-hasPermi="['gas:data:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -164,43 +164,117 @@
/>
<!-- 添加或修改监测设备数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="设备编号" prop="number">
<el-input v-model="form.number" placeholder="请输入设备编号" />
</el-form-item>
<el-form-item label="安装位置" prop="position">
<el-input v-model="form.position" placeholder="请输入安装位置" />
</el-col>
<el-col :span="12">
<el-form-item label="所属厂家" prop="type">
<el-select
v-model="form.type"
placeholder="请选择所属厂家"
size="small"
style="width: 100%"
>
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="位号" prop="tag">
<el-input v-model="form.tag" placeholder="请输入位号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高报" prop="highAlarm">
<el-input v-model="form.highAlarm" placeholder="请输入高报" />
</el-form-item>
<el-form-item label="高高报" prop="highHighAlarm">
<el-input v-model="form.highHighAlarm" placeholder="请输入高高报" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="低报" prop="lowAlarm">
<el-input v-model="form.lowAlarm" placeholder="请输入低报" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低低报" prop="lowLowAlarm">
<el-input v-model="form.lowLowAlarm" placeholder="请输入低低报" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="量程" prop="range">
<el-input v-model="form.range" placeholder="请输入量程" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="位号" prop="tag">
<el-input v-model="form.tag" placeholder="请输入位号" />
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="安装位置" prop="position">
<el-input v-model="form.position" placeholder="请输入安装位置" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="经纬度坐标" prop="longitude">
<el-col :span="8">
<el-input v-model="form.longitude" placeholder="请输入经度"/>
</el-col>
<el-col :span="8" style="margin-left: 20px">
<el-input v-model="form.latitude" placeholder="请输入纬度"/>
</el-col>
<el-col :span="4" style="margin-left: 30px">
<el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
</el-col>
</el-form-item>
<el-form-item label="位号" prop="createdAt">
<el-date-picker clearable size="small"
v-model="form.createdAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择位号">
</el-date-picker>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="联系人" prop="contacts">
<el-select
v-model="contacts"
multiple
placeholder="请选择联系人"
style="width: 100%"
@change="changeContacts"
>
<el-option
v-for="user in userList"
:key="user.userId"
:label="user.nickName"
:value="user.userId"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -211,16 +285,29 @@
<!-- 详情 -->
<DetailInfo ref="detailInfo"/>
<!-- 地图 -->
<GetPos
:dialogVisible.sync="dialogTableVisibles"
:devicePos="devicePos"
@close="dialogcancelFun"
@getPath="getPath"
style="z-index: 3000"
ref="getPos"
/>
</div>
</template>
<script>
import { listData, getData, delData, addData, updateData, exportData } from "@/api/gasdata/data";
import DetailInfo from "./components/DetailInfo";
import GetPos from '@/components/GetPos';
import { userInfoList } from "@/api/system/user";
export default {
name: "Data",
components: {
DetailInfo
DetailInfo,
GetPos,
},
data() {
return {
......@@ -230,6 +317,7 @@ export default {
exportLoading: false,
// 选中数组
ids: [],
numbers: [],
// 非单个禁用
single: true,
// 非多个禁用
......@@ -263,9 +351,26 @@ export default {
form: {},
// 表单校验
rules: {
number: [
{ required: true, message: "设备编号不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "所属厂家不能为空", trigger: "blur" }
],
longitude: [
{ required: true, message: "经纬度不能为空", trigger: "blur" }
],
contacts: [
{ required: true, message: "联系人不能为空", trigger: "blur" }
],
},
deviceStatus: [],
typeOptions: []
typeOptions: [],
dialogTableVisibles: false,
devicePos: [],
userList: [],
//联系人数组
contacts: []
};
},
created() {
......@@ -316,6 +421,8 @@ export default {
tag: null,
createdAt: null
};
this.devicePos = [];
this.contacts = [];
this.resetForm("form");
},
/** 搜索按钮操作 */
......@@ -330,13 +437,15 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.ids = selection.map(item => item.id);
this.numbers = selection.map(item => item.number);
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getUserInfo();
this.open = true;
this.title = "添加监测设备数据";
},
......@@ -346,6 +455,13 @@ export default {
const id = row.id || this.ids
getData(id).then(response => {
this.form = response.data;
if(this.form.longitude){
this.devicePos = [this.form.longitude,this.form.latitude];
}
if(this.form.contacts){
this.contacts = this.form.contacts.split(",");
}
this.getUserInfo();
this.open = true;
this.title = "修改监测设备数据";
});
......@@ -373,7 +489,8 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm('是否确认删除监测设备数据编号为"' + ids + '"的数据项?', "警告", {
const numbers = row.number || this.numbers;
this.$confirm('是否确认删除监测设备数据编号为"' + numbers + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
......@@ -402,6 +519,37 @@ export default {
/**详情*/
handleDetail(row){
this.$refs.detailInfo.openDetail(row.id);
},
/**
* 经纬度坐标方法
*/
MapdialogFun() {
this.dialogTableVisibles = true;
},
/**
* 地图关闭方法
*/
dialogcancelFun() {
this.dialogTableVisibles = false;
},
/**
* 经纬度 选择
* @param res
*/
getPath(res){
//确认选择经纬度
this.form.longitude = res[0];
this.form.latitude = res[1];
},
getUserInfo(){
userInfoList().then(res =>{
if(res.code == 200){
this.userList = res.data;
}
})
},
changeContacts(val){
this.form.contacts = val.join(",");
}
}
};
......
huaxin-web/src/views/indexcomponents/gaodemap/index.vue
View file @ d2019e2d
......@@ -46,6 +46,7 @@ import PipeInfo from "./components/PipeInfo";
import axios from "axios";
import gcoord from "gcoord";
import LineTips from "./components/LineTips";
import { getAlarmInfoList } from "@/api/gasdata/alarm";
export default {
name: "gao-map-index",
props: {
......@@ -92,7 +93,8 @@ export default {
},
pipeLines: [],
lineShow: false,
lineTipsShow: false
lineTipsShow: false,
alarmInfoData: []
};
},
methods: {
......@@ -188,7 +190,6 @@ export default {
},
getPipeByGeoJson() {
axios.get("../geo_json/huanggezhuang.json").then((res) => {
console.log("haha===========", res.data);
this.gaoMap.map.plugin(["AMap.GeoJSON"], () => {
const geojson = new AMap.GeoJSON({
geoJSON: res.data,
......@@ -316,6 +317,14 @@ export default {
}
});
},
//获取报警信息
getAlarmInfo(){
getAlarmInfoList({reason: "0"}).then(res =>{
if(res.code == 200){
this.alarmInfoData = res.data;
}
})
}
},
computed: {
...mapGetters(["systemSetting"]),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment