bug修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/CategoryDataEnum.java

@@ -29,7 +29,7 @@ public enum CategoryDataEnum {
     AMMETER_SENSOR(3712198166114160L, "智能电表"),
     GAS_ALARM(3712197694111744L, "燃气报警器"),
     DOOR_WINDOW_SENSOR(3712197092999168L, "门磁、窗磁传感器"),
-    IOT_DETECTION_DEVICE(3712197092999168L, "视频物联网检测主机"),
+    IOT_DETECTION_DEVICE(3712199107215360L, "视频物联网检测主机"),
     ;
 
 

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

@@ -107,7 +107,7 @@ public class VideoDiagnosisServiceImpl extends ServiceImpl<IotDvrChannelMapper,
                     .ge(MediatorVideoIntegrityCheckLog::getRecordDate, earliestDate)
                     .select(MediatorVideoIntegrityCheckLog::getRecordDate, MediatorVideoIntegrityCheckLog::getStatus);
             Map<Integer, List<MediatorVideoIntegrityCheckLog>> days = videoIntegrityCheckLogMapper.selectList(wrapper)
-                    .stream().collect(Collectors.groupingBy(d -> d.getStatus()));
+                    .stream().collect(Collectors.groupingBy(MediatorVideoIntegrityCheckLog::getStatus));
 
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             if (days.containsKey(VideoIntegrityStatus.Full.getId())) {

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/videoDiagnosis/VideoDiagnosisWebPageVo.java

@@ -7,6 +7,9 @@ import lombok.Data;
 
 @Data
 public class VideoDiagnosisWebPageVo {
+    @ApiModelProperty("主机名称")
+    private String hostName;
+
     @ApiModelProperty("主机code")
     private String hostCode;
 

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

@@ -155,7 +155,7 @@
         SUM(dd.exceptionCount) as diskExceptionCount
         FROM iot_device d
         LEFT JOIN (SELECT host_code,count(0) as count,SUM(if(state=1,1,0)) as exceptionCount from iot_dvr_disk WHERE
-        deleted=0 ) dd on dd.host_code =d.equipment_code
+        deleted=0 group by host_code) dd on dd.host_code =d.equipment_code
         where d.deleted=0 and d.category_id=#{pageDto.categoryId}
         <if test="pageDto.checkSub==true">
             and d.org_path like concat(#{orgPath},"%")

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

@@ -23,6 +23,7 @@
             <result column="integrity_lose_span" property="loseSpan"></result>
             <result column="integrity_check_span" property="checkSpan"></result>
             <result column="integrity_update_time" property="updateTime"></result>
+            <result column="integrity_status" property="state"></result>
         </association>
         <association property="storage" javaType="com.xunmei.iot.vo.videoDiagnosis.VideoDiagnosisStorageVo">
             <result column="storage_plan_days" property="planDays"></result>
@@ -52,6 +53,7 @@
         c.org_name,
         o.affiliated_area,
         o.affiliated_bank,
+        d.equipment_name as hostName,
         c.channel_name,
         c.channel_addr as channelIP,
         vic.lose_duration,
@@ -117,6 +119,7 @@
                vic.lose_span           as integrity_lose_span,
                vic.check_span          as integrity_check_span,
                vic.update_time         as integrity_update_time,
+               vic.status              as integrity_status,
                vdc.plan_days           as storage_plan_days,
                vdc.real_days           as storage_real_days,
                vdc.earliest_video_time as storage_earliest_video_time