[列装]修改了编辑装备名称一致的问题

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

@@ -511,8 +511,16 @@ public class PackingController {
             packingLog.setRemark("将名称从"+packingLibrary.getName()+"改为"+packingLibraryUpdateVo.getName());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
-            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())){
             //添加列装日志
@@ -614,6 +622,7 @@ public class PackingController {
             packingLibrary.setFileUrl(packingLibraryUpdateVo.getFileUrl());
             packingLibrary.setFileName(packingLibraryUpdateVo.getFileName());
         }
+
         packingLibraryService.update(packingLibrary);
         //发送阅知信息
         List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -26,4 +26,7 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
     List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
 
     PackingLibrary findByDeleteTagAndIdAndPackingStatus(Integer deleteTag,Integer id,Integer packingStatus);
+
+    List<PackingLibrary> findByInvisibleRangeAndTypeAndName(Integer invisibleRange,Integer type,String name);
 }
+