更新

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

@@ -53,4 +53,8 @@ public class Script {
     public void addChildNode(Script script) {
         childs.add(script);
     }
+
+    public int getLength(){
+        return this.seqNumber.length();
+    }
 }

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

@@ -505,22 +505,25 @@ public class PackingController {
             throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同装备");
         }
         //复制相同的字段
-        if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())){
+        if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())){
+            if (packingLibraryService.nameIsExist(packingLibrary.getModel(),packingLibraryUpdateVo.getName(),packingLibrary.getPartParentId())){
+                throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同名称装备");
+            }
             //添加列装日志
             PackingLog packingLog = new PackingLog();
             packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             //根据装备可见范围，配用范围，形态查询数据库
-            List<PackingLibrary> byInvisibleRangeAndTypeAndName = packingLibraryDao.findByInvisibleRangeAndTypeAndName(packingLibraryUpdateVo.getInvisibleRange(), packingLibraryUpdateVo.getType(), packingLibraryUpdateVo.getName());
-            if (byInvisibleRangeAndTypeAndName.size() >1){
-                Map<String, Object> map = new HashMap<>();
-                map.put("error","该装备的名称已经被占用了");
-                return ResponseEntity.ok(map);
-            }else {
-                packingLibrary.setName(packingLibraryUpdateVo.getName());
-                deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
-            }
+//            List<PackingLibrary> byInvisibleRangeAndTypeAndName = packingLibraryDao.findByInvisibleRangeAndTypeAndName(packingLibraryUpdateVo.getInvisibleRange(), packingLibraryUpdateVo.getType(), packingLibraryUpdateVo.getName());
+//            if (byInvisibleRangeAndTypeAndName.size() >1){
+//                Map<String, Object> map = new HashMap<>();
+//                map.put("error","该装备的名称已经被占用了");
+//                return ResponseEntity.ok(map);
+//            }else {
+//                packingLibrary.setName(packingLibraryUpdateVo.getName());
+//                deviceLibraryDao.upDateName(packingLibrary.getName(),packingLibrary.getId());
+//            }
         }
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
             //添加列装日志

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

@@ -146,7 +146,7 @@ public interface PackingLibraryService {
      */
     void changeAllModel(Integer id,String model);
 
-    Boolean nameIsExist(String model,String name);
+    Boolean nameIsExist(String model,String name ,Integer partParentId);
 
     Boolean matchingRangeIsExist(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
 

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

@@ -414,7 +414,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         for (Script s:conList) {
             addScript(scriptList,s);
         }
-        return scriptList.stream().sorted(Comparator.comparing(Script::getSeqNumber).reversed()).collect(Collectors.toList());
+        return scriptList.stream().sorted(Comparator.comparing(Script::getLength).reversed()).collect(Collectors.toList());
     }
 
     @Override
@@ -455,7 +455,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             addScript(scriptList,s);
         }
         scriptList.forEach(script -> script.setChilds(null));
-        return scriptList.stream().sorted(Comparator.comparing(Script::getSeqNumber).reversed()).collect(Collectors.toList());
+        return scriptList.stream().sorted(Comparator.comparing(Script::getLength).reversed()).collect(Collectors.toList());
     }
 
     private void addScript(List<Script> scripts,Script script){
@@ -564,11 +564,12 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     }
 
     @Override
-    public Boolean nameIsExist(String model, String name) {
+    public Boolean nameIsExist(String model, String name ,Integer partParentId) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("isRoot", 0);
         predicateBuilder.eq("model", model);
         predicateBuilder.eq("name", name);
+        predicateBuilder.eq("partParentId", partParentId);
         return packingLibraryDao.findAll(predicateBuilder.build()).size()>0;
     }
 

pom.xml

@@ -140,11 +140,6 @@
                 <version>1.0-SNAPSHOT</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.tykj</groupId>
-                <artifactId>dev-questionbank</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>com.tykj</groupId>
                 <artifactId>dev-confirmcheck</artifactId>
@@ -247,6 +242,11 @@
                 <artifactId>dev-excel</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>com.tykj</groupId>
+                <artifactId>dev-questionbank</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>