feat(装备模块，配套设备库模块):…

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

@@ -782,6 +782,7 @@ public class DeviceLibraryController {
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), "将存放位置改为"+libraryUpdateVo.getStorageLocation(), null,null,null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setStorageLocation(libraryUpdateVo.getStorageLocation());
+                deviceLibraryEntity.setStorageLocationId(libraryUpdateVo.getStorageLocationId());
             }
             //add 备注
             if (libraryUpdateVo.getRecord()!=null && !libraryUpdateVo.getRecord().equals(deviceLibraryEntity.getRecord())){
@@ -931,6 +932,7 @@ public class DeviceLibraryController {
         DeviceLibrary deviceLibrary = deviceLibraryService.getOne(deviceStorageLocation.getDevId());
         //添加修改存放装备位置
         deviceLibrary.setStorageLocation(deviceStorageLocation.getStorageLocation());
+        deviceLibrary.setStorageLocationId(deviceStorageLocation.getStorageLocationId());
         DeviceLogDto deviceLogDto = new DeviceLogDto(deviceStorageLocation.getDevId(), "将存放位置改为"+deviceStorageLocation.getStorageLocation(), null,null,null);
         deviceLogService.addLog(deviceLogDto);
         deviceLibraryService.update(deviceLibrary);
@@ -974,8 +976,15 @@ public class DeviceLibraryController {
 
     @ApiOperation("入库修改试用装备的序列号")
     @PostMapping("updateSeq")
+    @CacheEvict(value = "devicesLibraryList",key = "'device'",allEntries = true)
     public ResponseEntity updateSeq(@RequestBody List<DeviceForApplyVo> deviceForApplyVos){
         deviceLibraryService.updateSeqNumber(deviceForApplyVos);
+        //异步去查询数据库
+        executor.execute(
+                ()->{
+                    cacheLibraryService.getAllDeviceLibraryList();
+                }
+        );
         return ResponseEntity.ok("更新成功");
     }
 

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -225,8 +225,8 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     @Transactional
     @Modifying
-    @Query("update DeviceLibrary o set o.storageLocation = :storageLocation where o.id in :deviceIds")
-    int updateStorageLocation( @Param("storageLocation") String storageLocation,
+    @Query("update DeviceLibrary o set o.storageLocation = :storageLocation,o.storageLocationId = :storageLocationId where o.id in :deviceIds")
+    int updateStorageLocation( @Param("storageLocation") String storageLocation,@Param("storageLocationId") Integer storageLocationId,
             @Param("deviceIds") List<Integer> deviceIds);
 
 

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

@@ -236,6 +236,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         d.setName(deviceLibrarySelectVo.getName());
         d.setContent(deviceLibrarySelectVo.getContent());
         d.setType(deviceLibrarySelectVo.getType());
+        d.setStorageLocationId(deviceLibrarySelectVo.getStorageLocationId());
         //获取所有的核心装备
         List<DeviceLibrary> libraryEntities = getCoreDevicePage(d);
         if (libraryEntities.size() > 0) {
@@ -1156,7 +1157,8 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                             updateStorageLocationVo.getStorageLocation(),null,userId);
                     deviceLogDtos.add(deviceLogDto);
                 }});
-            deviceLibraryDao.updateStorageLocation(updateStorageLocationVo.getStorageLocation(),deviceIds);
+            deviceLibraryDao.updateStorageLocation(updateStorageLocationVo.getStorageLocation(),
+                    updateStorageLocationVo.getStorageLocationId(),deviceIds);
         }else {
             throw new ApiException("请选择要修改的装备");
         }
@@ -1372,7 +1374,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 predicateBuilder.in("seqNumber", DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()));
             }
             //新增库房位置
-            predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocation() != null,"storageLocation",deviceLibrarySelectVo.getStorageLocation());
+            predicateBuilder.eq(deviceLibrarySelectVo.getStorageLocationId() != null,"storageLocationId",deviceLibrarySelectVo.getStorageLocationId());
             //新增装备的形态
             predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
         }

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java

@@ -239,6 +239,9 @@ public class DeviceLibrary implements Serializable {
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation;
 
+    @ApiModelProperty(value = "装备存放位置Id",notes = "默认是库房")
+    private Integer storageLocationId;
+
     @Transient
     private List<DeviceLibrary> childs = new ArrayList<>();
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibrarySaveVo.java

@@ -60,6 +60,9 @@ public class DeviceLibrarySaveVo {
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation;
 
+    @ApiModelProperty(value = "装备存放位置的id",notes = "默认是库房id")
+    private Integer storageLocationId;
+
     @ApiModelProperty(value = "是否是试用装备",notes = "0 是正式  1 是测试")
     private Integer tryOutDevice = 0;
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibrarySelectVo.java

@@ -123,6 +123,9 @@ public class DeviceLibrarySelectVo extends CustomPage {
     @ApiModelProperty(value = "存储位置")
     private String storageLocation;
 
+    @ApiModelProperty(value = "存储位置")
+    private Integer storageLocationId;
+
     @ApiModelProperty(value = "存储位置的模糊查询字段")
     private String storageLocationDim;
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibraryUpdateVo.java

@@ -48,6 +48,9 @@ public class DeviceLibraryUpdateVo {
     @ApiModelProperty("库存位置")
     private String storageLocation;
 
+    @ApiModelProperty("库存位置id")
+    private Integer storageLocationId;
+
     @ApiModelProperty("备注")
     private String record;
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceStorageLocation.java

@@ -22,4 +22,7 @@ public class DeviceStorageLocation {
 
     @ApiModelProperty(value = "库存位置")
     private String storageLocation;
+
+    @ApiModelProperty(value = "库存位置id")
+    private Integer storageLocationId;
 }

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/UpdateStorageLocationVo.java

@@ -21,4 +21,7 @@ public class UpdateStorageLocationVo {
     @ApiModelProperty(value = "要修改的库房位置")
     private String storageLocation;
 
+    @ApiModelProperty(value = "要修改的库房位置id")
+    private Integer storageLocationId;
+
 }

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

@@ -529,6 +529,16 @@ public class MatchingDeviceController {
             m.setDeviceId(0);
 
         }
+
+        if (matchingDeviceEditVo.getMatchingDeviceStorageLocation() != null &&
+                !m.getMatchingDeviceStorageLocation().equals(matchingDeviceEditVo.getMatchingDeviceStorageLocation())) {
+            //添加设备日志 存放位置
+            String remark = "将设备的存放位置改为" + matchingDeviceEditVo.getMatchingDeviceStorageLocation();
+            DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null,null);
+            deviceLogService.addLog(deviceLogDto);
+            m.setMatchingDeviceStorageLocation(m.getMatchingDeviceStorageLocation());
+            m.setMatchingDeviceStorageLocationId(m.getMatchingDeviceStorageLocationId());
+        }
         matchingDeviceLibraryService.update(m);
         return ResponseEntity.ok("修改成功");
     }

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

@@ -377,6 +377,8 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
                 predicateBuilder.in("rfidCardId", "");
             }
         }
+        predicateBuilder.eq(matchingDeviceSelectVo.getMatchingDeviceStorageLocationId() != null,
+                "matchingDeviceStorageLocationId",matchingDeviceSelectVo.getMatchingDeviceStorageLocationId());
         return predicateBuilder;
     }
 }

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

@@ -136,6 +136,12 @@ public class MatchingDeviceLibrary {
     @Transient
     private String deviceSeqNumber;
 
+    @ApiModelProperty(value = "存放位置")
+    private String matchingDeviceStorageLocation;
+
+    @ApiModelProperty(value = "存放位置id")
+    private Integer matchingDeviceStorageLocationId;
+
 
     public MatchingDeviceLibrary setConfigName(){
         ConfigCache configCache = SpringUtils.getBean("initConfigCache");

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

@@ -62,4 +62,10 @@ public class MatchingDeviceEditVo {
 
     @ApiModelProperty(value = "删除相关装备id")
     private Integer deleteDeviceId;
+
+    @ApiModelProperty(value = "存放位置")
+    private String matchingDeviceStorageLocation;
+
+    @ApiModelProperty(value = "存放位置id")
+    private Integer matchingDeviceStorageLocationId;
 }

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

@@ -58,6 +58,12 @@ public class MatchingDeviceSaveVo {
     @ApiModelProperty(value = "序列号集合")
     private List<String> seqList;
 
+    @ApiModelProperty(value = "存放位置")
+    private String matchingDeviceStorageLocation;
+
+    @ApiModelProperty(value = "存放位置id")
+    private Integer matchingDeviceStorageLocationId;
+
     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

@@ -33,6 +33,9 @@ public class MatchingDeviceSelectVo extends CustomPage {
     @ApiModelProperty(value = "查询是否打印标签（有没有表面号）装备")
     private Integer isPrint;
 
+    @ApiModelProperty(value = "存放位置id")
+    private Integer matchingDeviceStorageLocationId;
+
     private String typeDim;
 
     private String modelDim;

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillDetail.java

@@ -31,4 +31,6 @@ public class StorageBillDetail {
     private String typeName;
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation;
+    @ApiModelProperty(value = "装备存放位置的id",notes = "默认是库房id")
+    private Integer storageLocationId;
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillDetailVo.java

@@ -16,17 +16,25 @@ public class StorageBillDetailVo {
 
     @ApiModelProperty(value = "配件列表")
     List<StorageBillDetailVo> list;
+
     @ApiModelProperty(value = "列装id")
     private Integer packingId;
+
     @ApiModelProperty(value = "入库数量")
     private Integer storageCount;
+
     @ApiModelProperty(value = "序列号区间")
     private String seqInterval;
+
     @ApiModelProperty(value = "生产号区间")
     private String prodInterval;
+
     @ApiModelProperty(value = "列装装备")
     private PackingLibrary packingLibrary;
 
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation;
+
+    @ApiModelProperty(value = "装备存放位置的id",notes = "默认是库房id")
+    private Integer storageLocationId;
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillSaveVo.java

@@ -118,6 +118,9 @@ public class StorageBillSaveVo {
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation ;
 
+    @ApiModelProperty(value = "装备存放位置的id",notes = "默认是库房id")
+    private Integer storageLocationId;
+
     @ApiModelProperty(value = "是否是试用装备",notes = "0 是正式  1 是测试")
     private Integer tryOutDevice = 0;
 

dev-union/src/main/java/com/tykj/dev/union/RunController.java

-package com.tykj.dev.union;
-
-/**
- * @author zjm
- * @version 1.0.0
- * @ClassName AreaController.java
- * @Description TODO
- * @createTime 2020年09月04日 13:34:00
- */
-
-import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.device.user.subject.dao.AreaDao;
-import com.tykj.dev.device.user.subject.entity.Area;
-import com.tykj.dev.device.user.subject.entity.SecurityUser;
-import com.tykj.dev.device.user.subject.service.AreaService;
-import com.tykj.dev.misc.exception.ApiException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.Optional;
-
-/**
- * 区域视图层
- */
-@RestController
-@RequestMapping("/run")
-public class RunController {
-   @Autowired
-   DataInit dataInit;
-    @GetMapping(value = "/init2")
-    public ResponseEntity addPermissions(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
-        dataInit.init2();
-        return ResponseEntity.ok("ok");
-    }
-
-
-}
+//package com.tykj.dev.union;
+//
+///**
+// * @author zjm
+// * @version 1.0.0
+// * @ClassName AreaController.java
+// * @Description TODO
+// * @createTime 2020年09月04日 13:34:00
+// */
+//
+//import com.tykj.dev.config.swagger.AutoDocument;
+//import com.tykj.dev.device.user.subject.dao.AreaDao;
+//import com.tykj.dev.device.user.subject.entity.Area;
+//import com.tykj.dev.device.user.subject.entity.SecurityUser;
+//import com.tykj.dev.device.user.subject.service.AreaService;
+//import com.tykj.dev.misc.exception.ApiException;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.security.core.annotation.AuthenticationPrincipal;
+//import org.springframework.web.bind.annotation.*;
+//import springfox.documentation.annotations.ApiIgnore;
+//
+//import java.util.Optional;
+//
+///**
+// * 区域视图层
+// */
+//@RestController
+//@RequestMapping("/run")
+//public class RunController {
+//   @Autowired
+//   DataInit dataInit;
+//    @GetMapping(value = "/init2")
+//    public ResponseEntity addPermissions(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
+//        dataInit.init2();
+//        return ResponseEntity.ok("ok");
+//    }
+//
+//
+//}