From 86e943f5e159dbb97d58cf8194e09d0b1d46406b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 18:29:30 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java | 135 +++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 41 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 2bc2f07..54980d9 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
@@ -41,27 +41,45 @@
*/
public static String queryToken(Operator operator){
HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.QUERY_TOKEN.getUrl());
+ JSONObject info = new JSONObject();
+ info.put("OperatorID", operator.getOurOperatorId());
+ info.put("OperatorSecret", operator.getOperatorSecret());
+ Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
post.contentType("application/json;charset=utf-8");
- JSONObject body = new JSONObject();
- body.put("OperatorID", operator.getOurOperatorId());
- body.put("OperatorSecret", operator.getOurOperatorSecret());
- post.body(body.toJSONString());
+ BaseRequest baseRequest = new BaseRequest();
+ baseRequest.setOperatorID(operator.getOurOperatorId());
+ baseRequest.setTimeStamp(timeStamp);
+ baseRequest.setSeq("0001");
+ String jsonString = JacksonUtils.toJson(info);
+ String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
+ baseRequest.setData(encrypt);
+ baseRequest.setOperator(operator);
+ baseRequest.setSig(buildSign(baseRequest));
+ String request_json = JacksonUtils.toJson(baseRequest);
+ log.info("获取三方平台授权token请求地址：" + post.getUrl());
+ log.info("获取三方平台授权token请求参数：" + request_json);
+ log.info("获取三方平台授权token请求Data：" + jsonString);
+ post.body(request_json);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("获取三方token失败：" + execute.body());
+ log.error("获取三方平台授权token失败：" + execute.body());
return null;
}
- JSONObject jsonObject = JSON.parseObject(execute.body());
- Integer succStat = jsonObject.getInteger("SuccStat");
- if(0 != succStat){
- log.error("获取三方token失败：" + jsonObject.getString("FailReason"));
+ log.info("获取三方平台授权token响应参数：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("获取三方平台授权token失败：" + baseResult.getMsg());
return null;
}
- String token = jsonObject.getString("AccessToken");
- Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + jsonObject.getLong("TokenAvailableTime");
- LocalDateTime localDateTime = Instant.ofEpochSecond(tokenAvailableTime).atOffset(ZoneOffset.UTC).toLocalDateTime();
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("获取三方平台授权token响应Data：" + decrypt);
+ QueryTokenResult queryTokenResult = JSON.parseObject(decrypt, QueryTokenResult.class);
+ String token = queryTokenResult.getAccessToken();
+ Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + queryTokenResult.getTokenAvailableTime();
operator.setAccessToken(token);
- operator.setTokenAvailableTime(localDateTime);
+ operator.setTokenAvailableTime(tokenAvailableTime);
operatorClient.editOperator(operator);
return token;
}
@@ -72,7 +90,7 @@
* @return
*/
public static String getToken(Operator operator){
- if(null != operator.getTokenAvailableTime() && operator.getTokenAvailableTime().isBefore(LocalDateTime.now())){
+ if(null != operator.getTokenAvailableTime() && operator.getTokenAvailableTime() > LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
return operator.getAccessToken();
}else{
return queryToken(operator);
@@ -90,10 +108,21 @@
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("推送三方设备状态变化失败：" + execute.body());
+ log.error("推送三方平台设备状态失败：" + execute.body());
return null;
}
- return JSON.parseObject(execute.body(), NotificationStationStatusResult.class);
+ log.info("推送三方平台设备状态响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送三方平台设备状态失败：" + baseResult.getMsg());
+ return null;
+ }
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("推送三方平台设备状态Data：" + decrypt);
+ NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class);
+ return notificationStationStatusResult;
}
@@ -111,16 +140,21 @@
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("推送三方启动充电结果失败：" + execute.body());
+ log.error("推送三方平台启动充电结果失败：" + execute.body());
return null;
}
- JSONObject jsonObject = JSON.parseObject(execute.body());
- Integer ret = jsonObject.getInteger("Ret");
- if(0 != ret){
- log.error("推送三方启动充电结果失败：" + execute.body());
+ log.info("推送三方平台启动充电结果响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送三方平台启动充电结果失败：" + baseResult.getMsg());
return null;
}
- return jsonObject.getObject("Data", NotificationStartChargeResult.class);
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("推送三方平台启动充电结果Data：" + decrypt);
+ NotificationStartChargeResult notificationStartChargeResult = JSON.parseObject(decrypt, NotificationStartChargeResult.class);
+ return notificationStartChargeResult;
}
@@ -139,16 +173,21 @@
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("推送三方充电状态失败：" + execute.body());
+ log.error("推送三方平台充电状态失败：" + execute.body());
return null;
}
- JSONObject jsonObject = JSON.parseObject(execute.body());
- Integer ret = jsonObject.getInteger("Ret");
- if(0 != ret){
- log.error("推送三方充电状态失败：" + execute.body());
+ log.info("推送三方平台充电状态响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送三方平台充电状态失败：" + baseResult.getMsg());
return null;
}
- return jsonObject.getObject("Data", NotificationEquipChargeStatusResult.class);
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("推送三方平台充电状态Data：" + decrypt);
+ NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class);
+ return notificationEquipChargeStatusResult;
}
@@ -162,16 +201,21 @@
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("推送三方停止充电结果失败：" + execute.body());
+ log.error("推送三方平台停止充电结果失败：" + execute.body());
return null;
}
- JSONObject jsonObject = JSON.parseObject(execute.body());
- Integer ret = jsonObject.getInteger("Ret");
- if(0 != ret){
- log.error("推送三方停止充电结果失败：" + execute.body());
+ log.info("推送三方平台停止充电结果响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送三方平台停止充电结果失败：" + baseResult.getMsg());
return null;
}
- return jsonObject.getObject("Data", NotificationStopCharge.class);
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("推送三方平台停止充电结果Data：" + decrypt);
+ NotificationStopCharge notificationStopCharge = JSON.parseObject(decrypt, NotificationStopCharge.class);
+ return notificationStopCharge;
}
@@ -187,16 +231,21 @@
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
- log.error("推送三方充电订单信息失败：" + execute.body());
+ log.error("推送三方平台充电订单信息失败：" + execute.body());
return null;
}
- JSONObject jsonObject = JSON.parseObject(execute.body());
- Integer ret = jsonObject.getInteger("Ret");
- if(0 != ret){
- log.error("推送三方充电订单信息失败：" + execute.body());
+ log.info("推送三方平台充电订单信息响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送三方平台充电订单信息失败：" + baseResult.getMsg());
return null;
}
- return jsonObject.getObject("Data", NotificationChargeOrderInfoResult.class);
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ log.info("推送三方平台充电订单信息Data：" + decrypt);
+ NotificationChargeOrderInfoResult notificationChargeOrderInfoResult = JSON.parseObject(decrypt, NotificationChargeOrderInfoResult.class);
+ return notificationChargeOrderInfoResult;
}
@@ -218,7 +267,11 @@
baseRequest.setData(encrypt);
baseRequest.setOperator(operator);
baseRequest.setSig(buildSign(baseRequest));
- post.body(JSON.toJSONString(baseRequest));
+ String request_json = JacksonUtils.toJson(baseRequest);
+ post.body(request_json);
+ log.info("推送三方平台请求地址：" + post.getUrl());
+ log.info("推送三方平台请求参数：" + request_json);
+ log.info("推送三方平台请求Data：" + jsonString);
}
--
Gitblit v1.7.1