feat(配套模块,核查模块,装备模块): 解决配套设备修改履历,过滤了装备查询已销毁，解决了装备解绑的履历

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -1823,7 +1823,7 @@ public class DeviceCheckController {
         // 1.将该任务进度推进至9999
         TaskBto nodeBto = node.parse2Bto();
         taskService.moveToEnd(nodeBto);
-        supplyLogMsg(node);
+//        supplyLogMsg(node);
         log.info("[核查模块] 终止任务-task id = {} 成功关闭");
     }
 

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

@@ -829,7 +829,8 @@ public class DeviceLibraryController {
                         d.setPartParentId(null);
                         deviceLibraryService.update(d);
                         //添加装备日志
-                        String remark = "将序列号为" + d.getRfidSurfaceId() + "的配件与序列号为" + deviceLibraryEntity.getRfidSurfaceId() + "的装备解绑";
+//                        String remark = "将序列号为" + d.getRfidSurfaceId() + "的配件与序列号为" + deviceLibraryEntity.getRfidSurfaceId() + "的装备解绑";
+                        String remark = "将序列号为" + d.getSeqNumber() + "的配件与序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备解绑";
                         DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null,null,null);
                         DeviceLogDto deviceLogDto2 = new DeviceLogDto(id, remark, null,null,null);
                         deviceLogService.addLog(deviceLogDto);
@@ -839,7 +840,8 @@ public class DeviceLibraryController {
                         deviceLibraryEntity.setPartParentId(null);
                         deviceLibraryService.update(deviceLibraryEntity);
                         //添加装备日志
-                        String remark = "将序列号为" + deviceLibraryEntity.getRfidSurfaceId() + "的配件与序列号为" + d.getRfidSurfaceId() + "的装备解绑";
+//                        String remark = "将序列号为" + deviceLibraryEntity.getRfidSurfaceId() + "的配件与序列号为" + d.getRfidSurfaceId() + "的装备解绑";
+                        String remark = "将序列号为" + deviceLibraryEntity.getSeqNumber() + "的配件与序列号为" + d.getSeqNumber() + "的装备解绑";
                         DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null,null,null);
                         DeviceLogDto deviceLogDto2 = new DeviceLogDto(id, remark, null,null,null);
                         deviceLogService.addLog(deviceLogDto);

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -192,6 +192,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 List<String> unitNames = unitsService.findSuperiorUnitsList().stream().map(Units::getName).collect(Collectors.toList());
                 List<DeviceLibrary> deviceLibraries = getAllList(deviceLibrarySelectVo).stream()
                         .filter(deviceLibraryEntity -> !unitNames.contains(deviceLibraryEntity.getOwnUnit()))
+                        //过滤出掉毁的装备
+                        .filter(deviceLibrary -> !deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.DESTROYED.id))
                         .collect(Collectors.toList());
 //                List<DeviceLibrary> libraryEntities = getList4(deviceLibraries);
 //                List<DeviceLibrary> resultList = new ArrayList<>();

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -503,8 +503,9 @@ public class MatchingDeviceController {
             }
         }
         if (matchingDeviceEditVo.getType() != null && !m.getType().equals(matchingDeviceEditVo.getType())) {
-            //添加设备日志
-            String remark = "将设备类型由" + m.getType() + "改为" + matchingDeviceEditVo.getType();
+            //添加设备日志  需要前端同时传递type和typeName
+//            String remark = "将设备类型由" + m.getType() + "改为" + matchingDeviceEditVo.getType();
+            String remark = "将设备类型由" + m.getTypeName() + "改为" + matchingDeviceEditVo.getTypeName();
             DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null,null);
             deviceLogService.addLog(deviceLogDto);
             m.setType(matchingDeviceEditVo.getType());

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/MatchingDeviceEditVo.java

@@ -27,6 +27,9 @@ public class MatchingDeviceEditVo {
 
     @ApiModelProperty(value = "设备类型")
     private String type;
+
+    @ApiModelProperty(value = "设备类型名称")
+    private String typeName;
     /**
      * 型号
      */