fix(配套设备库模块): 新增了接口

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

@@ -569,6 +569,15 @@ public class MatchingDeviceController {
             m.setMatchingDeviceStorageLocation(matchingDeviceEditVo.getMatchingDeviceStorageLocation());
             m.setMatchingDeviceStorageLocationId(matchingDeviceEditVo.getMatchingDeviceStorageLocationId());
         }
+
+        if (matchingDeviceEditVo.getMatchingDeviceStatus() != null &&
+                !matchingDeviceEditVo.getMatchingDeviceStatus().equals(m.getMatchingDeviceStatus())) {
+            //添加设备日志 设备的状态
+            String remark = "将设备的状态改为" + matchingDeviceEditVo.getMatchingDeviceStatusName();
+            DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null, null);
+            deviceLogService.addLog(deviceLogDto);
+            m.setMatchingDeviceStatus(matchingDeviceEditVo.getMatchingDeviceStatus());
+        }
         matchingDeviceLibraryService.update(m);
         return ResponseEntity.ok("修改成功");
     }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -399,6 +399,8 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
                 "%"+matchingDeviceSelectVo.getRfidCardId()+"%");
         predicateBuilder.eq(matchingDeviceSelectVo.getMatchingDeviceStorageLocationId() != null,
                 "matchingDeviceStorageLocationId",matchingDeviceSelectVo.getMatchingDeviceStorageLocationId());
+        predicateBuilder.eq(matchingDeviceSelectVo.getMatchingDeviceStatus() != null,
+                "matchingDeviceStatus",matchingDeviceSelectVo.getMatchingDeviceStatus());
         return predicateBuilder;
     }
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/MatchingDeviceLibrary.java

@@ -142,6 +142,10 @@ public class MatchingDeviceLibrary {
     @ApiModelProperty(value = "存放位置id")
     private Integer matchingDeviceStorageLocationId;
 
+    @ApiModelProperty(value = "设备状态",example = "0 在库 1 使用中 2 维修")
+    private Integer matchingDeviceStatus = 0;
+
+
 
     public MatchingDeviceLibrary setConfigName(){
         ConfigCache configCache = SpringUtils.getBean("initConfigCache");

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

@@ -68,4 +68,10 @@ public class MatchingDeviceEditVo {
 
     @ApiModelProperty(value = "存放位置id")
     private Integer matchingDeviceStorageLocationId;
+
+    @ApiModelProperty(value = "设备状态",example = "0 在库 1 使用中 2 维修")
+    private Integer matchingDeviceStatus;
+
+    @ApiModelProperty(value = "设备状态",example = "0 在库 1 使用中 2 维修")
+    private String matchingDeviceStatusName;
 }

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

@@ -64,6 +64,9 @@ public class MatchingDeviceSaveVo {
     @ApiModelProperty(value = "存放位置id")
     private Integer matchingDeviceStorageLocationId;
 
+    @ApiModelProperty(value = "设备状态")
+    private Integer matchingDeviceStatus =0;
+
     public MatchingDeviceLibrary toDo() {
         MatchingDeviceLibrary matchingDeviceLibraryEntity = new MatchingDeviceLibrary();
         BeanUtils.copyProperties(this, matchingDeviceLibraryEntity);

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

@@ -46,4 +46,7 @@ public class MatchingDeviceSelectVo extends CustomPage {
     private String nameDim;
 
     private String seqDim;
+
+    @ApiModelProperty(value = "设备状态")
+    private Integer matchingDeviceStatus ;
 }