From c7da4cf81779a799a6c424ad5356b99d0c5d8721 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 15 九月 2023 14:59:39 +0800
Subject: [PATCH] 熏蒸备案同步修改
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6b7d07f..0dc1763 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,10 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.push.gd2022.GD2022HttpClientUtil;
-import com.fzzy.push.gd2022.dto.GD2022AuthToken;
-import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
-import com.fzzy.push.gd2022.dto.GDFinanceDto;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -23,8 +19,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -112,27 +106,31 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
- if (null == api1102List || api1102List.isEmpty()) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLog.setStatus(99);
- apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLogRep.save(apiLog);
- return responseDto;
- }
- reqData.setUid(api1102List.get(0).getXzqhdm());
+ reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(param.getOrderid());
- //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ reqData.setOrderid(orderId);
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
- //鏁版嵁杩涜SM4鍔犲瘑
- reqData.setData(jsonData);
+ //浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
@@ -195,27 +193,31 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
- if (null == api1102List || api1102List.isEmpty()) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLog.setStatus(99);
- apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLogRep.save(apiLog);
- return responseDto;
- }
- reqData.setUid(api1102List.get(0).getXzqhdm());
+ reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(param.getOrderid());
- //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ reqData.setOrderid(orderId);
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
- //鏁版嵁杩涜SM4鍔犲瘑
- reqData.setData(jsonData);
+ //浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
--
Gitblit v1.9.3