From a5e9e8ee0536a41d581bea7590094f2803dccb9a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 06 九月 2021 19:21:56 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java
index 2ba59e7..87850e3 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcGov/asyn/impl/BaseHcGovSendAsynImpl.java
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.reportData.ReportDataHeaderDto;
import com.java110.intf.common.IHcGovTranslateDetailInnerServiceSMO;
import com.java110.intf.common.IHcGovTranslateInnerServiceSMO;
import com.java110.job.adapt.hcGov.HcGovConstant;
import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn;
import com.java110.po.hcGovTranslate.HcGovTranslatePo;
import com.java110.po.hcGovTranslateDetail.HcGovTranslateDetailPo;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.kafka.KafkaFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -15,6 +17,7 @@
import org.springframework.stereotype.Service;
import java.util.UUID;
+
@Service
public class BaseHcGovSendAsynImpl implements BaseHcGovSendAsyn {
@@ -24,21 +27,21 @@
private IHcGovTranslateDetailInnerServiceSMO hcGovTranslateDetailInnerServiceSMOImpl;
- public JSONObject createHeadersOrBody(JSONObject body,String extCommunityId,String serviceCode,String secure) {
+ public JSONObject createHeadersOrBody(JSONObject body, String extCommunityId, String serviceCode, String secure) {
JSONObject heard = new JSONObject();
heard.put("serviceCode", serviceCode);
- heard.put("extCommunityId",extCommunityId);
+ heard.put("extCommunityId", extCommunityId);
heard.put("tranId", UUID.randomUUID().toString());
heard.put("reqTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
- HcGovConstant.generatorProducerSign(heard,body,secure);
+ HcGovConstant.generatorProducerSign(heard, body, secure);
JSONObject kafkaData = new JSONObject();
- kafkaData.put("header",heard);
- kafkaData.put("body",body);
+ kafkaData.put("header", heard);
+ kafkaData.put("body", body);
return kafkaData;
}
- protected void saveHcGovLog(JSONObject paramIn,String communityId,String topic,String objId) {
+ public void saveHcGovLog(JSONObject paramIn, String communityId, String topic, String objId, String secure) {
Assert.hasKeyAndValue(paramIn, "header", "璇锋眰鎶ユ枃涓湭鍖呭惈header");
Assert.hasKeyAndValue(paramIn, "body", "璇锋眰鎶ユ枃涓湭鍖呭惈body");
JSONObject heard = paramIn.getJSONObject("header");
@@ -49,18 +52,18 @@
hcGovTranslatePo.setTranId(heard.getString("tranId"));
hcGovTranslatePo.setCommunityId(communityId);
hcGovTranslatePo.setGovTopic(topic);
- hcGovTranslatePo.setCode(HcGovConstant.COMMUNITY_SECURE);
+ hcGovTranslatePo.setCode(secure);
hcGovTranslatePo.setSendCount("1");
hcGovTranslatePo.setExtCommunityId(heard.getString("extCommunityId"));
hcGovTranslatePo.setObjId(objId);
hcGovTranslatePo.setReqTime(heard.getString("reqTime"));
hcGovTranslatePo.setServiceCode(heard.getString("serviceCode"));
hcGovTranslatePo.setSign(heard.getString("sign"));
- hcGovTranslatePo.setState("1001");
+ hcGovTranslatePo.setState(ReportDataHeaderDto.RETUR_CODE);
hcGovTranslatePo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
hcGovTranslatePo.setRemark("鐗╀笟绯荤粺鑷姩鎺ㄩ�佹ゼ鏍嬩俊鎭埌鏀垮姟绯荤粺");
int flag = hcGovTranslateInnerServiceSMOImpl.saveHcGovTranslate(hcGovTranslatePo);
- if(flag < 1){
+ if (flag < 1) {
throw new IllegalArgumentException("鐗╀笟绯荤粺淇濆瓨妤兼爧鎺ㄩ�佹姤鏂囨棩蹇楀け璐�");
}
HcGovTranslateDetailPo hcGovTranslateDetailPo = new HcGovTranslateDetailPo();
@@ -69,15 +72,42 @@
hcGovTranslateDetailPo.setCommunityId(communityId);
hcGovTranslateDetailPo.setReqBody(paramIn.toJSONString());
flag = hcGovTranslateDetailInnerServiceSMOImpl.saveHcGovTranslateDetail(hcGovTranslateDetailPo);
- if(flag < 1){
+ if (flag < 1) {
throw new IllegalArgumentException("鐗╀笟绯荤粺淇濆瓨妤兼爧鎺ㄩ�佹姤鏂囨槑缁嗘棩蹇楀け璐�");
}
}
- public void sendKafka(String topic,JSONObject massage,String communityId,String objId) {
+ public void updateHcGovLog(JSONObject paramIn) {
+ Assert.hasKeyAndValue(paramIn, "header", "璇锋眰鎶ユ枃涓湭鍖呭惈header");
+ JSONObject heard = paramIn.getJSONObject("header");
+
+ HcGovTranslatePo hcGovTranslatePo = new HcGovTranslatePo();
+ hcGovTranslatePo.setTranId(heard.getString("tranId"));
+ hcGovTranslatePo.setState(ReportDataHeaderDto.RETUR_SUCCESS_CODE);
+ if (!Integer.toString(ReportDataHeaderDto.CODE_SUCCESS).equals(heard.getString("code"))) {
+ hcGovTranslatePo.setState(ReportDataHeaderDto.RETUR_ERROR_CODE);
+ }
+
+ hcGovTranslatePo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ int flag = hcGovTranslateInnerServiceSMOImpl.updateHcGovTranslate(hcGovTranslatePo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("鏇存柊鐗╀笟绯荤粺淇濆瓨妤兼爧鏃ュ織澶辫触");
+ }
+ HcGovTranslateDetailPo hcGovTranslateDetailPo = new HcGovTranslateDetailPo();
+ hcGovTranslateDetailPo.setTranId(hcGovTranslatePo.getTranId());
+ hcGovTranslateDetailPo.setResBody(paramIn.toJSONString());
+ flag = hcGovTranslateDetailInnerServiceSMOImpl.updateHcGovTranslateDetail(hcGovTranslateDetailPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("鐗╀笟绯荤粺淇濆瓨妤兼爧鎺ㄩ�佹姤鏂囨槑缁嗘棩蹇楀け璐�");
+ }
+ }
+
+ public void sendKafka(String topic, JSONObject massage, String communityId, String objId, String secure) {
try {
- KafkaFactory.sendKafkaMessage(topic,massage.toJSONString());
- saveHcGovLog(massage,communityId,topic,objId);
+ if ("TRUE".equals(MappingCache.getValue(HcGovConstant.GOV_DOMAIN, HcGovConstant.GOV_SWITCH))) {
+ KafkaFactory.sendKafkaMessage(topic, massage.toJSONString());
+ saveHcGovLog(massage, communityId, topic, objId, secure);
+ }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0