From 8eb27484bbda096906fe0f5dd49c67b50099c59e Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期四, 08 十月 2026 16:38:30 +0800
Subject: [PATCH] feat: 光伏统计增加非科士达的电站

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TStationCollectServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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();

--
Gitblit v1.7.1