feat(装备模块,3D模块): 修改库房缓存

dev-library/src/main/java/com/tykj/dev/device/library/service/PublicController.java → dev-library/src/main/java/com/tykj/dev/device/library/controller/PublicController.java

-package com.tykj.dev.device.library.service;
+package com.tykj.dev.device.library.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
+import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.model.vo.ModifyWarehouseLocationsInBatchesVO;
 import com.tykj.dev.device.library.subject.vo.UpdateStorageLocationVo;
 import io.swagger.annotations.Api;
@@ -39,7 +41,7 @@ public class PublicController {
     public ResponseEntity<String> fnModifyWarehouseLocationsInBatches(@RequestBody ModifyWarehouseLocationsInBatchesVO
                                                                                   modifyWarehouseLocationsInBatchesVO){
             deviceLibraryPositionService.batchUpdateStorageLocation(modifyWarehouseLocationsInBatchesVO.getStorageLocationId(),
-                    modifyWarehouseLocationsInBatchesVO.getStorageLocationName(), modifyWarehouseLocationsInBatchesVO.getDeviceIds());
+                    modifyWarehouseLocationsInBatchesVO.getStorageLocation(), modifyWarehouseLocationsInBatchesVO.getDeviceIds());
         UpdateStorageLocationVo updateStorageLocationVo = new UpdateStorageLocationVo();
         BeanUtils.copyProperties(modifyWarehouseLocationsInBatchesVO,updateStorageLocationVo);
         deviceLibraryService.updateStorageLocation(updateStorageLocationVo);

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

@@ -177,15 +177,15 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
     }
 
 
-    private PredicateBuilder<DeviceLibraryPosition> createBuilder(QueryTheWarehouseVo queryTheWarehouseVo){
-        PredicateBuilder<DeviceLibraryPosition> predicateBuilder = Specifications.and();
-        List<Integer> storageLocationIds = queryTheWarehouseVo.getStorageLocationIds();
-        predicateBuilder.eq(queryTheWarehouseVo.getModel()!=null,"model",queryTheWarehouseVo.getModel());
-        predicateBuilder.eq(queryTheWarehouseVo.getName()!=null,"name",queryTheWarehouseVo.getName());
-        predicateBuilder.like(queryTheWarehouseVo.getSeqNumber()!=null,"seqNumber",
-                "%"+queryTheWarehouseVo.getSeqNumber()+"%");
-        predicateBuilder.in(queryTheWarehouseVo.getStorageLocationIds()!=null && !storageLocationIds.isEmpty(),
-                "storageLocationId",storageLocationIds.toArray(new Integer[]{}));
-        return predicateBuilder;
-    }
+//    private PredicateBuilder<DeviceLibraryPosition> createBuilder(QueryTheWarehouseVo queryTheWarehouseVo){
+//        PredicateBuilder<DeviceLibraryPosition> predicateBuilder = Specifications.and();
+//        List<Integer> storageLocationIds = queryTheWarehouseVo.getStorageLocationIds();
+//        predicateBuilder.eq(queryTheWarehouseVo.getModel()!=null,"model",queryTheWarehouseVo.getModel());
+//        predicateBuilder.eq(queryTheWarehouseVo.getName()!=null,"name",queryTheWarehouseVo.getName());
+//        predicateBuilder.like(queryTheWarehouseVo.getSeqNumber()!=null,"seqNumber",
+//                "%"+queryTheWarehouseVo.getSeqNumber()+"%");
+//        predicateBuilder.in(queryTheWarehouseVo.getStorageLocationIds()!=null && !storageLocationIds.isEmpty(),
+//                "storageLocationId",storageLocationIds.toArray(new Integer[]{}));
+//        return predicateBuilder;
+//    }
 }

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

@@ -1454,9 +1454,12 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             //新增装备的形态
             predicateBuilder.eq(deviceLibrarySelectVo.getType() != null,"type",deviceLibrarySelectVo.getType());
             //新增库房集合查询
-            predicateBuilder.in(deviceLibrarySelectVo.getStorageLocationIds() != null,"storageLocationId",
+            if (deviceLibrarySelectVo.getStorageLocationIds() != null){
+                predicateBuilder.notIn("storageLocationId",
                         deviceLibrarySelectVo.getStorageLocationIds().toArray(new Integer[]{}));
             }
+
+        }
         return predicateBuilder;
     }
 

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

@@ -238,7 +238,7 @@ public class DeviceLibrary implements Serializable {
     @ApiModelProperty(value = "对应申请任务id")
     private Integer applyTaskId;
 
-    @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
+    @ApiModelProperty(value = "装备存放位置",notes = "默认是库房,字段已经不用了，去库房表里面进行替换")
     private String storageLocation;
 
     @ApiModelProperty(value = "装备存放位置Id",notes = "默认是库房")
@@ -326,7 +326,8 @@ public class DeviceLibrary implements Serializable {
 
     public DeviceLibrary setConfigName(){
         ConfigCache configCache = SpringUtils.getBean("initConfigCache");
-        if (configCache != null) {
+        StoreCache storeCache=SpringUtils.getBean("initStoreCache");
+        if (configCache != null && storeCache!=null) {
             setSecretLevelName(configCache.getSecretLevelMap().get(this.secretLevel)==null?"-":configCache.getSecretLevelMap().get(this.secretLevel));
             setLifeStatusName(configCache.getLifeStatusMap().get(this.lifeStatus)==null?"-":configCache.getLifeStatusMap().get(this.lifeStatus));
             setMatchingRangeName(configCache.getMatchingRangeMap().get(this.matchingRange)==null?"-":configCache.getMatchingRangeMap().get(this.matchingRange));
@@ -335,7 +336,7 @@ public class DeviceLibrary implements Serializable {
             setStorageTypeName(configCache.getStorageTypeMap().get(this.storageType)==null?"-":configCache.getStorageTypeMap().get(this.storageType));
             setAllotTypeName(configCache.getAllotTypeMap().get(this.allotType)==null?"-":configCache.getAllotTypeMap().get(this.allotType));
 //            childs.clear();
-            setStorageLocation(StoreCache.idToName(this.storageLocationId));
+            setStorageLocation(storeCache.idToName(this.storageLocationId));
         }
         return this;
     }

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

@@ -21,6 +21,6 @@ public class ModifyWarehouseLocationsInBatchesVO {
     public Integer storageLocationId;
 
     @ApiModelProperty(value = "库房的名称")
-    public String storageLocationName;
+    public String storageLocation;
 
 }

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

@@ -25,7 +25,7 @@ public class QueryTheWarehouseVo extends CustomPage {
     @ApiModelProperty(value = "装备序列号", example = "123-1")
     public String seqNumber;
 
-    @ApiModelProperty(value = "其他库房ids")
+    @ApiModelProperty(value = "当前库房的id  我会取反操作")
     private List<Integer> storageLocationIds;
 
     @ApiModelProperty(value = "所属单位")

dev-user/src/main/java/com/tykj/dev/device/user/cache/StoreCache.java

@@ -35,9 +35,9 @@ public class StoreCache {
         return this;
     }
 
-    public static String idToName(Integer id){
-        StoreCache storeCache= new StoreCache();
-        return storeCache.idMap.getOrDefault(id, "");
+    public String idToName(Integer id){
+
+        return idMap.getOrDefault(id, "");
     }
 
 }