bug修改

project_data/sql/0.1.1/soc/soc.sql

@@ -1079,9 +1079,9 @@ create table iot_daily_check_data
     create_time datetime     null comment '创建时间',
     update_time datetime     null comment '修改时间'
 )
-    comment '网点日常自检日志表';
+    comment '网点设备健康度日志表';
 -- 新增网点日常自检日志菜单
 delete from sys_menu where id ='01831141820470513666';
-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 (01831141820470513666, '自检日志', 1747911340288892930, 9, 'dailyCheck', 'iot/dailycheck/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'dashboard', NULL, '超级管理员', '2024-09-04 09:26:41', '超级管理员', '2024-09-05 10:28:46', '');
+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 (01831141820470513666, '设备健康度', 1747911340288892930, 9, 'dailyCheck', 'iot/dailycheck/index', NULL, 1, 0, 'C', '0', '0', '', '1', 'dashboard', NULL, '超级管理员', '2024-09-04 09:26:41', '超级管理员', '2024-09-05 10:28:46', '');
 delete from sys_role_menu where menu_id='01831141820470513666';
 insert into sys_role_menu select  id,'01831141820470513666' from sys_role where org_type in (1,2,3,4);

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

@@ -197,14 +197,14 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         data = data.replaceAll("<br/>", "\r\n");
         DailyCheckReq checkReq = JSON.parseObject(data, DailyCheckReq.class);
         exportDataList.add(new DailyCheckItemExportVo(checkReq.getFsuElectric(), "电器火灾"));
-        exportDataList.add(new DailyCheckItemExportVo(checkReq.getVideoRecordComplete(), "昨日录像丢失"));
         exportDataList.add(new DailyCheckItemExportVo(checkReq.getFsuFireFight(), "消防报警"));
+        exportDataList.add(new DailyCheckItemExportVo(checkReq.getFsuOther(), "技防环境"));
+        exportDataList.add(new DailyCheckItemExportVo(checkReq.getVideoRecordComplete(), "昨日录像丢失"));
         exportDataList.add(new DailyCheckItemExportVo(checkReq.getDisk(), "硬盘状态"));
         exportDataList.add(new DailyCheckItemExportVo(checkReq.getDiagnose(), "视频质量"));
-        exportDataList.add(new DailyCheckItemExportVo(checkReq.getFsuOther(), "技防环境"));
         exportDataList.add(new DailyCheckItemExportVo(checkReq.getNet(), "网络状态"));
         for (DailyCheckItemExportVo exportVo : exportDataList) {
-            exportVo.setTitle("智能巡查每日工作登记簿");
+            exportVo.setTitle("设备健康度检查表");
             exportVo.setTime(LocalDateTimeUtil.format(checkData.getRecordDate(), Constants.HMS_FORMAT));
             exportVo.setOrgName(checkData.getOrgName());
             exportVo.setUserName(checkData.getUserName());
@@ -222,7 +222,7 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         // 创建一个新的Excel 工作簿
         Workbook workbook = new XSSFWorkbook();
         // 创建一个工作表sheet
-        Sheet sheet = workbook.createSheet("智能巡查每日工作登记簿");
+        Sheet sheet = workbook.createSheet("设备健康度检查表");
 
         // 设置列宽
         for (int i = 0; i < 5; i++) {
@@ -263,7 +263,7 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         }
 
         // 设置下载响应头
-        String fileName = "智能巡查每日工作登记簿.xlsx";
+        String fileName = "设备健康度检查表.xlsx";
         response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
 
@@ -292,7 +292,7 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         // 第一行表头
         Row firstRow = sheet.createRow(0);
         Cell firstRowCell = firstRow.createCell(0);
-        firstRowCell.setCellValue("智能巡查每日工作登记簿");
+        firstRowCell.setCellValue("设备健康度检查表");
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 4)); // 合并第一行中的8个单元格
         sheet.setHorizontallyCenter(true);
         Workbook workbook = sheet.getWorkbook();
@@ -319,7 +319,7 @@ public class IotDailyCheckDataServiceImpl extends ServiceImpl<IotDailyCheckDataM
         // 第三行表头
         Row thirdRow = sheet.createRow(2);
         thirdRow.setHeight((short) 700);
-        String[] thirdHeaders = {"检测项", "总数", "异常数", "系统检查结果", "处置意见"};
+        String[] thirdHeaders = {"检查项", "总数", "异常数", "检查结果", "处置意见"};
         for (int i = 0; i < thirdHeaders.length; i++) {
             Cell cell = thirdRow.createCell(i);
             cell.setCellValue(thirdHeaders[i]);