报警阈值修改
This commit is contained in:
parent
b1b4f3a95e
commit
0953591ae8
|
|
@ -69,7 +69,7 @@ public class OilDevice extends BaseEntity {
|
|||
*/
|
||||
private Long backCount;
|
||||
|
||||
|
||||
private String bjyz;
|
||||
public Long getDeviceId() {
|
||||
return deviceId;
|
||||
}
|
||||
|
|
@ -90,6 +90,14 @@ public class OilDevice extends BaseEntity {
|
|||
this.adjustCount = adjustCount;
|
||||
}
|
||||
|
||||
public String getBjyz() {
|
||||
return bjyz;
|
||||
}
|
||||
|
||||
public void setBjyz(String bjyz) {
|
||||
this.bjyz = bjyz;
|
||||
}
|
||||
|
||||
public Long getBackCount() {
|
||||
return backCount;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ public class OilMonitor extends BaseEntity {
|
|||
* 监测设备名称
|
||||
*/
|
||||
private String monitorName;
|
||||
|
||||
private String bjyz;
|
||||
private String longitude;
|
||||
|
||||
private String address;
|
||||
|
|
@ -100,6 +100,14 @@ public class OilMonitor extends BaseEntity {
|
|||
this.unitNo = unitNo;
|
||||
}
|
||||
|
||||
public String getBjyz() {
|
||||
return bjyz;
|
||||
}
|
||||
|
||||
public void setBjyz(String bjyz) {
|
||||
this.bjyz = bjyz;
|
||||
}
|
||||
|
||||
public String getSystemNo() {
|
||||
return systemNo;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<result property="fileUrl" column="file_url"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
|
||||
<result property="bjyz" column="bjyz"/>
|
||||
<result property="adjustCount" column="adjustCount"/>
|
||||
<result property="backCount" column="backCount"/>
|
||||
</resultMap>
|
||||
|
|
@ -54,8 +54,8 @@
|
|||
d.create_by,
|
||||
d.create_time,
|
||||
f.factory_name,
|
||||
d.file_url
|
||||
-- ( SELECT count( id ) FROM oil_device_img WHERE device_id = d.id ) AS adjustCount
|
||||
d.file_url,
|
||||
d.bjyz
|
||||
FROM
|
||||
oil_device d
|
||||
JOIN (select * from sys_factory where is_stop='否') f ON d.factory_id = f.factory_id
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
<result property="status" column="status"/>
|
||||
<result property="systemNo" column="system_no"/>
|
||||
<result property="unitNo" column="unit_no"/>
|
||||
<result property="bjyz" column="bjyz"/>
|
||||
</resultMap>
|
||||
<resultMap type="com.ruoyi.project.oil.domain.monitor.ThDevice" id="ThDeviceList">
|
||||
<result property="id" column="id"/>
|
||||
|
|
@ -83,7 +84,8 @@
|
|||
|
||||
|
||||
<select id="selectOilDeviceList" resultMap="OilDeviceResult">
|
||||
select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.create_by,t.create_time,t.address,t.dept_id,d.dept_name,longitude,latitude
|
||||
select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.create_by,t.create_time,t.address,t.dept_id,d.dept_name,t.longitude,t.latitude,
|
||||
t.bjyz
|
||||
from th_device t left join sys_dept d on t.dept_id=d.dept_id
|
||||
<where>
|
||||
<if test="id != null and id != ''">and t.id=#{id}</if>
|
||||
|
|
@ -115,6 +117,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
|
|||
<if test="status != null">status,</if>
|
||||
<if test="unitNo != null">unit_no,</if>
|
||||
<if test="systemNo != null">system_no,</if>
|
||||
<if test="bjyz != null">bjyz,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="monitorName != null">#{monitorName},</if>
|
||||
|
|
@ -129,7 +132,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
|
|||
<if test="latitude != null">#{latitude},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="unitNo != null">#{unitNo},</if>
|
||||
<if test="systemNo != null">#{systemNo},</if>
|
||||
<if test="bjyz != null">#{bjyz},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
|
|
@ -148,6 +151,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
|
|||
<if test="status != null">status=#{status},</if>
|
||||
<if test="systemNo != null">system_no=#{systemNo},</if>
|
||||
<if test="unitNo != null">unit_no=#{unitNo},</if>
|
||||
<if test="bjyz != null">bjyz=#{bjyz},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="经度" align="center" prop="longitude" />
|
||||
<el-table-column label="纬度" align="center" prop="latitude" />
|
||||
<el-table-column label="报警阈值" align="center" prop="bjyz" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-hasRole="['admin', 'epa', 'factory']" size="mini" type="text" icon="el-icon-edit"
|
||||
|
|
@ -90,6 +91,9 @@
|
|||
<el-form-item label="纬度">
|
||||
<el-input v-model="form.latitude" placeholder="纬度" />
|
||||
</el-form-item>
|
||||
<el-form-item label="报警阈值">
|
||||
<el-input v-model="form.bjyz" placeholder="报警阈值" />
|
||||
</el-form-item>
|
||||
<el-form-item label="系统编码（原有）">
|
||||
<el-input v-model="form.systemNo" placeholder="系统编码（原有）" />
|
||||
</el-form-item>
|
||||
|
|
|
|||
Loading…
Reference in New Issue