修改mqtt添加监察单位逻辑

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

@@ -19,7 +19,8 @@ public enum CompanyTypeEnum {
     设计单位("DESIGN","设计单位","设计单位"),
     监检机构("MONITORING","检验检测单位","检验检测机构"),
     监理单位("SUPERVISOR","监理单位","监理单位(燃气管道)"),
-    监察单位("SUPERVISION","监察单位","监察单位");
+    监察单位("SUPERVISION","监察单位","监察单位"),
+    监管机构("SUPERVISION","监管机构","监管机构");
 
     String key;
     String type;

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.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.constants.XJConstant;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.component.robot.BadRequest;
 import org.springframework.beans.BeanUtils;
@@ -698,6 +699,8 @@ public class OrgServiceImpl {
                 }
                 one.setBizOrgName(jsonObject.getString("realName"));
                 if (ValidationUtil.isEmpty(one.getBizOrgName())) {
+                    Company company = saveMqtt(jsonObject);
+                    one.setSequenceNbr(company.getSequenceNbr());
                     one.setBizOrgName(jsonObject.getString("companyName"));
                     one.setOrgExpandAttr1(CompanyTypeEnum.registerNameMap.get(jsonObject.getString("companyType")));
                 }
@@ -864,4 +867,25 @@ public class OrgServiceImpl {
     public static String getOrgCodeStr() {
         return TreeParser.genTreeCode();
     }
+
+
+
+    public Company saveMqtt(JSONObject jsonObject){
+        String companyName = jsonObject.getString("companyName");
+        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Company::getName,companyName);
+        Company company = companyServiceImpl.getOne(wrapper);
+        if(ValidationUtil.isEmpty(company)){
+            company = new Company();
+        }
+        company.setName(companyName);
+        company.setContact(jsonObject.getString("contact"));
+        company.setContactPhone(jsonObject.getString("landlinePhone"));
+        company.setType(CompanyTypeEnum.registerNameMap.get(jsonObject.getString("companyType")));
+        company.setCreditCode(jsonObject.getString("companyCode"));
+        company.setAddress(jsonObject.getString("address"));
+        company.setApproved("已审核");
+        companyServiceImpl.saveOrUpdate(company);
+        return company;
+    }
 }