Skip to content

A
amos-boot-biz
Commit 4585745a authored by zhangyingbin's avatar zhangyingbin
Browse files
Options

修改许可同步，修改许可对接企业接口

parent 365d1154
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 45 deletions
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/controller/BusinessController.java
View file @ 4585745a
...@@ -97,7 +97,7 @@ public class BusinessController { ...@@ -97,7 +97,7 @@ public class BusinessController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = true) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getData", method = RequestMethod.GET) @RequestMapping(value = "/getData", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取map", notes = "获取map") @ApiOperation(httpMethod = "GET", value = "获取map", notes = "获取map")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
......
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaBusinessServiceImpl.java
View file @ 4585745a
...@@ -12,6 +12,7 @@ import com.csoft.sdk.domain.response.CsoftDataApiXixianGetzhutiinfoResponse; ...@@ -12,6 +12,7 @@ import com.csoft.sdk.domain.response.CsoftDataApiXixianGetzhutiinfoResponse;
import com.yeejoin.amos.api.openapi.face.orm.dao.DataDictionaryMapper; import com.yeejoin.amos.api.openapi.face.orm.dao.DataDictionaryMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
...@@ -57,7 +58,10 @@ public class TaBusinessServiceImpl extends BaseService<TaAccessConfigModel, TaAc ...@@ -57,7 +58,10 @@ public class TaBusinessServiceImpl extends BaseService<TaAccessConfigModel, TaAc
System.out.println(response.getResult()); System.out.println(response.getResult());
JSONObject jsonObject = JSONObject.parseObject(response.getData()); JSONObject jsonObject = JSONObject.parseObject(response.getData());
JSONObject data = jsonObject.getJSONObject("data"); JSONObject data = jsonObject.getJSONObject("data");
//如果不存在该企业 则直接返回null
if(ValidationUtil.isEmpty(data)){
return null;
}
//分割字符串 根据详细地址分割出 省/市/区、街道地址、小区地址 //分割字符串 根据详细地址分割出 省/市/区、街道地址、小区地址
String address = data.getString("dom"); String address = data.getString("dom");
String area = address.substring(0,address.indexOf("区")+1); String area = address.substring(0,address.indexOf("区")+1);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java
View file @ 4585745a
...@@ -169,7 +169,7 @@ public class TzBaseEnterpriseInfoController { ...@@ -169,7 +169,7 @@ public class TzBaseEnterpriseInfoController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/getInfo", method = RequestMethod.GET) @RequestMapping(value = "/getInfo", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询") @ApiOperation(httpMethod = "GET", value = "根据企业名称查询", notes = "根据企业名称查询")
public ResponseModel<TzBaseEnterpriseInfoDto> selectByUseUnit(HttpServletRequest request, String useUnit) { public ResponseModel<TzBaseEnterpriseInfoDto> selectByUseUnit(HttpServletRequest request, String useUnit) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.selectByUseUnit(useUnit)); return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.selectByUseUnit(useUnit));
} }
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java
View file @ 4585745a
...@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.typroject.tyboot.component.emq.EmqxListener; import org.typroject.tyboot.component.emq.EmqxListener;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -63,6 +64,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener { ...@@ -63,6 +64,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
//判断库中company是否重复 //判断库中company是否重复
CompanyModel companyPrivilegeModel = Privilege.companyClient.seleteOne(Long.valueOf(object.getString("sequence_nbr"))).getResult(); CompanyModel companyPrivilegeModel = Privilege.companyClient.seleteOne(Long.valueOf(object.getString("sequence_nbr"))).getResult();
TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getById(object.getLong("sequence_nbr")); TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getById(object.getLong("sequence_nbr"));
CompanyModel companyModel = new CompanyModel(); CompanyModel companyModel = new CompanyModel();
...@@ -78,48 +80,74 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener { ...@@ -78,48 +80,74 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
tzBaseEnterpriseInfo.setDistrict(object.getString("district")); tzBaseEnterpriseInfo.setDistrict(object.getString("district"));
tzBaseEnterpriseInfo.setSyncDate(object.getDate("sync_date")); tzBaseEnterpriseInfo.setSyncDate(object.getDate("sync_date"));
tzBaseEnterpriseInfo.setSyncState(object.getInteger("sync_state")); tzBaseEnterpriseInfo.setSyncState(object.getInteger("sync_state"));
String orgName = object.getString("district");
orgName = orgName.substring(3); try {
if (orgName.contains("分局")) { if(ValidationUtil.isEmpty(object.getString("reg_code")) || ValidationUtil.isEmpty(companyMap.get(object.getString("reg_code")))){
//包含 tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("610000").getOrgCode());
if(orgName.contains("高新")){ tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("610000").getCompanyName());
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局高新分局").getOrgCode()); companyModel.setParentId(companyMap.get("610000").getSequenceNbr());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局高新分局").getCompanyName()); }else{
companyModel.setParentId(companyMap.get("西安市工商局高新分局").getSequenceNbr()); tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get(object.getString("reg_code")).getOrgCode());
}else if(orgName.contains("曲江")){ tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get(object.getString("reg_code")).getCompanyName());
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局曲江分局").getOrgCode()); companyModel.setParentId(companyMap.get(object.getString("reg_code")).getSequenceNbr());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局曲江分局").getCompanyName());
companyModel.setParentId(companyMap.get("西安市工商局曲江分局").getSequenceNbr());
}else if(orgName.contains("经开")){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局经开分局").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局经开分局").getCompanyName());
companyModel.setParentId(companyMap.get("西安市工商局经开分局").getSequenceNbr());
}else if(orgName.contains("航天")){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局航空分局").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局航空分局").getCompanyName());
companyModel.setParentId(companyMap.get("西安市工商局航空分局").getSequenceNbr());
}else if(orgName.contains("浐灞")){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局浐灞分局").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局浐灞分局").getCompanyName());
companyModel.setParentId(companyMap.get("西安市工商局浐灞分局").getSequenceNbr());
}else if(orgName.contains("港务")){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局港务分局").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局港务分局").getCompanyName());
companyModel.setParentId(companyMap.get("西安市工商局港务分局").getSequenceNbr());
}else if(object.getString("district").contains("泾河")){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("泾河新城分局").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("泾河新城分局").getCompanyName());
companyModel.setParentId(companyMap.get("泾河新城分局").getSequenceNbr());
} else{
return;
} }
}else { } catch (Exception e) {
//不包含 System.out.println("名称为"+object.getString("unit_name")+"的许可企业同步企业信息时出错："+e.getMessage());
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get(orgName).getOrgCode());
companyModel.setParentId(companyMap.get(orgName).getSequenceNbr());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get(orgName).getCompanyName());
} }
// String orgName = object.getString("district");
// try{
// if(!ValidationUtil.isEmpty(orgName)){
// orgName = orgName.substring(3);
// if (orgName.contains("分局")) {
// //包含
// if(orgName.contains("高新")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局高新分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局高新分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局高新分局").getSequenceNbr());
// }else if(orgName.contains("曲江")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局曲江分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局曲江分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局曲江分局").getSequenceNbr());
// }else if(orgName.contains("经开")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局经开分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局经开分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局经开分局").getSequenceNbr());
// }else if(orgName.contains("航天")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局航空分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局航空分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局航空分局").getSequenceNbr());
// }else if(orgName.contains("浐灞")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局浐灞分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局浐灞分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局浐灞分局").getSequenceNbr());
// }else if(orgName.contains("港务")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("西安市工商局港务分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("西安市工商局港务分局").getCompanyName());
// companyModel.setParentId(companyMap.get("西安市工商局港务分局").getSequenceNbr());
// }else if(object.getString("district").contains("泾河")){
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("泾河新城分局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("泾河新城分局").getCompanyName());
// companyModel.setParentId(companyMap.get("泾河新城分局").getSequenceNbr());
// } else{
// return;
// }
// } else {
// //不包含
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get(orgName).getOrgCode());
// companyModel.setParentId(companyMap.get(orgName).getSequenceNbr());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get(orgName).getCompanyName());
// }
// }else{
// tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("陕西省市场监督管理局").getOrgCode());
// tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("陕西省市场监督管理局").getCompanyName());
// companyModel.setParentId(companyMap.get("陕西省市场监督管理局").getSequenceNbr());
// }
// }catch (Exception e) {
// System.out.println("名为"+orgName+"的监管机构不存在："+e.getMessage());
// }
if(tzBaseEnterprisePrivilegeInfo == null){ if(tzBaseEnterprisePrivilegeInfo == null){
//当企业表中没有时 //当企业表中没有时
...@@ -141,8 +169,12 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener { ...@@ -141,8 +169,12 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
if (companyPrivilegeModel == null ) { if (companyPrivilegeModel == null ) {
try {
//平台表新增 //平台表新增
Privilege.companyClient.create(companyModel); Privilege.companyClient.create(companyModel);
}catch (Exception e) {
System.out.println("名称为"+object.getString("unit_name")+"的公司已存在！"+e.getMessage());
}
}else{ }else{
//更新 //更新
Privilege.companyClient.update(companyModel,object.getLong("sequence_nbr")); Privilege.companyClient.update(companyModel,object.getLong("sequence_nbr"));
...@@ -157,7 +189,12 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener { ...@@ -157,7 +189,12 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
while(iter.hasNext()){ while(iter.hasNext()){
String json = JSON.toJSONString(iter.next()); String json = JSON.toJSONString(iter.next());
CompanyModel companyModel = JSON.parseObject(json,CompanyModel.class); CompanyModel companyModel = JSON.parseObject(json,CompanyModel.class);
map.put(companyModel.getCompanyName(),companyModel);
String code = companyModel.getCompanyCode();
if(code.length() >=6){
code = code.substring(0, 6);
}
map.put(code,companyModel);
getCompanyInfoMap(companyModel.getChildren(),map); getCompanyInfoMap(companyModel.getChildren(),map);
} }
return map; return map;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ 4585745a
...@@ -13,6 +13,7 @@ import java.util.Map; ...@@ -13,6 +13,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService; import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,7 +21,9 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -20,7 +21,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
...@@ -89,6 +92,14 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -89,6 +92,14 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
* 使用单位的类型，数据来源：cb_data_dictionary code = 1232 * 使用单位的类型，数据来源：cb_data_dictionary code = 1232
*/ */
private static String USE_UNIT_TYPE_CODE = "1232"; private static String USE_UNIT_TYPE_CODE = "1232";
/**
* 生产单位的类型，数据来源：cb_data_dictionary code = 1230
*/
private static String PRODUCT_UNIT_TYPE_CODE = "1230";
/**
* 充装单位的类型，数据来源：cb_data_dictionary code = 1231
*/
private static String FILLING_UNIT_TYPE_CODE = "1231";
/** /**
* 单位类型，数据来源：cb_data_dictionary type = UNIT_TYPE * 单位类型，数据来源：cb_data_dictionary type = UNIT_TYPE
...@@ -216,7 +227,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -216,7 +227,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
} }
// 2.组织返回数据 // 2.组织返回数据
RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto(); RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
if (USE_UNIT_TYPE_CODE.equals(unitType)) { if (USE_UNIT_TYPE_CODE.equals(unitType) || PRODUCT_UNIT_TYPE_CODE.equals(unitType) || FILLING_UNIT_TYPE_CODE.equals(unitType)) {
// 本地库有的化 就不去其他系统查询 // 本地库有的化 就不去其他系统查询
RegUnitIc regUnitIc = regUnitIcService RegUnitIc regUnitIc = regUnitIcService
.getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode)); .getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
...@@ -238,6 +249,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -238,6 +249,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
// URI.create("/accessapi/business/getData")); // URI.create("/accessapi/business/getData"));
// ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(requestEntity,JSONObject.class); // ResponseEntity<JSONObject> responseEntity = restTemplate.exchange(requestEntity,JSONObject.class);
// JSONObject result = responseEntity.getBody(); // JSONObject result = responseEntity.getBody();
if(!ValidationUtil.isEmpty(resultMap)){
// 2.2 工商信息组装 // 2.2 工商信息组装
String area = String.valueOf(resultMap.get("area")); String area = String.valueOf(resultMap.get("area"));
String city = area.substring(0,area.indexOf("市")+1); String city = area.substring(0,area.indexOf("市")+1);
...@@ -251,7 +264,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -251,7 +264,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
regUnitInfoDto.setName(String.valueOf(resultMap.get("unitName"))); regUnitInfoDto.setName(String.valueOf(resultMap.get("unitName")));
regUnitInfoDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople"))); regUnitInfoDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
} }
}
} else { } else {
RegUnitIc regUnitIc = regUnitIcService RegUnitIc regUnitIc = regUnitIcService
.getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode)); .getOne(new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, unitCode));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment