fix(jg):工程装置编号校验

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImplService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
+import com.yeejoin.amos.boot.module.jg.api.dto.EquipRequestParamsDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
@@ -142,7 +144,6 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
     private JgUseRegistrationManageServiceImpl registrationManageService;
     @Autowired
     private CommonMapper commonMapper;
-
     @Autowired
     private EventPublisher eventPublisher;
 
@@ -188,6 +189,25 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
     }
 
     /**
+     * 检查本单位下工程装置名称和工程装置编号是不是一一对应的
+     * 不对应抛出异常
+     *
+     * @param paramsDto
+     */
+    void checkTheUnitProConMatching(EquipRequestParamsDto paramsDto) {
+        Integer existsConflictNum = this.lambdaQuery().eq(IdxBizJgProjectContraption::getUseUnitCreditCode, paramsDto.getCompanyCode()).eq(IdxBizJgProjectContraption::getUseUnitName, paramsDto.getCompanyName())
+                .eq(IdxBizJgProjectContraption::getIsIntoManagement, Boolean.TRUE)
+                .eq(IdxBizJgProjectContraption::getIsDelete, Boolean.FALSE)
+                .and(wrapper -> wrapper.ne(IdxBizJgProjectContraption::getProjectContraptionNo, paramsDto.getProjectContraptionNo()).eq(IdxBizJgProjectContraption::getProjectContraption, paramsDto.getProjectContraption())
+                        .or().eq(IdxBizJgProjectContraption::getProjectContraptionNo, paramsDto.getProjectContraptionNo()).ne(IdxBizJgProjectContraption::getProjectContraption, paramsDto.getProjectContraption())
+                )
+                .count();
+        if (existsConflictNum > 0) {
+            throw new BadRequest("工程装置名称或编号与本单位下的已存在的数据冲突！");
+        }
+    }
+
+    /**
      * 根据工程装置seq物理删除装置表数据和对应设备信息（数据库+es）
      *
      * @param sequenceNbr 工程装置表seq
@@ -765,6 +785,11 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
     public IdxBizJgProjectContraption saveFirstMergeProjectContraption(IdxBizJgProjectContraptionDto model) {
         // 单位类型
         Map<String, Object> companyInfoMap = jgInstallationNoticeService.getCompanyType();
+        this.checkTheUnitProConMatching(EquipRequestParamsDto.builder()
+                .projectContraptionNo(model.getProjectContraptionNo())
+                .projectContraption(model.getProjectContraption())
+                .companyCode(MapUtil.getStr(companyInfoMap,"creditCode"))
+                .build());
         IdxBizJgProjectContraption projectContraption = JSON.parseObject(toJSONString(model), IdxBizJgProjectContraption.class);
         String equListName = jgVehicleInformationMapper.getEquCategoryNameByCode(model.getEquListCode());
         String equCategoryName = jgVehicleInformationMapper.getEquCategoryNameByCode(model.getEquCategoryCode());
@@ -779,8 +804,8 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         projectContraption.setEquCategoryName(equCategoryName);
         projectContraption.setEquDefineName(equDefineName);
         projectContraption.setPipelineLength(0.0);
-        projectContraption.setUseUnitName(companyInfoMap.get("companyName").toString());
-        projectContraption.setUseUnitCreditCode(companyInfoMap.get("creditCode").toString());
+        projectContraption.setUseUnitName(MapUtil.getStr(companyInfoMap,"companyName"));
+        projectContraption.setUseUnitCreditCode(MapUtil.getStr(companyInfoMap,"creditCode"));
         this.saveOrUpdateData(projectContraption);
         return projectContraption;
     }