企业注册修改

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/CompanyTypeEnum.java

@@ -14,24 +14,27 @@ import java.util.Map;
 @AllArgsConstructor
 public enum CompanyTypeEnum {
 
-    建设单位("CONSTRUCTION","建设单位"),
-    安装单位("INSTALL","安装单位"),
-    设计单位("DESIGN","设计单位"),
-    监检机构("MONITORING","检验检测单位"),
-    监理单位("SUPERVISOR","监理单位");
+    建设单位("CONSTRUCTION","建设单位","使用单位"),
+    安装单位("INSTALL","安装单位","安装改造维修单位"),
+    设计单位("DESIGN","设计单位","设计单位"),
+    监检机构("MONITORING","检验检测单位","检验检测机构"),
+    监理单位("SUPERVISOR","监理单位","监理单位(燃气管道)");
 
     String key;
     String type;
+    String registerName;
 
 
     public static List<Map<String,String>> mapList = new ArrayList<>();
-
+    public static Map<String,String> registerNameMap = new HashMap<>();
     static{
         for(CompanyTypeEnum companyTypeEnum:CompanyTypeEnum.values()){
             Map<String,String> map = new HashMap();
             map.put("name", companyTypeEnum.getType());
             map.put("id", companyTypeEnum.getKey());
             mapList.add(map);
+
+            registerNameMap.put(companyTypeEnum.getRegisterName(),companyTypeEnum.getKey());
         }
     }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/emqx/PlatformUserTopicMessage.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.CompanyServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -69,8 +70,8 @@ public class PlatformUserTopicMessage extends EmqxListener {
         try {
             if (StringUtils.isNotEmpty(path)) {
                 if (path.contains("company")) {
+                    Company company = companyService.saveOrUpdate(dataResult);
                     orgService.saveOrUpdateUser(dataResult, OrgEnum.公司.getKey());
-                    companyService.saveOrUpdate(dataResult);
                 } else if (path.contains("department")) {
                     orgService.saveOrUpdateUser(dataResult, OrgEnum.部门.getKey());
                 } else if (path.contains("agencyuser")) {

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -6,9 +6,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyExamineEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
@@ -247,8 +249,16 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
 //                Iterator iterator = roleNameSet.iterator();
 
                 //将用户原来的角色与ugp中的角色合并
-                roleIds.addAll(agencyUserModel.getOrgRoleSeqs().get(companyModelFeignClient.getSequenceNbr()));
-                userRoleList.addAll(agencyUserModel.getOrgRoles().get(companyModelFeignClient.getSequenceNbr()));
+                List roleSeqList = agencyUserModel.getOrgRoleSeqs().get(companyModelFeignClient.getSequenceNbr());
+                if(!ValidationUtil.isEmpty(roleSeqList)) {
+                    roleIds.addAll(roleSeqList);
+                }
+                if(!ValidationUtil.isEmpty(agencyUserModel.getOrgRoles())) {
+                    List roleList = agencyUserModel.getOrgRoles().get(companyModelFeignClient.getSequenceNbr());
+                    if (!ValidationUtil.isEmpty(roleList)) {
+                        userRoleList.addAll(roleList);
+                    }
+                }
                 allRoleList.stream().forEach(r -> {
                     if(roleNameSet.contains(r.getRoleName())){
                         if(!userRoleList.contains(r)) {
@@ -362,7 +372,16 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
 
 
         //存入数据
-        model = companyServiceImpl.createWithModel(model);
+        LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
+        companyWrapper.eq(Company::getName,model.getName());
+        List<Company> list = this.list(companyWrapper);
+        if(ValidationUtil.isEmpty(list)) {
+            model = companyServiceImpl.createWithModel(model);
+        }else {
+            model.setSequenceNbr(list.iterator().next().getSequenceNbr());
+            this.updateWithModel(model);
+        }
+
 //        //浅拷贝
 //        BeanUtils.copyProperties(model,companys);
 //        //获取当前注册企业的区域规则
@@ -464,13 +483,14 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             if(!ValidationUtil.isEmpty(orgService.getOrgUsrById(String.valueOf(model.getSequenceNbr())))) {
                 orgService.delectInfo(String.valueOf(model.getSequenceNbr()));
             }
-
+            log.error(e.getMessage());
+            e.printStackTrace();
             throw new Exception("同步失败，已删除同步内容");
         }
     }
 
 
-    public void saveOrUpdate(JSONObject jsonObject) {
+    public Company saveOrUpdate(JSONObject jsonObject) {
         QueryWrapper<Company> companyQueryWrapper = new QueryWrapper<>();
         companyQueryWrapper.lambda().eq(Company::getName, jsonObject.getString("companyName"));
         companyQueryWrapper.lambda().eq(Company::getIsDelete, Boolean.FALSE);
@@ -480,12 +500,13 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         }
         company.setRecDate(new Date());
         company.setName(jsonObject.getString("companyName"));
-        company.setType(jsonObject.getString("companyType"));
+        company.setType(CompanyTypeEnum.registerNameMap.get(jsonObject.getString("companyType")));
         company.setAddress(jsonObject.getString("address"));
         company.setApproved("1");
         company.setOrgCode(jsonObject.getString("orgCode"));
         company.setRecDate(new Date());
         //存入数据
         this.saveOrUpdate(company);
+        return company;
     }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormInstanceServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
@@ -82,6 +83,7 @@ public class OrgServiceImpl {
      */
     public OrgUsrDto dataHandling(JSONObject jsonObject, String bizOrgType,String sequenceNbr){
         OrgUsr orgUsr = saveOrgUsr(jsonObject,bizOrgType,sequenceNbr);
+        sequenceNbr = String.valueOf(orgUsr.getSequenceNbr());
         //条件构造器 找出column表种 类型为（COMPANY 或 DEPARTMENT 或 PERSON）的列
         LambdaQueryWrapper<DynamicFormColumn> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(DynamicFormColumn::getGroupCode,bizOrgType);
@@ -141,6 +143,7 @@ public class OrgServiceImpl {
     public OrgUsr saveOrgUsr(JSONObject jsonObject,String bizOrgType,String sequenceNbr){
         ReginParams reginParams = getReginParams();
         OrgUsr orgUsr = new OrgUsr();
+
         if(!ValidationUtil.isEmpty(sequenceNbr)) {
             if (!ValidationUtil.isEmpty(orgUsrServiceImpl.getById(sequenceNbr))) {
                 orgUsr = orgUsrServiceImpl.getById(sequenceNbr);
@@ -233,8 +236,17 @@ public class OrgServiceImpl {
         } else {
             orgUsr.setBizOrgCode(OrgUsrServiceImpl.getOrgCodeStr());
         }
-
-        orgUsrServiceImpl.saveOrUpdate(orgUsr);
+        LambdaQueryWrapper<OrgUsr> orgUsrLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        orgUsrLambdaQueryWrapper.eq(OrgUsr::getBizOrgName,jsonObject.getString("name"));
+        OrgUsr orgUsrOld = orgUsrServiceImpl.getOne(orgUsrLambdaQueryWrapper);
+        if(ValidationUtil.isEmpty(orgUsrOld)) {
+            orgUsrServiceImpl.saveOrUpdate(orgUsr);
+        } else {
+            if (OrgEnum.普通人员.getKey().equals(bizOrgType)) {
+                orgUsr.setSequenceNbr(orgUsrOld.getSequenceNbr());
+            }
+            orgUsrServiceImpl.saveOrUpdate(orgUsr,orgUsrLambdaQueryWrapper);
+        }
         return orgUsr;
     }
 
@@ -652,6 +664,10 @@ public class OrgServiceImpl {
             throw new BadRequest("数据不完整");
         }
         one.setBizOrgName(jsonObject.getString("realName"));
+        if(ValidationUtil.isEmpty(one.getBizOrgName())){
+            one.setBizOrgName(jsonObject.getString("companyName"));
+            one.setOrgExpandAttr1(CompanyTypeEnum.registerNameMap.get(jsonObject.getString("companyType")));
+        }
         if (StringUtils.isEmpty(one.getBizOrgCode())) {
             if (OrgEnum.公司.getKey().equals(orgType)) {
                 one.setBizOrgCode(!ObjectUtils.isEmpty(parentOne) ? parentOne.getBizOrgCode() + getOrgCodeStr() : getOrgCodeStr());