大屏标点报警接口调整

gassafetyprogress-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -65,11 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getDeviceInfoAlarmList" resultType="Map">
-        select a2.device_id as deviceId,
-               a2.device_type as deviceType
-        from t_detector_info a1
-        right join t_device_info a2 on a1.device_id = a2.device_id
-        where a1.is_del = '0' and a2.is_del = '0' and a1.detector_status = '2'
+        select a3.device_id as deviceId,
+               a3.device_type as deviceType
+        from t_relation_device_detail_info a1
+        left join t_detector_info a2 on a1.iot_no = a2.detector_code
+        right join t_device_info a3 on a1.relation_device_id = a3.device_id
+        where a1.is_del = '0' and a2.is_del = '0' and a3.is_del = '0' and a2.detector_status = '2'
     </select>
 
     <insert id="insertTDeviceInfo" parameterType="TDeviceInfo" useGeneratedKeys="true" keyProperty="deviceId">

gassafetyprogress-system/src/main/resources/mapper/system/TSiteStationInfoMapper.xml

@@ -48,9 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getSiteStationAlarmList" resultType="Map">
         select a2.site_station_id as siteStationId
-        from t_detector_info a1
-        right join t_site_station_info a2 on a1.site_station_id = a2.site_station_id
-        where a1.is_del = '0' and a2.is_del = '0' and a1.detector_status = '2'
+        from t_relation_device_detail_info a1
+        left join t_detector_info a2 on a1.iot_no = a2.detector_code
+        right join t_site_station_info a3 on a1.relation_device_id = a3.site_station_id
+        where a1.is_del = '0' and a2.is_del = '0' and a3.is_del = '0' and a2.detector_status = '2'
     </select>
 
     <insert id="insertTSiteStationInfo" parameterType="TSiteStationInfo" useGeneratedKeys="true" keyProperty="siteStationId">