From a3bb1815c3eb6b0f0cfe9d9d2ba5ee48279e26ed Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 28 三月 2025 11:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/SyncSegmentedDataTask.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/SyncSegmentedDataTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/SyncSegmentedDataTask.java
index 94cfb55..14b5ac5 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/SyncSegmentedDataTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/SyncSegmentedDataTask.java
@@ -43,13 +43,13 @@
private static final String QUERY_SEGMENTED_DATA_URL = "http://10.88.7.107:8081/SG.Web/api/services/nYJK/DiagnosticsSg/QuerySegmentedDataAsync";
- private static final String USERNAME = "MX001@sgis";
+ private static final String USERNAME = "Mx001@sgis";
private static final String PASSWORD = "123456";
@Override
public void run(String params) {
- logger.info("runPredictModuleTask定时任务正在执行，参数为：{}", params);
+ logger.info("syncSegmentedDataTask定时任务正在执行，参数为：{}", params);
try {
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.SECOND, 0);
@@ -65,19 +65,22 @@
RequestAccessTokenVO requestAccessToken = new RequestAccessTokenVO();
requestAccessToken.setUserName(USERNAME);
// 使用公钥和组合后的密码进行密码加密
- requestAccessToken.setReaPassword(encryptWithPublicKey(publicKeyKey, password));
+ String realPassword = encryptWithPublicKey(publicKeyKey, password);
+ logger.info("公钥和组合后的密码进行密码加密:" + realPassword);
+ requestAccessToken.setPassword(realPassword);
+ requestAccessToken.setSource(1);
//获取 token
String accessToken = "Bearer " + getAccessToken(requestAccessToken);
//获取保存后的数据
List<ElectricityPriceSegmentedDTO> list = getElectricityPriceSegmentedList(accessToken);
- list.forEach(item -> {
- mcsApi.createElectricityPrice(item);
- });
+ logger.info("开始保存数据:" + JSON.toJSONString(list));
+ mcsApi.createElectricityPrice(list);
+ logger.info("保存数据完成");
} catch (Exception ex) {
- logger.error("runPredictModuleTask运行异常");
+ logger.error("syncSegmentedDataTask运行异常:" + ex.getMessage());
ex.printStackTrace();
}
- logger.info("runPredictModuleTask运行完成");
+ logger.info("syncSegmentedDataTask运行完成");
}
public String getPublicKey() {
@@ -95,6 +98,7 @@
public String getAccessToken(RequestAccessTokenVO requestAccessToken) {
String accessToken = "";
+ logger.info("请求参数:" + JSON.toJSONString(requestAccessToken));
String resp = HttpUtils.sendPost(ACCESS_TOKEN_URL, JSON.toJSONString(requestAccessToken));
logger.info("获取token的返回值:" + resp);
JSONObject jsonObject = JSON.parseObject(resp);
@@ -108,13 +112,18 @@
}
public List<ElectricityPriceSegmentedDTO> getElectricityPriceSegmentedList(String accessToken){
+ logger.info("accessToken: " + accessToken);
Map<String, String> paramsMap = new HashMap<>();
LocalDate date = LocalDate.now(); // 获取当前日期的LocalDate实例
- int year = date.getYear();
- paramsMap.put("clock", String.valueOf(year));
- String resp = HttpUtils.sendPost(QUERY_SEGMENTED_DATA_URL, JSON.toJSONString(paramsMap), accessToken);
+ String year = String.valueOf(date.getYear());
+ paramsMap.put("clock", year);
+ logger.info("请求参数:" + JSON.toJSONString(paramsMap));
+ String resp = HttpUtils.sendPostToken(QUERY_SEGMENTED_DATA_URL, JSON.toJSONString(paramsMap), accessToken);
+ logger.info("获取分段数据的返回值:" + resp);
JSONObject jsonObject = JSON.parseObject(resp);
- return jsonObject.getJSONArray("data").toJavaList(ElectricityPriceSegmentedDTO.class);
+ List<ElectricityPriceSegmentedDTO> list = jsonObject.getJSONArray("data").toJavaList(ElectricityPriceSegmentedDTO.class);
+ list.forEach(item -> item.setYear(year));
+ return list;
}
public static String encryptWithPublicKey(String publicKeyString, String data) throws Exception {
@@ -123,4 +132,5 @@
cipher.init(Cipher.ENCRYPT_MODE, publicKey);
return Base64.getEncoder().encodeToString(cipher.doFinal(data.getBytes()));
}
+
}
--
Gitblit v1.9.3