From eb36d2bdeae4e72152d02f520e0e9fce2cc6c933 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 19 Mar 2026 17:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=99=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/service/impl/SurvDeviceDeployServiceImpl.java   | 6 +++---
 .../jeecg/system/applet/controller/WxAppletController.java  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java
index 0a276c8..d9451c1 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvDeviceDeployServiceImpl.java
@@ -449,10 +449,10 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl<SurvDeviceDeployMap
         Assert.notNull(stationInfo,"无效站点");
         Assert.notBlank(stationInfo.getStationType(),"无效站点类型");
         String deployType ="";
-        if(stationInfo.getStationType().contains("orient")){//面源站
-            deployType = PollutionConstants.WATER_ORIENT;
-        }else if(stationInfo.getStationType().contains("live")) {//畜禽站
+        if(stationInfo.getStationType().contains("live")){//畜禽站
             deployType = PollutionConstants.WATER_LIVE;
+        }else {// 其他都视为面源  stationInfo.getStationType().contains("orient")
+            deployType = PollutionConstants.WATER_ORIENT;
         }
 
         SurvDeviceDeploy deploy = getOne(Wrappers.<SurvDeviceDeploy>lambdaQuery()
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
index ba83545..8ebf9f4 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
@@ -748,6 +748,10 @@ public class WxAppletController {
                         Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize);
                         IPage<SurvTransdataLivestockwaterVo> pages = hisdataLivestockwaterService.getPageResentData(page, liveList);
                         return R.ok(pages);
+                    } else if (pollutionEnum.getType().startsWith("water") && !liveList.isEmpty()) {//匹配新站点类型，如果为water的检测项，都归入面源站点
+                        Page<SurvTransdataOrientwaterVo> page = new Page<SurvTransdataOrientwaterVo>(pageNo, pageSize);
+                        IPage<SurvTransdataOrientwaterVo> pages = hisdataOrientwaterService.getPageResentData(page, orientList);
+                        return R.ok(pages);
                     } else if (PollutionConstants.STINK.equals(pollutionEnum.getType()) && !stinkList.isEmpty()) {//恶臭
                         Page<SurvTransdataStinkVo> page = new Page<SurvTransdataStinkVo>(pageNo, pageSize);
                         IPage<SurvTransdataStinkVo> pages = vocsService.getPageResentData(page, stinkList);