Skip to content

A
amos-boot-biz
Commit 4bd5ccfb authored by zhangyingbin's avatar zhangyingbin
Browse files
Options

企业注册 企业同步逻辑修改

parent 954c40b6
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 103 deletions
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyDeleteListener.java
View file @ 4bd5ccfb
......@@ -27,18 +27,18 @@ public class PrivilegeCompanyDeleteListener extends EmqxListener {
@Override
public void processMessage(String s, MqttMessage message) throws Exception {
System.out.println(message);
JSONObject object = null;
try {
object = JSONObject.parseObject(message.toString());
} catch (Exception e) {
throw new Exception("公司同步消息解析失败");
}
RequestContext.setAppKey(appkey);
RequestContext.setProduct(product);
RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
//通过sequence_nbr删除企业
Privilege.companyClient.deleteCompany(object.getString("sequence_nbr"));
// System.out.println(message);
// JSONObject object = null;
// try {
// object = JSONObject.parseObject(message.toString());
// } catch (Exception e) {
// throw new Exception("公司同步消息解析失败");
// }
// RequestContext.setAppKey(appkey);
// RequestContext.setProduct(product);
// RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
//
// //通过sequence_nbr删除企业
// Privilege.companyClient.deleteCompany(object.getString("sequence_nbr"));
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java
View file @ 4bd5ccfb
......@@ -62,14 +62,16 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
RequestContext.setProduct(product);
RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
//判断库中company是否重复
CompanyModel companyPrivilegeModel = Privilege.companyClient.queryByCompanyCode(object.getString("unit_code")).getResult();
//判断库中业务tz_base_enterprise_info是否存在
QueryWrapper<TzBaseEnterpriseInfo> queryWrapper = new QueryWrapper<TzBaseEnterpriseInfo>();
queryWrapper.eq("use_code",object.getString("unit_code"));
TzBaseEnterpriseInfo tzBaseEnterprisePrivilegeInfo = tzBaseEnterpriseInfoService.getOne(queryWrapper);
if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)){
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
return;
}
CompanyModel companyModel = new CompanyModel();
TzBaseEnterpriseInfo tzBaseEnterpriseInfo = new TzBaseEnterpriseInfo();
Date syncDate = sdf.parse(object.getString("sync_date"));
......@@ -90,13 +92,6 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
tzBaseEnterpriseInfo.setSyncState(object.getInteger("sync_state"));
tzBaseEnterpriseInfo.setRecDate(recDate);
companyModel.setSequenceNbr(object.getLong("sequence_nbr"));
companyModel.setCompanyName(object.getString("unit_name"));
companyModel.setCompanyCode(object.getString("unit_code"));
companyModel.setLevel("company");
companyModel.setAgencyCode("tzs");
companyModel.setCompanyType(unitType);
companyModel.setAddress(object.getString("reg_address"));
//业务表更新条件构造器
UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
......@@ -124,92 +119,17 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
}
tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
companyModel.setParentId(supervisePrivilegeCompanyModel.getSequenceNbr());
if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
tzBaseEnterpriseInfo.setUnitType("");
}
if(ValidationUtil.isEmpty(companyModel.getCompanyType())){
companyModel.setCompanyType("");
}
try {
if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
//当企业表、平台表 中没有时
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.create(companyModel);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表、平台表中没有该条数据");
} else if(tzBaseEnterprisePrivilegeInfo == null){
//企业表没有，平台表有
if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
}else {
companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
}
}
if (tzBaseEnterprisePrivilegeInfo == null ) {
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表没有、平台表中有该条数据");
} else if(companyPrivilegeModel == null){
//平台表没有，企业表有
if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
}else {
tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
}
}
Privilege.companyClient.create(companyModel);
tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表有、平台表中没有该条数据");
}
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(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
}else {
tzBaseEnterpriseInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType());
}
}
if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
companyModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
}else {
companyModel.setCompanyType(companyPrivilegeModel.getCompanyType());
}
}
tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
} else {
if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
if(!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(tzBaseEnterpriseInfo.getUnitType())){
tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType()+","+tzBaseEnterpriseInfo.getUnitType());
tzBaseEnterpriseInfoService.update(tzBaseEnterprisePrivilegeInfo,updateWrapper);
}
}
if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
if(!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())){
companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType()+","+companyModel.getCompanyType());
Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
}
}
System.out.println("该数据不是最新的数据 不用更新");
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
}
logger.info("create/update unit license info: " + "企业表有、平台表中有该条数据");
return;
}
} catch(Exception e) {
logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
......
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 @ 4bd5ccfb
......@@ -254,7 +254,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
baseEnterpriseInfo.setOperatingStatus(regUnitInfo.getRegUnitIc().getBusinessState());
baseEnterpriseInfo.setSyncDate(new Date());
baseEnterpriseInfo.setSyncState(0);
tzBaseEnterpriseInfoService.save(baseEnterpriseInfo);
LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TzBaseEnterpriseInfo::getUseCode,regUnitInfo.getUnitCode());
tzBaseEnterpriseInfoService.saveOrUpdate(baseEnterpriseInfo,wrapper);
}
@Override
......
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