Merge remote-tracking branch 'origin/V0.0.6-iot' into V0.0.6-iot

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/VideoDiagnosisRecordMapper.java

@@ -39,8 +39,6 @@ public interface VideoDiagnosisRecordMapper extends BaseMapper<VideoDiagnosisRec
 
     List<Map<String, Object>> totalVideoData(@Param("dayOfStartTime") Date dayOfStartTime,@Param("dayOfEndTime") Date dayOfEndTime,@Param("orgIds") List<Long> orgIds);
 
-    List<SysDevice> selectAllDeviceChannel(@Param("orgId") Long orgId);
-
     List<VideoDiagnosisRecord> queryVideoDiagnosis(@Param("channelList") List<SysDevice> channelList);
 
 //    List<VideoDiagnosisRecord> getVideoDiagnosisCheckAlarmNum(@Param("request") VideoVoiceLightAlarmDto request);

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -294,7 +294,7 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
         videoInfo.setCode("VideoLossCamera");
         videoInfo.setValue(videoIntegrityDevices.size());
         result.add(videoInfo);
-        
+
 
         // 获取录像天数不足
         VideoDaysInconformityDto dto = new VideoDaysInconformityDto();

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

@@ -205,14 +205,6 @@
         </foreach>
     </select>
 
-    <select id="selectAllDeviceChannel" resultType="com.isp.device.domain.Device">
-        select *
-        from t_device
-        where deleted = 0
-          and `category_id` = '3713671711473664'
-          AND `org_id` = #{orgId}
-    </select>
-
     <select id="queryVideoDiagnosis" resultType="com.xunmei.iot.domain.VideoDiagnosisRecord">
         select * from mediator_video_diagnosis_record
         <where>