From ed7224238d9bd4d2d3005186a0edc538bd199105 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 13:58:14 +0800
Subject: [PATCH] 修改参数首字母大小写
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
index 53b528c..7ee7150 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
@@ -3,6 +3,7 @@
import cn.hutool.http.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.common.utils.JacksonUtils;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.integration.drainage.kuaidian.model.NotificationStationChangeResult;
import com.ruoyi.integration.drainage.kuaidian.model.StationChange;
@@ -11,6 +12,7 @@
import com.ruoyi.other.api.domain.Operator;
import com.ruoyi.other.api.feignClient.OperatorClient;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
import java.time.Instant;
import java.time.LocalDateTime;
@@ -19,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -29,10 +32,9 @@
@Slf4j
public class TCECUtil {
-// private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
-
- public static Map<Long, Integer> map = new HashMap<>();
-
+ private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
+
+
/**
* 获取token
@@ -60,7 +62,7 @@
LocalDateTime localDateTime = Instant.ofEpochSecond(tokenAvailableTime).atOffset(ZoneOffset.UTC).toLocalDateTime();
operator.setAccessToken(token);
operator.setTokenAvailableTime(localDateTime);
-// operatorClient.editOperator(operator);
+ operatorClient.editOperator(operator);
return token;
}
@@ -205,33 +207,20 @@
*/
public static void buildBody(HttpRequest post, Object o, Operator operator){
Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- Integer integer = map.get(timeStamp);
- if(null == integer){
- integer = 1;
- }else{
- integer++;
- }
- map.put(timeStamp, integer);
post.contentType("application/json;charset=utf-8");
post.header("Authorization", "Bearer " + getToken(operator));
BaseRequest baseRequest = new BaseRequest();
baseRequest.setOperatorID(operator.getOurOperatorId());
baseRequest.setTimeStamp(timeStamp);
- baseRequest.setSeq(String.format("%04d", integer));
- String jsonString = JSON.toJSONString(o);
- String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
+ baseRequest.setSeq("0001");
+ String jsonString = JacksonUtils.toJson(o);
+ String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
baseRequest.setData(encrypt);
baseRequest.setOperator(operator);
- baseRequest.setSig(ourBuildSign(baseRequest));
+ baseRequest.setSig(buildSign(baseRequest));
post.body(JSON.toJSONString(baseRequest));
- //清空小于当前时间的map中的无效数据
- for (Long k : map.keySet()) {
- if(k <= (timeStamp - 10)){
- map.remove(k);
- }
- }
}
-
+
/**
* 构建签名字符串
@@ -279,7 +268,7 @@
switch (operator.getName()){
case "XinDianTu":
//进行字符串拼接、计算
- String m = new StringBuilder(operator.getOurOperatorId()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
+ String m = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
// 打印计算得到的签名Sig
sign = SignUtil.bytesToHexString(hmacMd5);
@@ -290,6 +279,7 @@
}
return sign;
}
+
public static void main(String[] args) {
--
Gitblit v1.7.1