更新

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

@@ -28,6 +28,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -103,6 +104,7 @@ public class PackingController {
 
     @ApiOperation(value = "添加列装型号")
     @PostMapping("/add/model")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addModel(@RequestBody @Validated AddModel addModel){
         if (packingLibraryService.modelIsExist(addModel.getModel())){
             Map<String,Object> map = new HashMap<>();
@@ -155,13 +157,14 @@ public class PackingController {
 
     @ApiOperation(value = "添加列装装备")
     @PostMapping("/add")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addPack(@RequestBody @Validated AddPack addPack){
         if (packingLibraryService.nameIsExist(addPack.getModel(),addPack.getName())){
             Map<String,Object> map = new HashMap<>();
             map.put("error","型号"+addPack.getModel()+"下名称为"+addPack.getName()+"的装备已存在");
             return ResponseEntity.ok(map);
         }
-        if (packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(),addPack.getMatchingRange())){
+        if (packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(),addPack.getMatchingRange(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange())){
             Map<String,Object> map = new HashMap<>();
             map.put("error","型号"+addPack.getModel()+"下配用范围为"+configCache.getMatchingRangeMap().get(addPack.getMatchingRange())+"的装备已存在");
             return ResponseEntity.ok(map);
@@ -215,6 +218,7 @@ public class PackingController {
 
     @ApiOperation(value = "删除列装")
     @PostMapping("/delete/{id}")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity deleteById(@PathVariable("id") int id){
         packingLibraryService.deleteAll(id);
         return ResponseEntity.ok("删除成功");
@@ -222,6 +226,7 @@ public class PackingController {
 
     @ApiOperation(value = "清空列装回收站")
     @PostMapping("/clean")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity clean(@RequestBody List<Integer> ids){
         packingLibraryService.cleanAll(ids);
         return ResponseEntity.ok("删除成功");
@@ -229,6 +234,7 @@ public class PackingController {
 
     @ApiOperation(value = "退装恢复列装")
     @PostMapping("/remove")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity remove(@RequestBody List<Integer> ids){
         packingLibraryService.removeAll(ids);
         return ResponseEntity.ok("恢复成功");
@@ -378,6 +384,7 @@ public class PackingController {
 
     @ApiOperation(value = "编辑列装型号")
     @PostMapping("/update/model")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateModel(@RequestBody @Validated PackingModelEdit packingModelEdit){
         PackingLibrary packingLibrary = packingLibraryService.getOne(packingModelEdit.getPackingId());
         if (!packingLibrary.getModel().equals(packingModelEdit.getModel())&&packingLibraryService.modelIsExist(packingModelEdit.getModel())){
@@ -437,9 +444,10 @@ public class PackingController {
 
     @ApiOperation(value = "编辑列装装备")
     @PostMapping("/update/device")
+    @Transactional(rollbackFor = Exception.class)
     public ResponseEntity updateDevice(@RequestBody @Validated PackingLibraryUpdateVo packingLibraryUpdateVo){
         PackingLibrary packingLibrary = packingLibraryService.getOne(packingLibraryUpdateVo.getPackingId());
-        if (!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange())){
+        if (!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange(),packingLibraryUpdateVo.getType(),packingLibraryUpdateVo.getStyle(),packingLibraryUpdateVo.getName(),packingLibraryUpdateVo.getSecretLevel(),packingLibraryUpdateVo.getInvisibleRange())){
             throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的装备");
         }
         //复制相同的字段
@@ -450,6 +458,7 @@ public class PackingController {
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setName(packingLibraryUpdateVo.getName());
+            deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
             //添加列装日志
@@ -467,13 +476,14 @@ public class PackingController {
             packingLogService.add(packingLog);
             packingLibrary.setSecretLevel(packingLibraryUpdateVo.getSecretLevel());
         }
-        if (packingLibraryUpdateVo.getMatchingRange()!=null&&!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&!packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange())){
+        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());
             packingLogService.add(packingLog);
             packingLibrary.setMatchingRange(packingLibraryUpdateVo.getMatchingRange());
+            deviceLibraryDao.upDateMatchingRange(packingLibrary.getMatchingRange(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
             //添加列装日志

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -148,7 +148,7 @@ public interface PackingLibraryService {
 
     Boolean nameIsExist(String model,String name);
 
-    Boolean matchingRangeIsExist(Integer parentId,Integer matchingRange);
+    Boolean matchingRangeIsExist(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
 
 
     /**
@@ -156,7 +156,7 @@ public interface PackingLibraryService {
      * @param matchingRange 配用范围
      * 查询对应横向或纵向列装
      */
-    PackingLibrary findSamePacking(Integer parentId,Integer matchingRange);
+    PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
 
     /**
      * @param packingLibraries 父子结构列装

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -570,11 +570,16 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     }
 
     @Override
-    public Boolean matchingRangeIsExist(Integer parentId,Integer matchingRange) {
+    public Boolean matchingRangeIsExist(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("isRoot", 0);
         predicateBuilder.eq("partParentId", parentId);
         predicateBuilder.eq("matchingRange", matchingRange);
+        predicateBuilder.eq("type",type);
+        predicateBuilder.eq("style",style);
+        predicateBuilder.eq("name",name);
+        predicateBuilder.eq("secretLevel",secretLevel);
+        predicateBuilder.eq("invisibleRange",invisibleRange);
         return packingLibraryDao.findAll(predicateBuilder.build()).size()>0;
     }
 
@@ -584,7 +589,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
      * 查询对应横向或纵向列装
      */
     @Override
-    public PackingLibrary findSamePacking(Integer parentId,Integer matchingRange) {
+    public PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange) {
         List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatus(parentId,matchingRange,2);
         if (packingLibraries.isEmpty()){
             return null;