feat(列装模块,装备模块): 修改列装，装备对应修改

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

@@ -162,5 +162,12 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
     List<DeviceLibrary> findAllByPackingId(Integer packingIds);
 
     List<DeviceLibrary> findAllByPackingIdIn(List<Integer> packingIds);
+
+    @Transactional
+    @Modifying
+    @Query("update DeviceLibrary o set o.model = :model where o.id in :ids")
+    int batchUpdateDevices(String model, List<Integer> ids);
+
+    List<DeviceLibrary> findAllByModel(String model);
 }
 

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

@@ -226,4 +226,14 @@ public interface DeviceLibraryService {
 
     Map<Integer,List<DeviceLibrary>> findAllByPackingId3();
 
+    /**
+     * 批量更新装备
+     * @param model 装备的型号
+     * @param ids 装备的id
+     */
+    void batchUpdateDevices(String model,List<Integer> ids);
+    /**
+     * 通过型号查询装备
+     */
+    List<DeviceLibrary> findAllByModel(String model);
 }

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

@@ -663,6 +663,16 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         return  map;
     }
 
+    @Override
+    public void batchUpdateDevices(String model, List<Integer> ids) {
+        deviceLibraryDao.batchUpdateDevices(model,ids);
+    }
+
+    @Override
+    public List<DeviceLibrary> findAllByModel(String model) {
+        return deviceLibraryDao.findAllByModel(model);
+    }
+
 
     @Override
     public void isNotLoss(List<Integer> ids) {

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

@@ -26,6 +26,7 @@ import com.tykj.dev.misc.utils.*;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -45,6 +46,7 @@ import static java.util.stream.Collectors.groupingBy;
 @AutoDocument
 @RequestMapping("/packing")
 @Validated
+@Slf4j
 public class PackingController {
 
     @Autowired
@@ -501,6 +503,17 @@ public class PackingController {
             map.put("error","型号"+packingModelEdit.getModel()+"已存在");
             return ResponseEntity.ok(map);
         }
+        //判断该列装下有没有入库装备  有装备则进行装备的型号的修改
+        //通过型号查询装备
+//        List<DeviceLibrary> storagePackingDevices = deviceLibraryService.findAllByPackingId(packingLibrary.getId());
+        List<DeviceLibrary> storagePackingDevices = deviceLibraryService.findAllByModel(packingLibrary.getModel());
+        if(storagePackingDevices.size()>0){
+            //取出所有的装备id
+            List<Integer> ids = storagePackingDevices.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
+            //更新装备
+            deviceLibraryService.batchUpdateDevices(packingModelEdit.getModel(),ids);
+        }
+//        else {
             List<PackingLibrary> packingLibraries = new ArrayList<>();
             if (packingLibrary.getShowOrder()>packingModelEdit.getShowOrder()){
                 String model=" ";
@@ -551,6 +564,7 @@ public class PackingController {
             else {
                 throw new ApiException("传入的列装id不是型号");
             }
+//        }
         //更新缓存
         packingLibraryService.getSortMap();
         return ResponseEntity.ok(ResponseEntity.ok(packingModelEdit));
@@ -578,7 +592,7 @@ public class PackingController {
             deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
-            //添加列装日志
+            //添加列装应用类型日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将应用类型从"+configCache.getApplyTypeMap().getOrDefault(packingLibrary.getApplyType(),"空")+"改为"+configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType()));
             packingLog.setPackingId(packingLibrary.getId());
@@ -586,7 +600,7 @@ public class PackingController {
             packingLibrary.setApplyType(packingLibraryUpdateVo.getApplyType());
         }
         if (packingLibraryUpdateVo.getSecretLevel()!=null&&!packingLibraryUpdateVo.getSecretLevel().equals(packingLibrary.getSecretLevel())){
-            //添加列装日志
+            //添加列装密级日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将密级从"+configCache.getSecretLevelMap().getOrDefault(packingLibrary.getSecretLevel(),"空")+"改为"+configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel()));
             packingLog.setPackingId(packingLibrary.getId());
@@ -594,7 +608,7 @@ public class PackingController {
             packingLibrary.setSecretLevel(packingLibraryUpdateVo.getSecretLevel());
         }
         if (packingLibraryUpdateVo.getMatchingRange()!=null&&!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())){
-            //添加列装日志
+            //添加列装配用范围日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将配用范围从"+configCache.getMatchingRangeMap().getOrDefault(packingLibrary.getMatchingRange(),"空")+"改为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange()));
             packingLog.setPackingId(packingLibrary.getId());
@@ -603,7 +617,7 @@ public class PackingController {
             deviceLibraryDao.upDateMatchingRange(packingLibrary.getMatchingRange(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
-            //添加列装日志
+            //添加列装可见范围日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将可见范围从"+configCache.getInvisibleRangeMap().getOrDefault(packingLibrary.getInvisibleRange(),"空")+"改为"+configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange()));
             packingLog.setPackingId(packingLibrary.getId());
@@ -611,7 +625,7 @@ public class PackingController {
             packingLibrary.setInvisibleRange(packingLibraryUpdateVo.getInvisibleRange());
         }
         if (packingLibraryUpdateVo.getType()!=null&&!packingLibraryUpdateVo.getType().equals(packingLibrary.getType())){
-            //添加列装日志
+            //添加列装形态日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将形态从"+configCache.getStyleMap().getOrDefault(packingLibrary.getType(),"空")+"改为"+configCache.getStyleMap().get(packingLibraryUpdateVo.getType()));
             packingLog.setPackingId(packingLibrary.getId());
@@ -619,7 +633,7 @@ public class PackingController {
             packingLibrary.setType(packingLibraryUpdateVo.getType());
         }
         if (packingLibraryUpdateVo.getNature()!=null&&!packingLibraryUpdateVo.getNature().equals(packingLibrary.getNature())){
-            //添加列装日志
+            //添加列装性质日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将列装性质从"+configCache.getNatureMap().getOrDefault(packingLibrary.getNature(),"空")+"改为"+configCache.getNatureMap().get(packingLibraryUpdateVo.getNature()));
             packingLog.setPackingId(packingLibrary.getId());