From a7d9fba4c1d0b021e017abd70d1b37ba87ebae1e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 10 十月 2026 10:25:24 +0800
Subject: [PATCH] Merge branch '2.3' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.3
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java | 13 ++++++++++++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationInfoServiceImpl.java | 4 ++++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java | 3 ++-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java | 19 +++++++++++++++----
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java
index d4ef6ca..60c74fb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java
@@ -325,8 +325,9 @@
JSONObject json = JSONObject.parseObject(item.toString());
String collectId = firstNotBlank(json.getString("devDn"), json.getString("esnCode"));
String stationId = json.getString("stationCode");
+ Integer devTypeId = json.getInteger("devTypeId");
if (StringUtils.isBlank(collectId) || StringUtils.isBlank(stationId)
- || existingKeys.contains(collectId) || !pendingKeys.add(collectId)) {
+ || existingKeys.contains(collectId) || !pendingKeys.add(collectId) || devTypeId != 1) {
continue;
}
TStationCollect collect = new TStationCollect();
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationInfoServiceImpl.java
index 777ff8f..3114501 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationInfoServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationInfoServiceImpl.java
@@ -365,6 +365,10 @@
statusVO.setOnStatusCount(onStatusList.size());
statusVO.setOffStatusCount(stationInfoList.size() - onStatusList.size());
}
+ // 电站状态数量加上非科士达的数据
+ List<TStationInfo> noKeShiDaList = stationInfoList.stream().filter(s -> s.getPlatformId() != 0).collect(Collectors.toList());
+ statusVO.setTotal(statusVO.getTotal() + noKeShiDaList.size());
+ statusVO.setOnline(statusVO.getOnline() + noKeShiDaList.size());
return statusVO;
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
index 7ee5ad1..d75e92b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/HuWeiUtils.java
@@ -3,6 +3,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.other.domain.TPlatformConfig;
+import com.ruoyi.other.service.TPlatformConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -38,9 +42,16 @@
@Resource
private RestTemplate restTemplate;
+ @Resource
+ private TPlatformConfigService platformConfigService;
+
/** 登录华为 FusionSolar 并取得 XSRF-TOKEN。 */
public String getXsrfToken() {
- return getXsrfToken(DEFAULT_USER_NAME, DEFAULT_SYSTEM_CODE);
+ TPlatformConfig config = platformConfigService.getOne(Wrappers.lambdaQuery(TPlatformConfig.class).eq(TPlatformConfig::getPlatformName, "华为"));
+ if (config == null || StringUtils.isBlank(config.getAccount()) || StringUtils.isBlank(config.getPassword())) {
+ return getXsrfToken(DEFAULT_USER_NAME, DEFAULT_SYSTEM_CODE);
+ }
+ return getXsrfToken(config.getAccount(), config.getPassword());
}
/** 使用指定账号登录并取得 XSRF-TOKEN。 */
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
index 9d842d7..0a3875f 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java
@@ -5,7 +5,11 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.other.domain.TPlatformConfig;
+import com.ruoyi.other.service.TPlatformConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -166,11 +170,18 @@
public static String token() {
+ TPlatformConfig config = SpringUtils.getBean(TPlatformConfigService.class).getOne(Wrappers.lambdaQuery(TPlatformConfig.class).eq(TPlatformConfig::getPlatformName, "科士达"));
+ if (config == null) {
+ config = new TPlatformConfig();
+ }
+ if (StringUtils.isBlank(config.getAccount()) || StringUtils.isBlank(config.getPassword())) {
+ config.setAccount("环岛光伏");
+ config.setPassword("cR8GGwIXMI462A8Dfl9eXg==");
+ }
HttpRequest post = HttpUtil.createPost("http://111.230.136.62:8092/authentication/form");
post.basicAuth("kstar","kstarSecret");
- post.form("username", "环岛光伏");
- post.form("password", "cR8GGwIXMI462A8Dfl9eXg==");
- System.out.println(post);
+ post.form("username", config.getAccount());
+ post.form("password", config.getPassword());
HttpResponse execute = post.execute();
String body = execute.body();
JSONObject jsonObject = JSONObject.parseObject(body);
@@ -402,4 +413,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.7.1