fix(自查模块,装备管理): 修改部分bug

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -651,12 +651,11 @@ public class DeviceLibraryController {
                 deviceLibraryEntity.setStorageLocation(libraryUpdateVo.getStorageLocation());
             }
             //add 备注
-            if (libraryUpdateVo.getRecord()!=null){
+            if (libraryUpdateVo.getRecord()!=null && !libraryUpdateVo.getRecord().equals(deviceLibraryEntity.getRecord())){
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), "将备注改为"+libraryUpdateVo.getRecord(), null,null,null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setRecord(libraryUpdateVo.getRecord());
             }
-
             deviceLibraryService.update(deviceLibraryEntity);
         }
         //添加绑定配件

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -415,19 +415,16 @@ public class SelfCheckController {
             if (s.length()>=2) {
                 Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
 //                DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起自查",fileVoList,taskBto.getId(),null);
-                DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起自查",fileVoList,taskBto.getId(),taskBto.getId());
+                DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起自查",fileVoList,userId,taskBto.getId());
                 deviceLogDtos.add(deviceLogDto);
 //                deviceLogService.addLog(deviceLogDto);
             }
         }
-        long l = System.currentTimeMillis();
-        //进行日志的存储
         executor.execute(
                 ()->{
                     deviceLogService.addAllLog(deviceLogDtos);
                 }
         );
-        log.info("日志存储时间:{}",System.currentTimeMillis()-l);
         log.info("[自查模块]:发起自查");
         myWebSocket.sendMessage1();
         return ResultUtil.success(selfExaminationBillEntity1);
@@ -438,6 +435,7 @@ public class SelfCheckController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity selfExaminationConfirm(@RequestBody @Validated SelfCheckConfirmVo selfCheckConfirmVo) {
         TaskBto taskBto = taskService.get(selfCheckConfirmVo.getTaskId());
+        Integer userId = userUtils.getCurrentUserId();
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SELF_CHECK_CONFIRM);
         SelfCheckBill selfExaminationBillEntity = selfExaminationBillService.getOne(taskBto.getBillId());
         if(selfCheckConfirmVo.getCheckFiles()!=null&&selfCheckConfirmVo.getCheckFiles().size()>0){
@@ -466,7 +464,8 @@ public class SelfCheckController {
             for (String s:strings) {
                 if (s.length()>=2) {
                     Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id,"上传自查单",null,taskBto.getId(),null);
+//                    DeviceLogDto deviceLogDto = new DeviceLogDto(id,"上传自查单",null,taskBto.getId(),null);
+                    DeviceLogDto deviceLogDto = new DeviceLogDto(id,"上传自查单",null,userId,taskBto.getId());
                     deviceLogService.addLog(deviceLogDto);
                 }
             }
@@ -482,7 +481,7 @@ public class SelfCheckController {
             for (String s:strings) {
                 if (s.length()>=2) {
                     Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
-                    DeviceLogDto deviceLogDto = new DeviceLogDto(id,"自查审核失败",null,taskBto.getId(),null);
+                    DeviceLogDto deviceLogDto = new DeviceLogDto(id,"自查审核失败",null,userId,taskBto.getId());
                     deviceLogService.addLog(deviceLogDto);
                 }
             }