From 1884303b99bdcfc3bb558e7d0ede613c724e9222 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 26 Nov 2025 17:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SurvDeviceDeployController.java           | 20 +++++++++++++++++++
 .../jeecg/common/entity/SurvDeviceDeploy.java | 12 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
index f3e992d..0af03d1 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
@@ -114,4 +114,24 @@ public class SurvDeviceDeployController  {
          Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam);
          return R.ok(job.getResult());
      }
+
+
+     /**
+      * 设备列表
+      *
+      * @return
+      */
+     @ApiOperation(value="监测设备列表", notes="监测设备列表")
+     @GetMapping(value = "/survDeviceList")
+     @ApiLogin
+     public R<List<SurvDeviceDeploy>> survDeviceList(@RequestParam(name = "stationCode",required = false)String stationCode) {
+         List<String> deployTypes = new ArrayList<>();
+         deployTypes.add(PollutionConstants.AIR_SURV);
+         deployTypes.add(PollutionConstants.SOIL_SURV);
+         deployTypes.add(PollutionConstants.WATER_QULITY);
+         deployTypes.add(PollutionConstants.WATER_ORIENT);
+         deployTypes.add(PollutionConstants.WATER_LIVE);
+         List<SurvDeviceDeploy> deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes);
+         return R.ok(deploys);
+     }
 }
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java
index bf84c17..a99a5a7 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvDeviceDeploy.java
@@ -257,6 +257,9 @@ public class SurvDeviceDeploy implements Serializable {
     @TableField(exist = false)
     private Integer isOnline;
 
+    @TableField(exist = false)
+    private String fullDeviceName;
+
     @TableField(exist = false)
     private List<ScEquZhibiao> zhibiaos;
 
@@ -305,7 +308,14 @@ public class SurvDeviceDeploy implements Serializable {
         return protocolDetail;
     }
 
-//    public Integer getIsOnline() {
+    public String getFullDeviceName() {
+        if(StringUtils.isNotBlank(this.stationName)){
+           return stationName+"-"+deployDes;
+        }
+        return deployDes;
+    }
+
+    //    public Integer getIsOnline() {
 //        return Iotutils.checkIsOnline(tenantId, protocolCode, lastsyncTime, deployType);
 //    }
 }