代码bug修改

soc-modules/soc-modules-iot/src/main/resources/mapper/IotAlarmDataMapper.xml

@@ -198,7 +198,7 @@
                     and now()     <![CDATA[<=]]> d.end_time
                 )
             )
-          and o.path like concat(#{orgPath}, '%')
+          and o.path like concat(#{orgPath}, '%') and d.source_type is not null
         group by d.source_type
     </select>
 </mapper>

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -514,12 +514,12 @@
     </select>
     <select id="selectVideoLoseSelfAndSubOrgBadge" resultType="java.lang.Integer">
         SELECT sum(vdc.`status` > 0 or vic.`status` > 0) as count
-        FROM iot_dvr_channel dc
+        FROM iot_device_info dc
             INNER JOIN sys_org o ON dc.org_id =o.id
             LEFT JOIN mediator_video_days_check vdc
-        on vdc.equipment_code = dc.host_code and vdc.channel_code = dc.channel_code
+        on vdc.equipment_code = dc.host_code and vdc.channel_code = dc.device_code
             LEFT JOIN mediator_video_integrity_check vic
-            on vic.equipment_code = dc.host_code and vic.channel_code = dc.channel_code
+            on vic.equipment_code = dc.host_code and vic.channel_code = dc.device_code
         WHERE
             o.deleted=0
           AND o.is_lock =0
@@ -529,19 +529,19 @@
 
     <select id="selectVideoQualityBadge" resultType="java.lang.Integer">
         SELECT sum(vdr.`is_alarm` > 0) as count
-        FROM iot_dvr_channel dc
+        FROM iot_device_info dc
             LEFT JOIN mediator_video_diagnosis_record vdr
-            on vdr.equipment_code = dc.host_code and vdr.channel_code = dc.channel_code
+            on vdr.equipment_code = dc.host_code and vdr.channel_code = dc.device_code
         WHERE dc.org_id = #{orgId}
           AND dc.deleted = 0
     </select>
 
     <select id="selectVideoQualitySelfAndSubOrgBadge" resultType="java.lang.Integer">
         SELECT sum(vdr.`is_alarm` > 0) as count
-        FROM iot_dvr_channel dc
+        FROM iot_device_info dc
             INNER JOIN sys_org o ON dc.org_id =o.id
             LEFT JOIN mediator_video_diagnosis_record vdr
-        on vdr.equipment_code = dc.host_code and vdr.channel_code = dc.channel_code
+        on vdr.equipment_code = dc.host_code and vdr.channel_code = dc.device_code
         WHERE
             o.deleted=0
           AND o.is_lock =0