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

修改报错

This commit is contained in:
haozq 2024-04-02 09:31:23 +08:00
parent cd1e038272
commit 8208c099be
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
View File

@ -201,7 +201,7 @@
LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status
LEFT JOIN tb_area sa ON tbd.area_id = sa.area_id LEFT JOIN tb_area sa ON tbd.area_id = sa.area_id
<where> <where>
tbd.del_flage = 0 tbd.del_flag= 0
<if test="keyWord!=null and keyWord!=''"> <if test="keyWord!=null and keyWord!=''">
AND ( AND (
INSTR(tpb.bd_name,#{keyWord}) > 0 INSTR(tpb.bd_name,#{keyWord}) > 0
@ -215,7 +215,7 @@
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND del_flage = 0 SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND del_flage = 0
</if> </if>
<if test="deviceId != null and deviceId != ''"> <if test="deviceId != null and deviceId != ''">
SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flage = 0 SELECT COUNT(*) FROM tb_bd_device tbd WHERE device_code = #{deviceCode} AND device_id != #{deviceId} AND tbd.del_flag = 0
</if> </if>
</select> </select>
<!--边带设备详情--> <!--边带设备详情-->

6
securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ScIndexMapper.xml
View File

@ -67,7 +67,7 @@
INNER JOIN tb_area ta ON tbd.area_id = ta.area_id AND ta.del_flag = 0 AND ta.area_type = '0' INNER JOIN tb_area ta ON tbd.area_id = ta.area_id AND ta.del_flag = 0 AND ta.area_type = '0'
LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0 LEFT JOIN tb_device_detail tdd ON tbd.device_id = tdd.device_id AND tdd.del_flag = 0
LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
WHERE tbd.del_flage = 0 WHERE tbd.del_flag = 0
</select> </select>
<!--设备状态 目前只查询边带设备--> <!--设备状态 目前只查询边带设备-->
<select id="deviceStatus" resultType="java.util.Map"> <select id="deviceStatus" resultType="java.util.Map">
@ -77,7 +77,7 @@
FROM tb_bd_device tbd FROM tb_bd_device tbd
INNER JOIN tb_pro_bd tpb ON tpb.id = tbd.bd_id AND tpb.del_flag = 0 INNER JOIN tb_pro_bd tpb ON tpb.id = tbd.bd_id AND tpb.del_flag = 0
INNER JOIN tb_project tp on tpb.bid_code = tp.bid_code AND tp.del_flag = 0 INNER JOIN tb_project tp on tpb.bid_code = tp.bid_code AND tp.del_flag = 0
WHERE tbd.del_flage = 0 WHERE tbd.del_flag = 0
</select> </select>
<!--工程安全隐患分析--> <!--工程安全隐患分析-->
<select id="potentialSafetyHazard" resultType="java.util.Map"> <select id="potentialSafetyHazard" resultType="java.util.Map">
@ -107,7 +107,7 @@
<select id="allDeviceStatus" resultType="java.util.Map"> <select id="allDeviceStatus" resultType="java.util.Map">
SELECT tbd.device_id AS id, IF(tbd.status = '801', '1', '0') AS status SELECT tbd.device_id AS id, IF(tbd.status = '801', '1', '0') AS status
FROM tb_bd_device tbd FROM tb_bd_device tbd
WHERE tbd.del_flage = 0 WHERE tbd.del_flag = 0
UNION ALL UNION ALL
SELECT td.device_id AS id, SELECT td.device_id AS id,
IF(on_line = '1', '1', '0') AS status IF(on_line = '1', '1', '0') AS status