企业同步一次性接口修改

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaBusinessServiceImpl.java

@@ -68,7 +68,14 @@ public class TaBusinessServiceImpl extends BaseService<TaAccessConfigModel, TaAc
 			String street = address.substring(area.length()).substring(0,address.substring(area.length()).indexOf("号")+1);
 			String community = address.substring(area.length()+street.length());
 
-			String industry = getIndustry(data.getString("hydm"));
+			String industry = "";
+			if(!ValidationUtil.isEmpty(data.get("hydm"))){
+				if(data.getString("hydm").length() > 2){
+					industry = getIndustry(data.getString("hydm"));
+				}
+
+			}
+
 
 			//所属行业
 			result.put("industry", industry);

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/SpeUseUnit.java

@@ -27,6 +27,8 @@ public class SpeUseUnit implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id")
+    private String id;
 
     @ApiModelProperty(value = "单位名称")
     private String name;
@@ -145,5 +147,8 @@ public class SpeUseUnit implements Serializable {
     @ApiModelProperty(value = "同步id")
     private String syncId;
 
+    @ApiModelProperty(value = "同步状态")
+    private Integer syncState;
+
 
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java

@@ -70,10 +70,10 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
 
         //判断库中company是否重复
-        CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyName(object.getString("unit_name")).getResult();
+        CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(object.getString("unit_code")).getResult();
 
         QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-        queryWrapper.eq("use_unit",object.getString("unit_name"));
+        queryWrapper.eq("use_code",object.getString("unit_code"));
         TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
 
         CompanyModel companyModel = new CompanyModel();
@@ -104,15 +104,15 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
 
         //业务表更新条件构造器
         UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("Use_unit",object.getString("unit_name"));
+        updateWrapper.eq("Use_code",object.getString("unit_code"));
 
 
 
-        String regCode = object.getString("reg_code")+"000";
+        String regCode = object.getString("reg_code");
         CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
         if(ValidationUtil.isEmpty(privilegeCompanyModel)){
-            privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000000").getResult();
+            privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
         }
 
         try {
@@ -152,6 +152,11 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
             }
             else {
                 //当企业表、平台表 中有时
+                if(ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getRecDate())){
+                    //如果库中没有存时间，则默认为1990-01-01
+                    SimpleDateFormat sdft = new SimpleDateFormat("yyyy-MM-dd");
+                    tzBaseEnterprisePrivilegeInfo.setRecDate(sdft.parse("1990-01-01"));
+                }
                 if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
                     if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
                         tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
 import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 import java.util.*;
@@ -72,7 +73,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 	private IBaseUnitLicenceService iBaseUnitLicenceService;
 
 	@Autowired
-	private ISpeUseUnitService speUseUnitService;
+	private SpeUseUnitServiceImpl speUseUnitService;
 
 	@Autowired
 	private AccessFeignService accessFeignService;
@@ -185,20 +186,25 @@ public class TzBaseEnterpriseInfoServiceImpl
 			List<SpeUseUnit> speUseUnitList = speUseUnitService.page(page).getRecords();
 			for (SpeUseUnit speUseUnit : speUseUnitList) {
 
-				CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyName(speUseUnit.getName()).getResult();
+				if(speUseUnit.getSyncState() != 3){
+					CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(speUseUnit.getCerCode()).getResult();
 					QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
-				queryWrapper.eq("use_unit",speUseUnit.getName());
+					queryWrapper.eq("use_code",speUseUnit.getCerCode());
 					TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = this.getOne(queryWrapper);
 
 					Map<String, Object> resultMap = accessFeignService.getData(speUseUnit.getCerCode()).getResult();
 
 					if (ValidationUtil.isEmpty(resultMap)){
 						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){
+							List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(),null,null,null).getResult();
+							if(ValidationUtil.isEmpty(agencyUserModelList)){
 								Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
-					}
 								if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
 									this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
 								}
+							}
+						}
+
 					}else {
 						CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
 						CompanyModel companyModel = new CompanyModel();
@@ -211,17 +217,16 @@ public class TzBaseEnterpriseInfoServiceImpl
 						companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
 
 
-
 						String area = String.valueOf(resultMap.get("area"));
 						String province = "";
-					if(area.contains("省")){
-						province = area.substring(0,area.indexOf("省")+1);
+						if (area.contains("省")) {
+							province = area.substring(0, area.indexOf("省") + 1);
 						}
 						String city = "";
-					if(area.contains("市")){
-						city = area.substring(province.length(),area.indexOf("市")+1);
+						if (area.contains("市")) {
+							city = area.substring(province.length(), area.indexOf("市") + 1);
 						}
-					String district = area.substring(city.length()+province.length());
+						String district = area.substring(city.length() + province.length());
 						TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
 						baseEnterpriseInfo.setUseUnit(speUseUnit.getName());
 						baseEnterpriseInfo.setUseCode(speUseUnit.getCerCode());
@@ -230,7 +235,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 						baseEnterpriseInfo.setProvince(province);
 						baseEnterpriseInfo.setCity(city);
 						baseEnterpriseInfo.setDistrict(district);
-					baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("district")));
+						baseEnterpriseInfo.setStreet(String.valueOf(resultMap.get("street")));
 						baseEnterpriseInfo.setCommunity(String.valueOf(resultMap.get("community")));
 						baseEnterpriseInfo.setAddress(String.valueOf(resultMap.get("address")));
 						baseEnterpriseInfo.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
@@ -242,55 +247,46 @@ public class TzBaseEnterpriseInfoServiceImpl
 						baseEnterpriseInfoList.add(baseEnterpriseInfo);
 
 
-
 						//保存平台和业务的企业信息
 						try {
 							if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
 								//当企业表、平台表 中没有时
 								this.save(baseEnterpriseInfo);
 								Privilege.companyClient.create(companyModel);
-						} else if(tzBaseEnterprisePrivilegeInfo == null){
+							} else if (tzBaseEnterprisePrivilegeInfo == null) {
 								//企业表没有，平台表有
-							if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
-								companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
-								Privilege.companyClient.update(companyModel,companyPrivilegeModel.getSequenceNbr());
+								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
 								}
 								this.save(baseEnterpriseInfo);
-						} else if(companyPrivilegeModel == null){
+							} else if (companyPrivilegeModel == null) {
 								//平台表没有，企业表有
-							if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())){
-								baseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+baseEnterpriseInfo.getUnitType());
-								this.updateById(baseEnterpriseInfo);
+								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+									this.updateById(tzBaseEnterprisePrivilegeInfo);
 								}
 								Privilege.companyClient.create(companyModel);
-						}
-						else {
+							} else {
 								//企业表有 平台表有
-							if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
-								companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
-								Privilege.companyClient.update(companyModel,companyPrivilegeModel.getSequenceNbr());
+								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
+									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
+									this.updateById(tzBaseEnterprisePrivilegeInfo);
 								}
-							if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())){
-								baseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+baseEnterpriseInfo.getUnitType());
-								this.updateById(baseEnterpriseInfo);
+								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
+									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
+									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
 								}
+
+
 							}
 						} catch (Exception e) {
 							System.out.println(e.getMessage());
 						}
 					}
-
-//				if(ValidationUtil.isEmpty(companyMap.get(speUseUnit.getAuditOrgName()))){
-//					continue;
-//				}
-
-
-
-
-
-
-
-
+					speUseUnit.setSyncState(3);
+					speUseUnitService.updateById(speUseUnit);
+				}
 			}
 		}
 		return "ok";