Skip to content

A
amos-boot-biz
Commit 2104e4d7 authored by zhangyingbin's avatar zhangyingbin
Browse files
Options

优化许可信息企业对接数据集成消息接口

parent 841cb2c1
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 16 deletions
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/controller/BusinessController.java
View file @ 2104e4d7
......@@ -105,4 +105,12 @@ public class BusinessController {
return ResponseHelper.buildResponse(taBusinessService.getData(code));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/updateSyncCompanyState", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "更新许可企业同步状态", notes = "更新许可企业同步状态")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> updateSyncCompanyState(String sequenceNbr){
return ResponseHelper.buildResponse(taLicenseBaseInfoService.updateSyncCompanyState(sequenceNbr));
}
}
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TaLicenseBaseInfoModel.java
View file @ 2104e4d7
......@@ -129,5 +129,10 @@ public class TaLicenseBaseInfoModel extends BaseModel {
*/
private Integer syncState;
/**
* 企业同步状态（0-新增 1-更新 2-删除 3-已同步）
*/
private Integer syncCompanyState;
}
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TaLicenseBaseInfoMapper.java
View file @ 2104e4d7
......@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TaLicenseBaseInfoMapper extends BaseMapper<TaLicenseBaseInfo> {
public void updateSyncCompanyState(String sequenceNbr);
}
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TaLicenseBaseInfo.java
View file @ 2104e4d7
......@@ -91,5 +91,8 @@ public class TaLicenseBaseInfo extends BaseEntity {
@ApiModelProperty(value = "同步状态（0-新增 1-更新 2-删除）")
private Integer syncState;
@ApiModelProperty(value = "企业同步状态（0-新增 1-更新 2-删除 3-已同步）")
private Integer syncCompanyState;
}
amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TaLicenseBaseInfoServiceImpl.java
View file @ 2104e4d7
......@@ -40,6 +40,15 @@ public class TaLicenseBaseInfoServiceImpl
@Autowired
TaAccessConfigServiceImpl taAccessConfigServiceImpl;
@Autowired
TaLicenseBaseInfoMapper licenseBaseInfoMapper;
public String updateSyncCompanyState(String sequenceNbr){
licenseBaseInfoMapper.updateSyncCompanyState(sequenceNbr);
return "ok";
}
/**
*
* 新增许可信息-许可基本信息表
......@@ -155,6 +164,7 @@ public class TaLicenseBaseInfoServiceImpl
TaLicenseBaseInfo taLicenseBaseInfo = JSONObject.parseObject(jsonString, TaLicenseBaseInfo.class);
taLicenseBaseInfo.setSyncDate(new Date());
taLicenseBaseInfo.setSyncState(0);
taLicenseBaseInfo.setSyncCompanyState(0);
TaLicenseBaseInfo oldTaLicenseBaseInfo = this.getOne(new LambdaQueryWrapper<TaLicenseBaseInfo>()
.eq(TaLicenseBaseInfo::getId, taLicenseBaseInfo.getId()));
if (oldTaLicenseBaseInfo != null) {
......
amos-boot-data/amos-boot-data-accessapi/src/main/resource/mapper/TaLicenseaseInfoMapper.xml 0 → 100644
View file @ 2104e4d7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.api.openapi.face.orm.dao.TaLicenseBaseInfoMapper">
<update id="updateSyncCompanyState">
UPDATE ta_license_base_info set sync_company_state = 3 WHERE sequence_nbr = #{sequenceNbr}
</update>
</mapper>
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/AccessFeignService.java
View file @ 2104e4d7
......@@ -20,4 +20,12 @@ public interface AccessFeignService {
@RequestMapping("/business/getData")
ResponseModel<Map<String, Object>> getData(@RequestParam String code);
/**
* 调用accessApi的接口
* @param sequenceNbr
* @return
*/
@RequestMapping("/business/updateSyncCompanyState")
ResponseModel<String> updateSyncCompanyState(@RequestParam String sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java
View file @ 2104e4d7
......@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
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.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
......@@ -41,6 +42,9 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
TzBaseEnterpriseInfoServiceImpl tzBaseEnterpriseInfoService;
@Autowired
AccessFeignService accessFeignService;
@Autowired
RedisUtil redisUtil;
@Value("${admin.product}")
......@@ -65,11 +69,6 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
RequestContext.setProduct(product);
RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
Collection<CompanyModel> companyModels = Privilege.companyClient.queryAgencyTree(null).getResult();
Map<String , CompanyModel> companyMap = new HashMap<>();
getCompanyInfoMap(companyModels,companyMap);
//判断库中company是否重复
CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyName(object.getString("unit_name")).getResult();
......@@ -107,16 +106,19 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("Use_unit",object.getString("unit_name"));
try {
if(ValidationUtil.isEmpty(object.getString("reg_code")) || ValidationUtil.isEmpty(companyMap.get(object.getString("reg_code")))){
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get("610000").getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get("610000").getCompanyName());
companyModel.setParentId(companyMap.get("610000").getSequenceNbr());
}else{
tzBaseEnterpriseInfo.setSuperviseOrgCode(companyMap.get(object.getString("reg_code")).getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(companyMap.get(object.getString("reg_code")).getCompanyName());
companyModel.setParentId(companyMap.get(object.getString("reg_code")).getSequenceNbr());
String regCode = object.getString("reg_code")+"000";
CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
if(ValidationUtil.isEmpty(privilegeCompanyModel)){
privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000000").getResult();
}
try {
tzBaseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(privilegeCompanyModel.getCompanyName());
companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
} catch (Exception e) {
System.out.println("名称为"+object.getString("unit_name")+"的许可企业同步企业信息时出错："+e.getMessage());
}
......@@ -126,22 +128,27 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
//当企业表、平台表 中没有时
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.create(companyModel);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
} else if(tzBaseEnterprisePrivilegeInfo == null){
//企业表没有，平台表有
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.update(companyModel, tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
} else if(companyPrivilegeModel == null){
//平台表没有，企业表有
Privilege.companyClient.create(companyModel);
tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
}
else {
//当企业表、平台表 中有时
if (tzBaseEnterprisePrivilegeInfo.getRecDate().compareTo(object.getDate("issue_date")) < 1) {
tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
Privilege.companyClient.update(companyModel, tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
} else {
System.out.println("该数据不是最新的数据 不用更新");
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
}
}
} catch(Exception e) {
......
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