Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsAddEditFormDTO.java

@@ -126,6 +126,7 @@ public class IcDangerousChemicalsAddEditFormDTO implements Serializable {
     /**
      * 灵山：企业介绍
      */
+    @Length(max = 1000,groups = {LingShanAddGroup.class, LingShanEditGroup.class},message = "企业介绍最多输入1000字")
     private String companyProfile;
 
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcDangerousChemicalsListFormDTO.java

@@ -25,7 +25,7 @@ public class IcDangerousChemicalsListFormDTO extends PageFormDTO implements Seri
 
     /**
      * 灵山：GRID_ID的全路径；包含grid_id
-     * 接口内部赋值，用于sql
+     * 接口内部赋值，用于sql，只有orgType=agency时，使用此列查询
      */
     private String orgIdPath;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java

@@ -133,6 +133,24 @@ public class IcDangerousChemicalsController {
         return new Result();
     }
 
+    /**
+     * 批量删除
+     * @param tokenDto
+     * @param ids
+     * @return
+     */
+    @PostMapping("batch-del")
+    public Result delete(@LoginUser TokenDto tokenDto, @RequestBody List<String> ids) {
+        ids.forEach(id->{
+            IcDangerousChemicalsAddEditFormDTO formDTO=new IcDangerousChemicalsAddEditFormDTO();
+            formDTO.setIcDangerousChemicalsId(id);
+            formDTO.setCustomerId(tokenDto.getCustomerId());
+            formDTO.setUserId(tokenDto.getUserId());
+            icDangerousChemicalsService.delete(formDTO);
+        });
+        return new Result();
+    }
+
     /**
      * 重点危化品企业 查看详情
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java

@@ -49,7 +49,7 @@ public class IcDangerousChemicalsExcel {
     @ColumnWidth(25)
     private String securityPrincipalName;
 
-    @ExcelProperty(value = "安全负责电话人")
+    @ExcelProperty(value = "安全负责电话")
     @ColumnWidth(25)
     private String securityPrincipalMobile;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsImportListener.java

@@ -3,22 +3,29 @@ package com.epmet.model;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.PidUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerGridDTO;
 import com.epmet.entity.IcDangerousChemicalsEntity;
 import com.epmet.service.CoverageService;
+import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerGridService;
 import com.epmet.service.IcDangerousChemicalsService;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author zxc
@@ -31,6 +38,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
 
     private IcDangerousChemicalsService icDangerousChemicalsService;
     private CoverageService coverageService;
+    private CustomerAgencyService customerAgencyService;
     private CustomerGridService customerGridService;
     private String currentUserId;
     private String customerId;
@@ -39,11 +47,11 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
     private List<DangerousChemicalsModel.RowRemarkMessage> errorRows = new ArrayList<>();
     private List<DangerousChemicalsModel.RowRemarkMessage> otherRows = new ArrayList<>();
     private List<IcDangerousChemicalsEntity> insertList = new ArrayList<>();
-    private Map<String,String> existMap = null;
-    /**
-     * 危化品种类
-     */
-    private Map<String, String> dangerTypeMap;
+    private List<IcDangerousChemicalsEntity> updateList = new ArrayList<>();
+    // /**
+    //  * 危化品种类
+    //  */
+    // private Map<String, String> dangerTypeMap;
     /**
      * 企业类别
      */
@@ -60,6 +68,7 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
                                             String staffAgencyPath,
                                             IcDangerousChemicalsService icDangerousChemicalsService,
                                             CoverageService coverageService,
+                                            CustomerAgencyService customerAgencyService,
                                             CustomerGridService customerGridService,
                                             Map<String, String> dangerTypeMap,
                                             Map<String, String> categoryDictMap){
@@ -69,8 +78,9 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
         this.staffAgencyPath=staffAgencyPath;
         this.icDangerousChemicalsService = icDangerousChemicalsService;
         this.coverageService = coverageService;
+        this.customerAgencyService=customerAgencyService;
         this.customerGridService=customerGridService;
-        this.dangerTypeMap=dangerTypeMap;
+        // this.dangerTypeMap=dangerTypeMap;
         this.categoryDictMap=categoryDictMap;
     }
 
@@ -80,24 +90,72 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
         data.setRowNum(rowNum);
         try {
             ValidatorUtils.validateEntity(data);
-            //todo
-            // 所属组织，orgIdPath等等。。。。
             IcDangerousChemicalsEntity e = ConvertUtils.sourceToTarget(data, IcDangerousChemicalsEntity.class);
+            //验证所属组织填写的是否正确
+            CustomerAgencyDTO customerAgencyDTO=customerAgencyService.getByAgencyName(customerId,data.getAgencyName());
+            if(null==customerAgencyDTO){
+                throw new ValidateException(String.format("当前客户下，不存在【%s】",data.getAgencyName()));
+            }
+            //验证所属网格
+            if(StringUtils.isNotBlank(data.getGridName())){
+                CustomerGridDTO gridFormDto=new CustomerGridDTO();
+                gridFormDto.setCustomerId(customerId);
+                gridFormDto.setPid(customerAgencyDTO.getId());
+                gridFormDto.setGridName(data.getGridName());
+                CustomerGridDTO  gridDTO= customerGridService.get(gridFormDto);
+                if(null==gridDTO){
+                    throw new ValidateException(String.format("%s下，不存在【%s】",data.getAgencyName(),data.getGridName()));
+                }
+                // 企业属于网格
+                e.setOrgId(gridDTO.getId());
+                e.setOrgType(OrgTypeEnum.GRID.getCode());
+                e.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(),gridDTO.getPids()));
+            }else{
+                // 企业属于组织
+                e.setOrgId(customerAgencyDTO.getId());
+                e.setOrgType(OrgTypeEnum.AGENCY.getCode());
+                e.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(),customerAgencyDTO.getPids()));
+            }
+            // 验证企业类别
+            String categoryKey = StrConstant.EPMETY_STR;
+            for (Map.Entry<String, String> entry : categoryDictMap.entrySet()) {
+                if (data.getCategoryName().equals(entry.getValue())) {
+                    categoryKey = entry.getKey();
+                    break;
+                }
+            }
+            if (StringUtils.isBlank(categoryKey)) {
+                throw new ValidateException("【" + data.getCategoryName() + "】此企业类别不存在");
+            }
+            e.setCategory(categoryKey);
             e.setSourceType("import");
-            e.setAgencyId(staffAgencyId);
             e.setCustomerId(customerId);
+            e.setAgencyId(staffAgencyId);
             e.setAgencyIdPath(staffAgencyPath);
             e.setCreatedBy(currentUserId);
             e.setUpdatedBy(currentUserId);
-            insertList.add(e);
-            if (insertList.size() == NumConstant.ONE_HUNDRED){
+            e.setSecurityFlag("是".equals(data.getSecurityFlagName()) ? true : false);
+            // 判断是否存在
+            IcDangerousChemicalsEntity origin=icDangerousChemicalsService.get(e.getOrgId(),e.getName());
+            if (null != origin) {
+                e.setId(origin.getId());
+                updateList.add(origin);
+            } else {
+                insertList.add(e);
+            }
+            if (insertList.size() == NumConstant.ONE_HUNDRED) {
+                execPersist();
+            }
+            if (updateList.size() == NumConstant.ONE_HUNDRED) {
                 execPersist();
             }
         }catch (Exception e){
             String errorMsg = null;
             if (e instanceof ValidateException) {
                 errorMsg = ((ValidateException) e).getMsg();
-            } else {
+            }else if(e instanceof EpmetException){
+                errorMsg=((EpmetException) e).getMsg();
+            }else {
                 errorMsg = "未知错误";
                 log.error("【重点危化品企业导入】出错:{}", ExceptionUtils.getErrorStackTrace(e));
             }
@@ -118,43 +176,15 @@ public class DangerousChemicalsImportListener extends AnalysisEventListener<Dang
     private void execPersist() {
         try {
             if (CollectionUtils.isNotEmpty(insertList)) {
-                insertList.forEach(i -> {
-                    dangerTypeMap.forEach((k,v) -> {
-                        if (i.getDangerTypeName().equals(v)){
-                            i.setDangerType(k);
-                        }
-                    });
-                    categoryDictMap.forEach((k,v) -> {
-                        if (i.getCategoryName().equals(v)){
-                            i.setCategory(k);
-                        }
-                    });
-                });
-                Map<String, Long> groupByName = insertList.stream().collect(Collectors.groupingBy(IcDangerousChemicalsEntity::getName, Collectors.counting()));
-                groupByName.forEach((k,v) -> {
-                    if (v.compareTo(NumConstant.ONE_L) != NumConstant.ZERO){
-                        insertList.forEach(i -> {
-                            if (i.getName().equals(k)){
-                                i.setExistStatus(true);
-                            }
-                        });
-                    }
-                });
-                Map<Boolean, List<IcDangerousChemicalsEntity>> groupByStatus = insertList.stream().collect(Collectors.groupingBy(IcDangerousChemicalsEntity::getExistStatus));
-                if (CollectionUtils.isNotEmpty(groupByStatus.get(true))){
-                    groupByStatus.get(true).forEach(t -> {
-                        DangerousChemicalsModel.RowRemarkMessage errorRow = ConvertUtils.sourceToTarget(t, DangerousChemicalsModel.RowRemarkMessage.class);
-                        errorRow.setErrorInfo("表格中存在重复数据");
-                        errorRows.add(errorRow);
-                    });
-                }
-                if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){
-                    icDangerousChemicalsService.importInsert(groupByStatus.get(false));
-                }
+                icDangerousChemicalsService.insertBatch(insertList);
+            }
+
+            if (CollectionUtils.isNotEmpty(updateList)) {
+                icDangerousChemicalsService.updateBatchById(updateList);
             }
         } finally {
             insertList.clear();
-            existMap = null;
+            updateList.clear();
         }
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java

@@ -3,7 +3,6 @@ package com.epmet.model;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
@@ -17,8 +16,15 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class DangerousChemicalsModel {
 
+    @NotBlank(message = "所属组织不能为空")
+    @ExcelProperty(value = "所属组织")
+    private String agencyName;
+
+    @ExcelProperty(value = "所属网格")
+    private String gridName;
+
     @NotBlank(message = "企业名称不能为空")
-    @Length(max = 50,message = "企业名称长度超出50字限制")
+    @Length(max = 35, message = "企业名称最多输入35字")
     @ExcelProperty(value = "企业名称")
     private String name;
 
@@ -26,37 +32,82 @@ public class DangerousChemicalsModel {
     @ExcelProperty(value = "企业类型")
     private String categoryName;
 
-    @ExcelProperty(value = "周边安全间距（公里）")
-    private String safeDistance = NumConstant.ZERO_STR;
-
-    @ExcelProperty(value = "危化品种类")
-    private String dangerTypeName;
+    /**
+     * 灵山：是否重点安全企业；1是；0不是；必填
+     */
+    @NotBlank(message = "是否重点安全企业不能为空")
+    @ExcelProperty(value = "是否重点安全企业")
+    private String securityFlagName;
+
+    // @ExcelProperty(value = "周边安全间距（公里）")
+    // private String safeDistance = NumConstant.ZERO_STR;
+    //
+    // @ExcelProperty(value = "危化品种类")
+    // private String dangerTypeName;
+
+    @NotBlank(message = "企业地址不能为空")
+    @Length(max = 200, message = "企业地址最多输入200字")
+    @ExcelProperty(value = "企业地址")
+    private String address;
 
-    @ExcelProperty(value = "负责人")
+    @ExcelProperty(value = "联系人")
     private String principalName;
 
-    @Length(max = 50,message = "联系电话长度超出50字限制")
+    @Length(max = 50, message = "联系电话长度超出50字限制")
     @ExcelProperty(value = "联系电话")
     private String principalMobile;
 
-    @NotBlank(message = "经营地址不能为空")
-    @Length(max = 50,message = "经营地址长度超出50字限制")
-    @ExcelProperty(value = "经营地址")
-    private String address;
-
-    @ExcelProperty(value = "备注")
-    private String remark;
+    // @ExcelProperty(value = "备注")
+    // private String remark;
+
+    /**
+     * 灵山：安全负责人姓名
+     */
+    @ExcelProperty(value = "安全负责人姓名")
+    private String securityPrincipalName;
+
+    /**
+     * 灵山：手机号
+     */
+    @ExcelProperty(value = "手机号")
+    private String securityPrincipalMobile;
+
+    /**
+     * 灵山：包企领导
+     */
+    @ExcelProperty(value = "包企领导")
+    private String bqLd;
+
+    /**
+     * 灵山：包企干部
+     */
+    @ExcelProperty(value = "包企干部")
+    private String bqGb;
+
+    /**
+     * 灵山：企业介绍
+     */
+    @Length(max = 1000, message = "企业介绍最多输入1000字")
+    @ExcelProperty(value = "企业介绍")
+    private String companyProfile;
 
     @ExcelIgnore
     private Integer rowNum;
 
     @Data
     public static class RowRemarkMessage {
-
         @ExcelProperty(value = "行号")
         private Integer rowNum;
 
         @ColumnWidth(20)
+        @ExcelProperty(value = "所属组织")
+        private String agencyName;
+
+        @ColumnWidth(20)
+        @ExcelProperty(value = "所属网格")
+        private String gridName;
+
+        @ColumnWidth(40)
         @ExcelProperty(value = "企业名称")
         private String name;
 
@@ -64,29 +115,62 @@ public class DangerousChemicalsModel {
         @ExcelProperty(value = "企业类型")
         private String categoryName;
 
+        /**
+         * 灵山：是否重点安全企业；1是；0不是；必填
+         */
         @ColumnWidth(20)
-        @ExcelProperty(value = "周边安全间距（公里）")
-        private String safeDistance = NumConstant.ZERO_STR;
+        @ExcelProperty(value = "是否重点安全企业")
+        private String securityFlag;
 
-        @ColumnWidth(20)
-        @ExcelProperty(value = "危化品种类")
-        private String dangerTypeName;
+        @ColumnWidth(50)
+        @ExcelProperty(value = "企业地址")
+        private String address;
 
         @ColumnWidth(20)
-        @ExcelProperty(value = "负责人")
+        @ExcelProperty(value = "联系人")
         private String principalName;
 
         @ColumnWidth(20)
         @ExcelProperty(value = "联系电话")
         private String principalMobile;
 
-        @ColumnWidth(40)
-        @ExcelProperty(value = "经营地址")
-        private String address;
+        // @ExcelProperty(value = "备注")
+        // private String remark;
 
-        @ColumnWidth(60)
-        @ExcelProperty(value = "备注")
-        private String remark;
+        /**
+         * 灵山：安全负责人姓名
+         */
+        @ColumnWidth(20)
+        @ExcelProperty(value = "安全负责人姓名")
+        private String securityPrincipalName;
+
+        /**
+         * 灵山：手机号
+         */
+        @ColumnWidth(20)
+        @ExcelProperty(value = "手机号")
+        private String securityPrincipalMobile;
+
+        /**
+         * 灵山：包企领导
+         */
+        @ColumnWidth(30)
+        @ExcelProperty(value = "包企领导")
+        private String bqLd;
+
+        /**
+         * 灵山：包企干部
+         */
+        @ColumnWidth(30)
+        @ExcelProperty(value = "包企干部")
+        private String bqGb;
+
+        /**
+         * 灵山：企业介绍
+         */
+        @ColumnWidth(5)
+        @ExcelProperty(value = "企业介绍")
+        private String companyProfile;
 
         @ColumnWidth(60)
         @ExcelProperty("错误信息")

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -18,7 +18,6 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -355,4 +354,6 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Date 2022/11/30 22:41
      **/
     Result<List<CurrentUserCommunityInfoResultDTO>> getCurrentUserCommunityInfo(TokenDto tokenDTO);
+
+    CustomerAgencyDTO getByAgencyName(String customerId,String agencyName);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -387,4 +387,6 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @param formDTO
      */
     void abandonGridForDealBizData(AbandonGridFormDTO formDTO);
+
+    CustomerGridDTO get(CustomerGridDTO forDto);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java

@@ -81,5 +81,5 @@ public interface IcDangerousChemicalsService extends BaseService<IcDangerousChem
     void dangerousChemicalsImport(Path filePath, String importTaskId, TokenDto tokenDto);
 
     void importInsert(List<IcDangerousChemicalsEntity> entityList);
-
+    IcDangerousChemicalsEntity get(String orgId, String name);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1607,4 +1608,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return new Result<List<CurrentUserCommunityInfoResultDTO>>().ok(list);
     }
 
+    @Override
+    public CustomerAgencyDTO getByAgencyName(String customerId,String agencyName) {
+        LambdaQueryWrapper<CustomerAgencyEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(CustomerAgencyEntity::getOrganizationName,agencyName)
+                .eq(CustomerAgencyEntity::getCustomerId,customerId)
+                .last("limit 1");
+        CustomerAgencyEntity customerAgencyEntity=baseDao.selectOne(queryWrapper);
+        return ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -1095,4 +1095,14 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         baseDao.update(null,updateGrid);
     }
 
+    @Override
+    public CustomerGridDTO get(CustomerGridDTO formDto) {
+        LambdaQueryWrapper<CustomerGridEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(formDto.getCustomerId()),CustomerGridEntity::getCustomerId,formDto.getCustomerId())
+                .eq(StringUtils.isNotBlank(formDto.getPid()),CustomerGridEntity::getPid,formDto.getPid())
+                .eq(StringUtils.isNotBlank(formDto.getGridName()),CustomerGridEntity::getGridName,formDto.getGridName())
+                .last("limit 1");
+        CustomerGridEntity customerGridEntity=baseDao.selectOne(queryWrapper);
+        return ConvertUtils.sourceToTarget(customerGridEntity,CustomerGridDTO.class);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@@ -21,6 +21,7 @@ import com.epmet.dao.IcDangerousChemicalsDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcDangerousChemicalsDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO;
 import com.epmet.dto.form.IcDangerousChemicalsListFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
@@ -84,6 +85,8 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
     private OssFeignClient ossFeignClient;
     @Autowired
     private CustomerGridService customerGridService;
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
 
     @Override
     public PageData<IcDangerousChemicalsListResultDTO> list(IcDangerousChemicalsListFormDTO formDTO) {
@@ -121,6 +124,14 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
                 if (StringUtils.isNotBlank(v.getDangerType())) {
                     v.setDangerTypeName(statusMap.get(v.getDangerType()));
                 }
+                if(OrgTypeEnum.GRID.getCode().equals(v.getOrgType())){
+                    BelongGridNameFormDTO belongGridNameFormDTO=new BelongGridNameFormDTO();
+                    belongGridNameFormDTO.setGridId(v.getOrgId());
+                    v.setOrgName(customerGridService.getGridNameByGridId(belongGridNameFormDTO).getBelongsGridName());
+                }else if(OrgTypeEnum.AGENCY.getCode().equals(v.getOrgType())){
+                    v.setOrgName(customerAgencyService.getAgencyName(v.getOrgId()));
+                }
+
             }
         }
 
@@ -145,11 +156,11 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getUserId());
         entity.setAgencyId(staffInfoCacheResult.getAgencyId());
         entity.setAgencyIdPath(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) ? staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()) : staffInfoCacheResult.getAgencyId());
-        if(OrgTypeEnum.GRID.equals(formDTO.getOrgType())){
+        if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){
             // 获取网格信息
             CustomerGridDTO customerGridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerGridDTO.getId(),customerGridDTO.getPids()));
-        }else if(OrgTypeEnum.AGENCY.equals(formDTO.getOrgType())){
+        }else if(OrgTypeEnum.AGENCY.getCode().equals(formDTO.getOrgType())){
             CustomerAgencyDTO customerAgencyDTO=SpringContextUtils.getBean(CustomerAgencyService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(),customerAgencyDTO.getPids()));
         }
@@ -162,7 +173,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
      * @param name
      * @param icDangerousChemicalsId
      */
-    private void checkNameUnqiue(String orgId, String name, String icDangerousChemicalsId) {
+    public void checkNameUnqiue(String orgId, String name, String icDangerousChemicalsId) {
         LambdaQueryWrapper<IcDangerousChemicalsEntity> tWrapper = new LambdaQueryWrapper<>();
         tWrapper.eq(IcDangerousChemicalsEntity::getOrgId, orgId);
         tWrapper.eq(IcDangerousChemicalsEntity::getName, name)
@@ -184,11 +195,11 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getUserId());
         entity.setAgencyId(staffInfoCacheResult.getAgencyId());
         entity.setAgencyIdPath(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) ? staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()) : staffInfoCacheResult.getAgencyId());
-        if(OrgTypeEnum.GRID.equals(formDTO.getOrgType())){
+        if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){
             // 获取网格信息
             CustomerGridDTO customerGridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerGridDTO.getId(),customerGridDTO.getPids()));
-        }else if(OrgTypeEnum.AGENCY.equals(formDTO.getOrgType())){
+        }else if(OrgTypeEnum.AGENCY.getCode().equals(formDTO.getOrgType())){
             CustomerAgencyDTO customerAgencyDTO=SpringContextUtils.getBean(CustomerAgencyService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(),customerAgencyDTO.getPids()));
         }
@@ -259,6 +270,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
                     staffInfo.getAgencyId(),staffAgencyPath,
                     this,
                     coverageService,
+                    customerAgencyService,
                     customerGridService,
                     dangerTypeMap,
                     categoryDictMap);
@@ -337,4 +349,10 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
         baseDao.importInsert(entityList);
     }
 
+    @Override
+    public IcDangerousChemicalsEntity get(String orgId, String name) {
+        LambdaQueryWrapper<IcDangerousChemicalsEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(IcDangerousChemicalsEntity::getOrgId,orgId).eq(IcDangerousChemicalsEntity::getName,name);
+        return baseDao.selectOne(queryWrapper);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@@ -73,12 +73,6 @@
             dc.ORG_ID orgId,
             dc.org_type orgType,
             dc.org_id_path as orgIdPath,
-            (
-             case when dc.org_type='grid'then select concat(a.ORGANIZATION_NAME,'-',cg.GRID_NAME) from customer_grid cg inner join customer_agency a on(cg.pid=a.id) where cg.id=dc.org_id
-                when dc.org_type='agency' then select dc.ORGANIZATION_NAME from customer_agency ca where ca.id=dc.org_id
-                else ''
-                end
-            ) as orgName,
             dc.agency_id agencyId,
             dc.source_type sourceType,
             dc.`name` name,
@@ -94,6 +88,7 @@
             dc.remark remark,
             dc.SECURITY_FLAG securityFlag,
             dc.SECURITY_PRINCIPAL_NAME securityPrincipalName,
+            dc.SECURITY_PRINCIPAL_MOBILE securityPrincipalMobile,
             dc.BQ_LD bqLd,
             dc.BQ_GB bqGb,
             dc.COMPANY_PROFILE companyProfile