Commit c39d7f92 authored by zhangsen's avatar zhangsen

人员赋码 预警内容调整

parent 593a9b51
...@@ -235,22 +235,16 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -235,22 +235,16 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
List<String> strings = new ArrayList<>(); List<String> strings = new ArrayList<>();
if (CollectionUtils.isNotEmpty(overCertificateList)) { if (CollectionUtils.isNotEmpty(overCertificateList)) {
strings.add("过期证书:" + String.join("," , overCertificateList)); strings.add("过期证书:" + String.join("," , overCertificateList));
} else {
strings.add("过期证书:无");
} }
if (CollectionUtils.isNotEmpty(inMonthCertificateList)) { if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
strings.add("临期证书:" + String.join("," , inMonthCertificateList)); strings.add("临期证书:" + String.join("," , inMonthCertificateList));
} else {
strings.add("临期证书:无");
} }
if (CollectionUtils.isNotEmpty(noCertificateList)) { if (CollectionUtils.isNotEmpty(noCertificateList)) {
strings.add("缺少证书:" + String.join("," , noCertificateList)); strings.add("缺少证书:" + String.join("," , noCertificateList));
} else {
strings.add("缺少证书:无");
} }
String join = ""; String join = "";
if (CollectionUtils.isNotEmpty(strings)) { if (CollectionUtils.isNotEmpty(strings)) {
join = "(" + String.join(";", strings) + ")"; join = String.join(";", strings);
} }
List<String> missCerList = new ArrayList<>(); List<String> missCerList = new ArrayList<>();
missCerList.addAll(noCertificateList); missCerList.addAll(noCertificateList);
...@@ -288,7 +282,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -288,7 +282,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
BizMessage bizMessage = new BizMessage(); BizMessage bizMessage = new BizMessage();
bizMessage.setIndexKey("RYFM"); bizMessage.setIndexKey("RYFM");
bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc()); bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join); RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
bizMessage.setBizInfo(riskBizInfoVo); bizMessage.setBizInfo(riskBizInfoVo);
bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr())); bizMessage.setTraceId(String.valueOf(personBasic.getSequenceNbr()));
try { try {
...@@ -468,23 +462,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -468,23 +462,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
List<String> strings = new ArrayList<>(); List<String> strings = new ArrayList<>();
if (CollectionUtils.isNotEmpty(overCertificateList)) { if (CollectionUtils.isNotEmpty(overCertificateList)) {
strings.add("过期证书:" + String.join("," , overCertificateList)); strings.add("过期证书:" + String.join("," , overCertificateList));
} else {
strings.add("过期证书:无");
} }
if (CollectionUtils.isNotEmpty(inMonthCertificateList)) { if (CollectionUtils.isNotEmpty(inMonthCertificateList)) {
strings.add("临期证书:" + String.join("," , inMonthCertificateList)); strings.add("临期证书:" + String.join("," , inMonthCertificateList));
} else {
strings.add("临期证书:无");
} }
if (CollectionUtils.isNotEmpty(noCertificateList)) { if (CollectionUtils.isNotEmpty(noCertificateList)) {
strings.add("缺少证书:" + String.join("," , noCertificateList)); strings.add("缺少证书:" + String.join("," , noCertificateList));
} else {
strings.add("缺少证书:无");
} }
String join = ""; String join = "";
if (CollectionUtils.isNotEmpty(strings)) { if (CollectionUtils.isNotEmpty(strings)) {
join = "(" + String.join(";", strings) + ")"; join = String.join(";", strings);
} }
List<String> missCerList = new ArrayList<>(); List<String> missCerList = new ArrayList<>();
missCerList.addAll(noCertificateList); missCerList.addAll(noCertificateList);
...@@ -582,7 +570,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -582,7 +570,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
BizMessage bizMessage = new BizMessage(); BizMessage bizMessage = new BizMessage();
bizMessage.setIndexKey("RYFM"); bizMessage.setIndexKey("RYFM");
bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc()); bizMessage.setIndexValue(personBasic.getPostName() + personBasic.getQrcodeDesc());
RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, personBasic.getPostName() + personBasic.getQrcodeDesc() + join); RiskBizInfoVo riskBizInfoVo = fetchData(personBasic, personAccount, join);
bizMessage.setBizInfo(riskBizInfoVo); bizMessage.setBizInfo(riskBizInfoVo);
bizMessage.setDataSource("人员赋码"); bizMessage.setDataSource("人员赋码");
try { try {
......
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