Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -990,8 +990,10 @@ public class PackingController {
 //
 //                }
 //        );
-        MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原"+mapToString(originalMap)+"-->现"+mapToString(nowMap),userIds,0);
-        messageService.add(messageBto);
+        if(nowMap.size()>0) {
+            MessageBto messageBto = new MessageBto(0, 1, "修改" + packingLibraryUpdateVo.getModel() + "列装信息:原" + mapToString(originalMap) + "-->现" + mapToString(nowMap), userIds, 0);
+            messageService.add(messageBto);
+        }
         return ResponseEntity.ok("编辑成功");
     }
 

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -964,7 +964,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         }
         originPacking.setPartParentId(selectPacking.getId());
         PackingLog packingLog = new PackingLog();
-        packingLog.setRemark("列装名称为"+originPacking.getName()+"与列装名称"+selectPacking.getName()+"绑定在一起");
+        packingLog.setPackingId(originPacking.getId());
+        packingLog.setRemark("列装名称为"+originPacking.getName()+"与列装名称"+selectPacking.getName()+"进行");
         packingLogService.add(packingLog);
         update(originPacking);
     }
@@ -973,24 +974,27 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     public void relievePacking(PackingLibrary packingLibrary) {
 
         //获取列装对象的装备
-        List<DeviceLibrary> deviceLibraries = deviceLibraryService.findAllByPackingId(packingLibrary.getId());
-        List<Integer> deviceIds = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
-        //将装备的父id全部置空
-        Integer userId = userUtils.getCurrentUserId();
-        List<DeviceLogDto> deviceLogDtos = new ArrayList<>();
-        long l = System.currentTimeMillis();
-        deviceLibraryService.updatePartParentId(deviceIds);
-        log.info("更新父id时间为:{}",System.currentTimeMillis()-l);
-        deviceLibraries.forEach(deviceLibrary -> {
-            DeviceLogDto deviceLogDto = new DeviceLogDto();
-            deviceLogDto.setDeviceId(deviceLibrary.getId());
-            deviceLogDto.setRemark("由于列装进行了解绑,装备也需要进行解绑");
-            deviceLogDto.setCreateUserId(userId);
-            deviceLogDtos.add(deviceLogDto);
-        });
-        executor.execute(()->{
-            deviceLogService.addAllLog(deviceLogDtos);
-        });
+        if (packingLibrary.getIsPart() == 1) {
+            //说明是附件目录
+            List<DeviceLibrary> deviceLibraries = deviceLibraryService.findAllByPackingId(packingLibrary.getId());
+            List<Integer> deviceIds = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
+            //将装备的父id全部置空
+            Integer userId = userUtils.getCurrentUserId();
+            List<DeviceLogDto> deviceLogDtos = new ArrayList<>();
+            long l = System.currentTimeMillis();
+            deviceLibraryService.updatePartParentId(deviceIds);
+            log.info("更新父id时间为:{}",System.currentTimeMillis()-l);
+            deviceLibraries.forEach(deviceLibrary -> {
+                DeviceLogDto deviceLogDto = new DeviceLogDto();
+                deviceLogDto.setDeviceId(deviceLibrary.getId());
+                deviceLogDto.setRemark("由于列装进行了解绑,装备也需要进行解绑");
+                deviceLogDto.setCreateUserId(userId);
+                deviceLogDtos.add(deviceLogDto);
+            });
+            executor.execute(()->{
+                deviceLogService.addAllLog(deviceLogDtos);
+            });
+        }
         //修改列装
         packingLibrary.setPartParentId(null);
         PackingLog packingLog = new PackingLog();