From 75f5c732ab9ebae03bba228e08d2b40c1f6cc98c Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Wed, 29 Jul 2026 18:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=90=84=E7=B1=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/appmana/controller/BigScreenController.java | 2 +-
 .../system/applet/controller/SurvStationInfoController.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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 be74fd8..a2398b9 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
@@ -1053,7 +1053,7 @@ public class BigScreenController {
                 ent.setIds(deploy.getId());
                 ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline());
                 if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){
-                    ent.setType("soil");
+                    ent.setType(DeviceDeployEnum.SURV_SOIL.getType());
                 }
                 returnList.add(ent);
             }
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..18a563b 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
@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.constant.PollutionConstants;
+import org.jeecg.common.constant.enums.DeviceDeployEnum;
 import org.jeecg.common.entity.*;
 import org.jeecg.common.util.R;
 import org.jeecg.common.vo.*;
@@ -589,6 +590,9 @@ public class SurvStationInfoController  {
                 ent.setMapIcon(deploy.getMapIcon());
                 ent.setIds(deploy.getId());
                 ent.setIsOnline(iotutils.addOnlineStatus(deploy).getIsOnline());
+				if(DeviceDeployEnum.FLOWMETER.getType().equals(deploy.getDeployType())){
+					ent.setType(DeviceDeployEnum.SURV_SOIL.getType());
+				}
                 returnList.add(ent);
             }
         }