From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java | 379 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 312 insertions(+), 67 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java
index fb87f7c..a7605ef 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECSuperviseUtil.java
@@ -6,16 +6,28 @@
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.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.utils.HttpUtils;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.integration.drainage.model.*;
-import com.ruoyi.integration.drainage.model.enu.InterfaceUrlEnum;
+import com.ruoyi.integration.drainage.util.AesEncryption;
+import com.ruoyi.integration.drainage.util.HMacMD5Util;
+import com.ruoyi.integration.drainage.util.SequenceGenerator;
import com.ruoyi.other.api.domain.Operator;
-import com.ruoyi.other.api.feignClient.OperatorClient;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static com.ruoyi.integration.drainage.TCECUtil.getToken;
/**
* 中电联TCEC标准
@@ -23,10 +35,40 @@
* @Date 2025/1/21 11:48
*/
@Slf4j
+@Component
public class TCECSuperviseUtil {
-
- private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
- private final static String url = "https://dev-gov-hlht-sc.unievbj.com/evcs/v1.0.0/";
+ // 测试环境
+// private static final String OperatorID = "MA01H3BQ2";
+// private static final String OperatorSecret = "f1331ef0b37c2d1b";
+// private static final String SigSecret = "a6fedf0e1b27d6f7";
+// private static final String DataSecret = "50a61b93919c9604";
+// private static final String DataSecretIV = "7c8ac6861661d584";
+// private final static String url = "https://dev-gov-hlht-sc.unievbj.com/evcs/v1.0.0";
+
+ // 正式环境
+ private static final String OperatorID = "MA01H3BQ2";
+ private static final String OperatorSecret = "a762796b2a8989b8";
+ private static final String SigSecret = "52cd107eb677c004";
+ private static final String DataSecret = "98f46ab6481d87c4";
+ private static final String DataSecretIV = "978170fd1c11a70e";
+ private final static String url = "https://hlht-dipper-sc.unievbj.com/evcs/v1.0.0";
+
+ private final static String query_token = "/query_token";
+
+
+
+ private static final String OurDataSecret = "50a61b93919c9605";
+ private static final String OurDataSecretIV = "7c8ac6861661d585";
+ private static final String OurSigSecret = "a6fedf0e1b27d6f6";
+ private static final String OurOperatorID = "MA01H3BQ3";
+ private static final String OurOperatorSecret = "f1331ef0b37c2d1a";
+ @Autowired
+ private RedisService redisService;
+ public static final String TOKEN_KEY = "charge_token:";
+ /**
+ * 获取token
+ */
+
/**
* 推送充电设备接口状态信息
*/
@@ -39,28 +81,60 @@
*推送充电订单信息
*/
private final static String supervise_notification_charge_order_info = "/supervise_notification_charge_order_info";
-
-
-
- /**
- * 获取token
- */
- public static String queryToken(Operator operator){
- HttpRequest post = HttpUtil.createPost(operator.getUrl() + InterfaceUrlEnum.QUERY_TOKEN.getUrl());
+ private final static String supervise_notification_operation_stats_info = "/supervise_notification_operation_stats_info";
+ private final static String supervise_notification_realtime_power_info = "/supervise_notification_realtime_power_info";
+ private final static String supervise_notification_station_info = "/supervise_notification_station_info";
+ /** 获取token
+ */
+// public String queryToken(){
+// String token = redisService.getCacheObject(TOKEN_KEY);
+// if(StringUtils.hasLength(token)){
+// return token;
+// }
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.put("OperatorID", OperatorID);
+// jsonObject.put("OperatorSecret", OperatorSecret);
+// String params = jsonObject.toJSONString();
+// // 参数加密
+// String data = AesEncryption.encrypt(DataSecret, DataSecretIV, params);
+// // 获取签名
+// String timeStamp = System.currentTimeMillis() + "";
+// SequenceGenerator generator = new SequenceGenerator();
+// String nextSequence = generator.getNextSequence();
+// String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,SigSecret);
+// jsonObject = new JSONObject();
+// jsonObject.put("OperatorID", OperatorID);
+// jsonObject.put("Data", data);
+// jsonObject.put("TimeStamp", timeStamp);
+// jsonObject.put("Seq", nextSequence);
+// jsonObject.put("Sig", hmacMD5);
+// String result = HttpUtils.sendPost(url+query_token, jsonObject.toJSONString());
+// String string = JSONObject.parseObject(result).getString("Data");
+// String decrypt = AesEncryption.decrypt(DataSecret, DataSecretIV, string);
+// JSONObject tokenResult = JSONObject.parseObject(decrypt);
+// token = tokenResult.getString("AccessToken");
+// Integer TokenAvailableTime = tokenResult.getInteger("TokenAvailableTime");
+// redisService.setCacheObject(TOKEN_KEY,token, (long) (TokenAvailableTime - 60), TimeUnit.SECONDS);
+// return token;
+// }
+ public String queryToken(){
+ HttpRequest post = HttpUtil.createPost(url + query_token);
JSONObject info = new JSONObject();
- info.put("OperatorID", operator.getOurOperatorId());
- info.put("OperatorSecret", operator.getOperatorSecret());
+ info.put("OperatorID", "906171535");
+ info.put("OperatorSecret", OperatorSecret);
Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
post.contentType("application/json;charset=utf-8");
- BaseRequest baseRequest = new BaseRequest();
- baseRequest.setOperatorID(operator.getOurOperatorId());
- baseRequest.setTimeStamp(timeStamp);
+ BaseRequestJianGuan baseRequest = new BaseRequestJianGuan();
+ baseRequest.setOperatorID("906171535");
+ 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));
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+ String data = AesEncryption.encrypt(DataSecret, DataSecretIV,jsonString);
+ String hmacMD5 = HMacMD5Util.getHMacMD5("906171535",timeStamp+"", data,nextSequence,SigSecret);
+ baseRequest.setData(data);
+ baseRequest.setSig(hmacMD5);
String request_json = JacksonUtils.toJson(baseRequest);
log.info("获取三方平台授权token请求地址：" + post.getUrl());
log.info("获取三方平台授权token请求参数：" + request_json);
@@ -79,37 +153,56 @@
return null;
}
//解密参数
- String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
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(tokenAvailableTime);
- operatorClient.editOperator(operator);
+// Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + queryTokenResult.getTokenAvailab
return token;
}
-
-
+
/**
* 获取token
- * @return
*/
- public static String getToken(Operator operator){
- if(null != operator.getTokenAvailableTime() && operator.getTokenAvailableTime() > LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
- return operator.getAccessToken();
- }else{
- return queryToken(operator);
- }
- }
-
-
-
+// public String queryToken(){
+// String token = redisService.getCacheObject(TOKEN_KEY);
+// if(StringUtils.hasLength(token)){
+// return token;
+// }
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.put("OperatorID", OperatorID);
+// jsonObject.put("OperatorSecret", OperatorSecret);
+// String params = jsonObject.toJSONString();
+// // 参数加密
+// String data = AesEncryption.encrypt(DataSecret, DataSecretIV, params);
+// // 获取签名
+// String timeStamp = System.currentTimeMillis() + "";
+// SequenceGenerator generator = new SequenceGenerator();
+// String nextSequence = generator.getNextSequence();
+// String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,SigSecret);
+// jsonObject = new JSONObject();
+// jsonObject.put("OperatorID", "906171535");
+// jsonObject.put("OperatorSecret", OperatorSecret);
+// jsonObject.put("Data", data);
+// jsonObject.put("TimeStamp", timeStamp);
+// jsonObject.put("Seq", nextSequence);
+// jsonObject.put("Sig", hmacMD5);
+// String result = HttpUtils.sendPost(url+query_token, jsonObject.toJSONString());
+// String string = JSONObject.parseObject(result).getString("Data");
+// String decrypt = AesEncryption.decrypt(DataSecret, DataSecretIV, string);
+// JSONObject tokenResult = JSONObject.parseObject(decrypt);
+// token = tokenResult.getString("AccessToken");
+// Integer TokenAvailableTime = tokenResult.getInteger("TokenAvailableTime");
+// redisService.setCacheObject(TOKEN_KEY,token, (long) (TokenAvailableTime - 60), TimeUnit.SECONDS);
+// return token;
+// }
+
+
/**
* 设备状态变化推送
* @param info
*/
- public static NotificationStationStatusResult notificationStationStatus(Operator operator, ConnectorStatusInfo info) {
+ public NotificationStationStatusResult notificationStationStatus(Operator operator, ConnectorStatusInfo info) {
HttpRequest post = HttpUtil.createPost(url+supervise_notification_station_status);
buildBody(post, info, operator);
HttpResponse execute = post.execute();
@@ -125,19 +218,19 @@
return null;
}
//解密参数
- String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
log.info("推送三方平台设备状态Data：" + decrypt);
NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class);
return notificationStationStatusResult;
}
-
-
+
+
/**
* 推动充电状态
* @param info
* @return
*/
- public static NotificationEquipChargeStatusResult notificationSupEquipChargeStatus(Operator operator, SupEquipChargeStatus info){
+ public NotificationEquipChargeStatusResult notificationSupEquipChargeStatus(Operator operator, SupEquipChargeStatus info){
HttpRequest post = HttpUtil.createPost(url+supervise_notification_equip_charge_status);
buildBody(post, info, operator);
HttpResponse execute = post.execute();
@@ -153,20 +246,48 @@
return null;
}
//解密参数
- String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
log.info("推送三方平台充电状态Data：" + decrypt);
NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class);
return notificationEquipChargeStatusResult;
}
-
-
+
+
/**
* 推送充电订单信息
* @param info
* @return
*/
- public static NotificationChargeOrderInfoResult notificationChargeOrderInfo(Operator operator, SupChargeOrderInfo info){
+ public NotificationChargeOrderInfoResult notificationChargeOrderInfo(Operator operator, SupChargeOrderInfo info){
HttpRequest post = HttpUtil.createPost(url+supervise_notification_charge_order_info);
+ if (info.getOrderStatus()!=null){
+ switch (info.getOrderStatus()){
+ case -1:
+ info.setOrderStatus(7);
+ break;
+ case 0:
+ info.setOrderStatus(7);
+ break;
+ case 1:
+ info.setOrderStatus(1);
+ break;
+ case 2:
+ info.setOrderStatus(1);
+
+ break;
+ case 3:
+ info.setOrderStatus(2);
+ break;
+ case 4:
+ info.setOrderStatus(3);
+ break;
+ case 5:
+ info.setOrderStatus(4);
+ break;
+ }
+ }else{
+ info.setOrderStatus(5);
+ }
buildBody(post, info, operator);
HttpResponse execute = post.execute();
if(200 != execute.getStatus()){
@@ -181,43 +302,167 @@
return null;
}
//解密参数
- String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
log.info("推送三方平台充电订单信息Data：" + decrypt);
NotificationChargeOrderInfoResult notificationChargeOrderInfoResult = JSON.parseObject(decrypt, NotificationChargeOrderInfoResult.class);
return notificationChargeOrderInfoResult;
}
-
-
+
+
/**
* 构建请求参数和消息头
* @param post
- * @param o
+ * @param
*/
- public static void buildBody(HttpRequest post, Object o, Operator operator){
+ public void buildBody(HttpRequest post, Object o, Operator operator){
Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
post.contentType("application/json;charset=utf-8");
- post.header("Authorization", "Bearer " + getToken(operator));
- BaseRequest baseRequest = new BaseRequest();
- baseRequest.setOperatorID(operator.getOurOperatorId());
- baseRequest.setTimeStamp(timeStamp);
+ post.header("Authorization", "Bearer " + queryToken());
+ BaseRequestJianGuan baseRequest = new BaseRequestJianGuan();
+ baseRequest.setOperatorID("906171535");
+ baseRequest.setTimeStamp(timeStamp+"");
baseRequest.setSeq("0001");
- String jsonString = JacksonUtils.toJson(o);
- String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
+ // 使用 Jackson 转换为 JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.enable(MapperFeature.USE_ANNOTATIONS); // 启用注解支持
+ String jsonString = null;
+ try {
+ jsonString = objectMapper.writeValueAsString(o);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ String encrypt = AesEncryption.encrypt(DataSecret, DataSecretIV,jsonString);
+// String encrypt = AesEncryption.encrypt(DataSecret, DataSecretIV,jsonString);
+
baseRequest.setData(encrypt);
baseRequest.setOperator(operator);
-// baseRequest.setSig(buildSign(baseRequest));
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+
+ String hmacMD5 = HMacMD5Util.getHMacMD5("906171535",timeStamp+"", encrypt,nextSequence,SigSecret);
+// String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,OurSigSecret);
+
+ baseRequest.setSig(hmacMD5);
String request_json = JacksonUtils.toJson(baseRequest);
post.body(request_json);
log.info("推送三方平台请求地址：" + post.getUrl());
log.info("推送三方平台请求参数：" + request_json);
log.info("推送三方平台请求Data：" + jsonString);
}
+ /**
+ * 构建请求参数和消息头
+ * @param post
+ * @param
+ */
+ public void buildBodyStatus(HttpRequest post, SupStationPowerInfoResult info, Operator operator){
+ Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ post.contentType("application/json;charset=utf-8");
+ post.header("Authorization", "Bearer " + queryToken());
+ BaseRequestJianGuan baseRequest = new BaseRequestJianGuan();
+ baseRequest.setOperatorID("906171535");
+ baseRequest.setTimeStamp(timeStamp+"");
+ baseRequest.setSeq("0001");
+ String request_json1 = JacksonUtils.toJson(info);
+ String encrypt = AesEncryption.encrypt(DataSecret, DataSecretIV,request_json1);
+// String encrypt = AesEncryption.encrypt(DataSecret, DataSecretIV,jsonString);
-
-
+ baseRequest.setData(encrypt);
+ baseRequest.setOperator(operator);
+ SequenceGenerator generator = new SequenceGenerator();
+ String nextSequence = generator.getNextSequence();
+
+ String hmacMD5 = HMacMD5Util.getHMacMD5("906171535",timeStamp+"", encrypt,nextSequence,SigSecret);
+// String hmacMD5 = HMacMD5Util.getHMacMD5(OperatorID,timeStamp, data,nextSequence,OurSigSecret);
+
+ baseRequest.setSig(hmacMD5);
+ String request_json = JacksonUtils.toJson(baseRequest);
+ post.body(request_json);
+ log.info("推送三方平台请求地址：" + post.getUrl());
+ log.info("推送三方平台请求参数：" + request_json);
+ log.info("推送三方平台请求Data：" + request_json1);
+ }
+
+ /**
+ * 推送充电用能统计
+ * @param info
+ * @return
+ */
+ public void superviseNotificationOperationStatsInfo(StationStatsInfoResult info){
+ Operator operator = new Operator();
+ HttpRequest post = HttpUtil.createPost(url+supervise_notification_operation_stats_info);
+ buildBody(post, info, operator);
+ HttpResponse execute = post.execute();
+ if(200 != execute.getStatus()){
+ log.error("推送充电用能统计失败：" + execute.body());
+ return ;
+ }
+ log.info("推送充电用能统计信息响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送充电用能统计信息失败：" + baseResult.getMsg());
+ return ;
+ }
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
+ log.info("推送充电用能统计信息Data：" + decrypt);
+
+ }
+ /**
+ * 推送充换电站信息
+ * @param info
+ * @return
+ */
+ public void superviseNotificationStationInfo(SupStationInfoResult info){
+ Operator operator = new Operator();
+ HttpRequest post = HttpUtil.createPost(url+supervise_notification_station_info);
+ buildBody(post, info, operator);
+ HttpResponse execute = post.execute();
+ if(200 != execute.getStatus()){
+ log.error("推送充换电站信息失败：" + execute.body());
+ return ;
+ }
+ log.info("推送充换电站信息信息响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送充换电站信息失败：" + baseResult.getMsg());
+ return ;
+ }
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
+ log.info("推送充换电站信息信息Data：" + decrypt);
+ }
+ /**
+ * 充换电站功率信息
+ * @param info
+ * @return
+ */
+ public void superviseNotificationRealtimePowerInfo(SupStationPowerInfoResult info){
+ Operator operator = new Operator();
+ HttpRequest post = HttpUtil.createPost(url+supervise_notification_realtime_power_info);
+ buildBodyStatus(post, info, operator);
+ HttpResponse execute = post.execute();
+ if(200 != execute.getStatus()){
+ log.error("推送充换电站实时功率失败：" + execute.body());
+ return ;
+ }
+ log.info("推送充换电站实时功率信息响应：" + execute.body());
+ BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
+ Integer Ret = baseResult.getRet();
+ if(0 != Ret){
+ log.error("推送充换电站实时功率信息失败：" + baseResult.getMsg());
+ return ;
+ }
+ //解密参数
+ String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
+ log.info("推送充换电站实时功率信息Data：" + decrypt);
+ }
+
public static void main(String[] args) {
BaseModel model = new BaseModel();
- model.setOperatorID("MA25CNM38");
+ model.setOperatorID("MA01H3BQ2");
model.setData("AoArdDDcmHcmOMkCLHodTpY1xLtt9yhLqxvKPyfdlmEOBj1LJnQM+Z4JOZllt3Pj9rubfgxJ51zMAfzquQegJzHGAT9Y7JrKFzFe6jGtXo0=");
model.setTimeStamp(20250205120800L);
model.setSeq("0001");
@@ -232,8 +477,8 @@
// 打印计算得到的签名Sig
String s = SignUtil.bytesToHexString(hmacMd5);
System.err.println(s);
-
-
+
+
// BaseModel model = new BaseModel();
// model.setOperatorID("MA25CNM38");
// model.setData("xQYYEPiwoc4JENnQsF50qP6Tmnj7uU/AshWn3QbIgrMIk8zvFpy6fWLIiLzQHcLPFCihqH1uzoNhGVNcS8Wvf5gIx9+cWJvYtjwtsjAGMEwNQ6y+rF1jjKnqCNcQbHbhqJ2l76sD54QCFKyenKxymrXri19bDV8hizn3nBw+jcHBtqKHWzjdSHwPDWPIw4rXnrbWLya2PXVgYtVg93WPtliw+0xsqW0BxJamE70/Ilbg4wB5fOAOvXmbLFI+v9jRjpcA7ImhprqPMYkXYAfa2QlICrJEBK7DfpJvRMzKzeT90kOAITqIqFvbfV0ti+greRqToLP6ni4o6w3ID42UmKasIpLTnx+qtR4bVTBTRuDzXvNXDA92RqHaJO21xbSen1eHN/yGfrchBIM0gmav7EpaYAerfU4ubnmJ6xujR6okYepJwBD5DiSIrObfS+GWVPRekvnjvm7BC02NXTrGKA==");
--
Gitblit v1.7.1