部件字典管理接口和部件po

energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitController.java

@@ -119,4 +119,9 @@ public class UnitController extends BaseServiceController {
     }
 
 
+
+
+
+
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/units/UnitDictController.java

@@ -42,6 +42,10 @@ public class UnitDictController extends BaseServiceController {
         if (unitDictConstantsDto.getParentId() != 0) {
             return ResultResp.FAIL("数据字典级别不对");
         }
+
+        if(!unitDictConstantsService.verifyUnitDictModel(unitDictConstantsDto)){
+            return ResultResp.FAIL("此类型部件已经存在！");
+        }
         unitDictConstantsDto.setCreateBy(getUserId());
         unitDictConstantsDto.setUpdateBy(getUserId());
         boolean flg = unitDictConstantsService.saveUnitDict(unitDictConstantsDto);

energy-manage-service/src/main/java/com/energy/manage/service/service/units/UnitDictConstantsService.java

@@ -128,5 +128,12 @@ public interface UnitDictConstantsService  {
      */
     boolean verifyUnitDictBrandModel(UnitDictBrandModelDto dto);
 
+    /**
+     * 验证部件是否已存在
+     * @param unitDictConstantsDto
+     * @return
+     */
+    boolean verifyUnitDictModel(UnitDictConstantsDto unitDictConstantsDto);
+
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -117,6 +117,7 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         PageHelper.startPage(unitDictConstantsPageDto.getPageNum(), unitDictConstantsPageDto.getPageSize());
         Example queryExample = new Example(UnitDictConstantsPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
+        queryExample.setOrderByClause("unit_module asc");
         if (!StringUtils.isEmpty(unitDictConstantsPageDto.getContentsName())) {
             criteria.andLike("contentsName", "%" + unitDictConstantsPageDto.getContentsName() + "%");
         }
@@ -295,12 +296,23 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         return count > 0 ? true : false;
     }
 
+    @Override
+    public boolean verifyUnitDictModel(UnitDictConstantsDto unitDictConstantsDto) {
+        Example queryExample = new Example(UnitDictConstantsPO.class);
+        Example.Criteria criteria = queryExample.createCriteria();
+        criteria.andEqualTo("unitModule", unitDictConstantsDto.getUnitModule());
+        criteria.andEqualTo("contentsDictKey", unitDictConstantsDto.getContentsDictKey());
+        criteria.andEqualTo("associatedFunctionType", unitDictConstantsDto.getAssociatedFunctionType());
+        return dictConstantsMapper.selectCountByExample(queryExample) > 0 ? true : false;
+    }
+
     /**
      * 删除品牌对应型号
+     *
      * @param brandKey
      * @return
      */
-    private void delBrandRedisKey(String brandKey){
+    private void delBrandRedisKey(String brandKey) {
         String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, brandKey);
         cacheService.delete(brandlistKey);
     }