From 62b592d65a8c84114b2240ee7ba78c6ae2fe93e6 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 14:42:24 +0800
Subject: [PATCH] 武汉省平台-调整接口上报为单条集合形式上报
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index c571da6..9db3102 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -8,19 +8,17 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
-import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.RedisUtil;
+import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
+import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
-import com.fzzy.whjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* 姝︽眽鍐涚伯鐪佸钩鍙�-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -41,6 +39,8 @@
private ApiTriggerService apiTriggerService;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private Whjl2023HttpClientUtil whjl2023HttpClientUtil;
@Override
public String getProtocol() {
@@ -56,22 +56,21 @@
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
String inteId = param.getInteId();
String kqdm = param.getKqdm();
- String bizId = param.getBizId();
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
}
- //娣诲姞LOGO
+ //娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
apiLog.setInteId(inteId);
- String jsonData = getJsonData(inteId, data, conf.getApiUrl());
- log.info("鎶ユ枃淇℃伅=" + jsonData);
+ String jsonData = getJsonData(data);
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
inteId = getInteId(inteId);
if (StringUtils.isEmpty(inteId)) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
@@ -82,22 +81,51 @@
apiLog.setUploadTime(new Date());
if (conf == null) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", bizId);
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
apiLogRep.save(apiLog);
return responseDto;
}
- Map<String, Object> map = new HashMap<>();
- WhjlRespDto responseDto = Whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, null);
+ //灏佽鎺ㄩ�佹暟鎹�
+ WhjlReqDto reqData = new WhjlReqDto();
+ //鎶ユ枃鏍囪瘑ID
+ reqData.setId(ContextUtil.getUUID());
+ //韬唤ID
+ reqData.setUid(conf.getUserName());
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ orderId = reqData.getId();
+ }
+ reqData.setOrderid(orderId);
+ //搴旂敤鐮�
+ reqData.setAppcode(conf.getAppCode());
+ //鏃堕棿鎴�
+ reqData.setTimestamp(Long.valueOf(ContextUtil.getCurTimeMillis()));
+ //韬唤绛惧悕锛屽搴旂敤鐮乢鎺堟潈鐮乢绔欑偣缂栫爜_鎶ユ枃ID_鏃堕棿鎴宠繘琛孧D5绠楁硶绛惧悕
+ String accessToken = reqData.getAppcode() +"_" + conf.getPassword() +"_" + reqData.getUid() + "_" + reqData.getId() + "_" + reqData.getTimestamp();
+ log.info("韬唤绛惧悕锛�" + accessToken);
+ reqData.setAccesstoken(MyMD5Util.encrypt(accessToken));
+ //鏁版嵁鎬绘潯鏁�
+ reqData.setDatalength(1);
+ //鏁版嵁涓讳綋锛岃繘琛孲M4鍔犲瘑
+ reqData.setData(SM4Util.encryptEcb(conf.getPublicKey(), jsonData));
+ //鎽樿锛屾暟鎹富浣撶殑MD5鍊�
+ reqData.setDigest(MyMD5Util.encrypt(jsonData));
+ //鎿嶄綔绫诲瀷
+ reqData.setOperator("insert");
+
+ WhjlRespDto responseDto = whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
apiLogRep.save(apiLog);
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
- //updateGD2022AuthToken(responseDto,conf, token);
+
return resd;
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -106,15 +134,16 @@
}
/**
- * 璋冩暣鏁版嵁灏佽锛岃幏鍙杍son鏁版嵁
+ * 璋冩暣鏁版嵁灏佽鎴恖ist锛岃幏鍙杍son鏁版嵁
*
- * @param inteId
* @param data
* @return
* @throws Exception
*/
- private String getJsonData(String inteId, Object data, String url) {
- return JSON.toJSONString(data);
+ private String getJsonData(Object data) {
+ List<Object> list = new ArrayList<>();
+ list.add(data);
+ return JSON.toJSONString(list);
}
private String getInteId(String inteId) {
--
Gitblit v1.9.3