haozq
/
ah_jjzhgd_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
cwchen 2024-04-20 12:56:22 +08:00
parent 13a949b2be 8dfed030fe
commit ca29ea009e
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/TowerAssInspectVo.java
View File

@ -13,8 +13,10 @@ public class TowerAssInspectVo {
@ApiModelProperty("设备id")
private String deviceId;
@ApiModelProperty("设备名称")
private String deviceName;
@ApiModelProperty("设备类别")
private String type;

14
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/OperatingMapper.xml
View File

@ -30,6 +30,7 @@
<!--作业环境-边坡位移监测设备-->
<select id="getSlopeDisplacement" resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
tbd.device_id deviceId,
ta.area_name AS areaName,
tdd.mode_name modeName,
tbd.device_name AS deviceName,
@ -69,7 +70,7 @@
<select id="getFiniteSpaceEnvironment"
resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
concat(tdv.val,'(',tdv.unit,')') val,
tdv.val val,
tdv.unit,
tdd.mode_name AS modeName
FROM tb_device_detail tdd
@ -84,7 +85,7 @@
<select id="getGisInstallationEnvironment"
resultType="com.securitycontrol.entity.screen.vo.OperatingQualityVo">
SELECT
concat(tdv.val,'(',tdv.unit,')') val,
tdv.val val,
tdv.unit,
tdd.mode_name AS modeName
FROM tb_device_detail tdd
@ -101,15 +102,16 @@
SELECT
ta.area_name AS areaName,
tbd.device_name AS deviceName,
thdv.val AS val,
concat(thdv.val,'(',thdv.unit,')') val,
thdv.change_val AS changeVal,
thdv.create_time AS createTime,
thdv.source_data AS sourceData,
thdv.is_warn AS isWarn
tdd.mode_name moduleName,
thdv.is_warn AS isWarn,
thdv.unit
FROM tb_bd_device tbd
LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id
LEFT JOIN tb_area ta ON tbd.area_id = ta.area_id
LEFT JOIN tb_his_device_value thdv ON tdd.id = thdv.attribute_id
LEFT JOIN tb_device_value thdv ON tdd.id = thdv.attribute_id
LEFT JOIN tb_pro_bd tpb ON tbd.bd_id = tpb.id
WHERE tpb.bid_code = #{bidCode} and tbd.devic_type = 1908
<if test="deviceId != null and deviceId != ''">

1
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/TowerAssInspectMapper.xml
View File

@ -39,6 +39,7 @@
<select id="getHistoryList" resultType="com.securitycontrol.entity.screen.vo.TowerAssInspectVo">
SELECT ta.area_name as areaName,tdd.mode_name as modeName, thdv.val ,
tbd.device_name deviceName,
thdv.change_val as changeVal,tdd.update_time as updateTime,
thdv.create_time createTime,
case when thdv.is_warn = '0' then '未告警' else '告警' end isWarn

3
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml
View File

@ -14,7 +14,8 @@
'2' AS level
FROM t_class_metting tcm
left JOIN tb_device td on td.device_code = tcm.puid AND td.del_flag=0
WHERE tcm.del_flag = 0 AND tcm.work_day = CURRENT_DATE AND TCM.puid is not null
WHERE tcm.del_flag = 0 AND TCM.puid is not null
<!-- AND tcm.work_day = CURRENT_DATE-->
<if test="param!=null and param!=''">
AND INSTR(td.device_name,#{param}) > 0
</if>