物联总览bug修改

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

@@ -376,16 +376,24 @@ public class IotBoardServiceImpl implements IotBoardService {
         //录像天数存储
         List<Map<String, String>> videoCheckMap = iotBoardMapper.selectVideoDaysStorage(orgPath, new Date());
         HashMap<Integer, Integer> hashMap = new LinkedHashMap<>();
-        for (Map<String, String> map : videoCheckMap) {
-            hashMap.put(Integer.parseInt(map.get("planDays")), Integer.parseInt(map.get(MAP_VALUE)));
-        }
         IotBoardTotalData.RecordingStorage storage = new IotBoardTotalData.RecordingStorage();
+        if (!videoCheckMap.isEmpty()) {
+            for (Map<String, String> map : videoCheckMap) {
+                hashMap.put(Integer.parseInt(map.get("planDays")), Integer.parseInt(map.get(MAP_VALUE)));
+            }
+            String string = videoCheckMap.get(0).get("time");
+            storage.setUpdateTime(DateUtil.parseDateTime(string));
+        }
+
         storage.setHashmap(hashMap);
         totalData.setRecordingStorage(storage);
 
         IotBoardTotalData.VideoDiagnostic videoDiagnostic = videoDiagnosisService.selectVideoDiagnostic(orgPath, now, channelDataOffsetDay);
         totalData.setVideoDiagnostic(videoDiagnostic);
 
+        totalData.setAirConditionerInfo(new IotBoardTotalData.AirConditionerInfo());
+        totalData.setUpsInfo(new IotBoardTotalData.UpsInfo());
+
         return totalData;
     }
 
@@ -423,7 +431,7 @@ public class IotBoardServiceImpl implements IotBoardService {
         } else {
             videoInspection.setLostRate(String.format("%.2f", (lostTotal * 100.0 / total)) + "%");
         }
-
+        videoInspection.setUpdateTime(videoIntegrityCheckLogs.get(0).getUpdateTime());
         //硬盘异常率
         //获取硬盘数量
         int diskNum = iotDvrDiskMapper.selectDiskCount(org.getPath());

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/board/IotBoardTotalData.java

@@ -1,5 +1,6 @@
 package com.xunmei.iot.vo.board;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -73,14 +74,20 @@ public class IotBoardTotalData {
         private String lostRate;
         @ApiModelProperty(value = "硬盘异常率")
         private String hardDiskExceptionRate;
+        @ApiModelProperty(value = "数据更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date updateTime;
     }
 
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RecordingStorage {
-        @ApiModelProperty(value = "录像存储x天以上占比",notes = "key:计划存储天数,value:存在丢失数量")
-       private Map<Integer,Integer> hashmap;
+        @ApiModelProperty(value = "录像存储x天以上占比", notes = "key:计划存储天数,value:存在丢失数量")
+        private Map<Integer, Integer> hashmap;
+        @ApiModelProperty(value = "数据更新时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Date updateTime;
     }
 
     @Data

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

@@ -136,7 +136,7 @@
     </select>
 
     <select id="selectVideoDaysStorage" resultType="java.util.Map">
-        select CAST(c.plan_days AS CHAR) as planDays,CAST(sum(c.plan_days != c.real_days) AS CHAR) as nums
+        select CAST(c.plan_days AS CHAR) as planDays,CAST(sum(c.plan_days != c.real_days) AS CHAR) as nums,CAST(max(c.update_time) as CHAR ) as time
         from mediator_video_days_check c
                  inner join sys_org o on o.id = c.org_id
         where o.deleted = 0