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/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