Merge remote-tracking branch 'origin/V0.0.9' into V0.0.9

project_data/sql/0.0.9/soc/soc.sql

@@ -81,5 +81,5 @@ INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `comp
 INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01788377908143448066, '导出GA38填写情况', 103, 10, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:dept:exportDefenseDetailExtend', '1', NULL, NULL, '超级管理员', '2024-05-09 09:18:14', '', NULL, '');
 
 delete from sys_dict_data where dict_type='video_diagnosis_state' and dict_label in ('未知');
-INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231115141, 2, '未知', '2', 'video_diagnosis_state', NULL, 'default', 'N', '0', '超级管理员', '2024-05-13 11:07:08', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '未知', '2', 'video_diagnosis_state', NULL, 'default', 'N', '0', '超级管理员', '2024-05-13 11:07:08', '', NULL, NULL);
 

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

@@ -407,6 +407,8 @@ public class IotBoardServiceImpl implements IotBoardService {
         List<MediatorVideoIntegrityCheckLog> videoIntegrityCheckLogs = iotBoardMapper.selectVideoCheckSelf(org.getPath(), DateUtil.format(offsetDay, "yyyy-MM-dd"), DateUtil.format(now, "yyyy-MM-dd"));
         if (ObjectUtil.isEmpty(videoIntegrityCheckLogs)) {
             videoInspection.setLostRate("-");
+        }else {
+            videoInspection.setUpdateTime(videoIntegrityCheckLogs.get(0).getUpdateTime());
         }
         //获取通道数量
         Integer channelNums = dvrChannelMapper.selectChannelCount(org.getPath());
@@ -431,7 +433,6 @@ 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());