From cc79dc0f072bfa16bd56f42dd7ddd5291274bf8d Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Wed, 19 Aug 2026 18:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/controller/BigScreenController.java  | 12 ++++++++----
 .../controller/SurvStationInfoController.java    | 16 ++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
index 8126363..727423f 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
@@ -261,7 +261,7 @@ public class BigScreenController {
              Integer count = 0;
              for (SurvStationInfo survStationInfo : stationList) {
                  //设备数量
-                 int counts = survStationInfo.getDeviceList()!=null?survStationInfo.getDeviceList().size():0;
+//                 int counts = survStationInfo.getDeviceList()!=null?survStationInfo.getDeviceList().size():0;
                  List<CommonDataTrans> dataTransList = new ArrayList<>();
                  survStationInfo.setName(count.toString());
                  List<String> deployList = new ArrayList<>();
@@ -336,13 +336,17 @@ public class BigScreenController {
                  count++;
 
                  //补充设备数量
-                 if(!orientIds.isEmpty()){
+                 int counts = 0;
+                 if(!deployList.isEmpty()){
                      //已配置的设备用指标数，未配置用1；
-                     for (String id : orientIds) {
+                     for (String id : deployList) {
                          List<ScEquZhibiao> zhibiaos = zhibiaoMap.get(id);
                          if(zhibiaos!=null){
-                             counts = counts + zhibiaos.size() -1;
+                             counts = counts + zhibiaos.size();
+                         }else{
+                             counts = counts + 1;
                          }
+
                      }
                  }
                  survStationInfo.setDeviceCount(counts);
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
index 548f00f..782b74e 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
@@ -379,14 +379,18 @@ public class SurvStationInfoController  {
 			//获取数据量
 			curStation.setSurvDataCount(finalDataCounts);
             //重新计算设备数
-            int counts = curStation.getDeviceList().size();
-            if(!orientIds.isEmpty()){
+//            int counts = curStation.getDeviceList().size();
+
+			int counts = 0;
+            if(!deployList.isEmpty()){
                 //已配置的设备用指标数，未配置用1；
-                for (String id : orientIds) {
+                for (String id : deployList) {
                     List<ScEquZhibiao> zhibiaos = zhibiaoMap.get(id);
-                    if(zhibiaos!=null){
-                        counts = counts + zhibiaos.size() -1;
-                    }
+					if(zhibiaos!=null){
+						counts = counts + zhibiaos.size();
+					}else{
+						counts = counts + 1;
+					}
                 }
             }
 			curStation.setDeviceCount(counts);