From 16af7e125f0c1a8468dae7fb94f1262fa362db80 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Fri, 14 Nov 2025 15:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8F=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=BB=9F=E8=AE=A1=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BigScreenController.java       |  5 --
 .../mapper/xml/SurvStationInfoMapper.xml      | 11 ++--
 .../mapper/xml/SurvStationInfoMapper.xml      | 50 +++++++++++++------
 .../jeecg/common/entity/SurvStationInfo.java  |  6 ---
 .../org/jeecg/common/vo/StationSummry.java    |  5 +-
 5 files changed, 41 insertions(+), 36 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 8f0b039..bf51977 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
@@ -659,8 +659,6 @@ public class BigScreenController {
                             stationSummry.setCODSummry(avgNH);
                             stationSummry.setNHSummry(avgCOD);
                             stationSummry.setDateStr(wholeTime);
-                            stationSummry.setGroupId(survStationInfo.getGroupId());
-                            stationSummry.setGroupName(survStationInfo.getGroupName());
                             returnArrs.add(JSONObject.parseObject(JSONObject.toJSONString(stationSummry, SerializerFeature.WriteNullStringAsEmpty)));
                         }
                         if(liveList.size()>0){
@@ -722,9 +720,6 @@ public class BigScreenController {
 
                             stationSummry.setNOSummry(avgNO);
                             stationSummry.setDateStr(wholeTime);
-
-                            stationSummry.setGroupId(survStationInfo.getGroupId());
-                            stationSummry.setGroupName(survStationInfo.getGroupName());
                             returnArrs.add(JSONObject.parseObject(JSONObject.toJSONString(stationSummry, SerializerFeature.WriteNullStringAsEmpty)));
                         }
                     }
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
index 4ba9eeb..5171496 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
@@ -30,16 +30,13 @@
         <result column="STATION_ICON" property="stationIcon"/>
         <result column="STATION_ORG" property="stationIntro"/>
         <result column="STATION_INTRO" property="stationOrg"/>
-        <result column="GROUP_ID" property="groupId"/>
-        <result column="GROUP_NAME" property="groupName"/>
-    </resultMap>
-
-    <resultMap id="extMap" type="org.jeecg.common.entity.SurvStationInfo" extends="baseResultMap">
         <collection property="deviceList"  select="getDeviceList" column="{STATION_CODE = STATION_CODE,deviceType = deviceType,ysToken = ysToken}" />
     </resultMap>
 
+
+
     <sql id="baseSql" >
-        ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO,GROUP_ID,GROUP_NAME
+        ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO
     </sql>
 
     <select id="getDeviceList" resultType="org.jeecg.common.entity.SurvDeviceDeploy">
@@ -54,7 +51,7 @@
         select ssi.STATION_TYPE as stationType,count(ssi.STATION_NAME) as stationCount   from surv_station_info ssi  group by ssi.STATION_TYPE
     </select>
 
-    <select id="getAllStationAndDevice" resultMap="extMap">
+    <select id="getAllStationAndDevice" resultMap="baseResultMap">
         select <include refid="baseSql" />,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info where 1=1
         <if test="stationCode != null and stationCode != ''">
             AND STATION_CODE = #{stationCode}
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml
index 9055000..9f2c6ad 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvStationInfoMapper.xml
@@ -29,21 +29,43 @@
         <result column="STATION_ICON" property="stationIcon"/>
         <result column="STATION_ORG" property="stationIntro"/>
         <result column="STATION_INTRO" property="stationOrg"/>
-        <result column="GROUP_ID" property="groupId"/>
-        <result column="GROUP_NAME" property="groupName"/>
-    </resultMap>
-
-
-    <resultMap id="deviceResultMap" type="org.jeecg.common.entity.SurvStationInfo" extends="baseResultMap">
-        <collection property="deviceList"  select="getDeviceList" column="{STATION_CODE = STATION_CODE,deviceType = deviceType,ysToken = ysToken}" />
-    </resultMap>
-
-    <resultMap id="countMap" type="org.jeecg.common.entity.SurvStationInfo" extends="baseResultMap">
         <association property="deviceCount" javaType="java.lang.Integer" select="getDeviceCount" column="STATION_CODE" />
         <association property="survItemCount" javaType="java.lang.Integer" select="getZhiBiaoCount" column="STATION_CODE" />
         <collection property="deviceList"  select="getSimpleDeviceList" column="{STATION_CODE = STATION_CODE}" />
     </resultMap>
 
+
+    <resultMap id="deviceResultMap" type="org.jeecg.common.entity.SurvStationInfo">
+        <id column="ID" property="id"/>
+        <result column="IS_DEL" property="isDel"/>
+        <result column="CORP_ID" property="corpId"/>
+        <result column="SORT_NO" property="sortNo"/>
+        <result column="SURV_OBJ" property="survObj" typeHandler="org.jeecg.common.mybatis.typehandler.ArrayStringTypeHandler"/>
+        <result column="TENANT_ID" property="tenantId"/>
+        <result column="RE_VISION" property="reVision"/>
+        <result column="CREATED_BY" property="createdBy"/>
+        <result column="UPDATED_BY" property="updatedBy"/>
+        <result column="BUILD_TIME" property="buildTime"/>
+        <result column="SURV_RANGE" property="survRange"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="UPDATED_TIME" property="updatedTime"/>
+        <result column="STATION_NAME" property="stationName"/>
+        <result column="STATION_TYPE" property="stationType"/>
+        <result column="CONTACT_NAME" property="contactName"/>
+        <result column="STATION_CODE" property="stationCode"/>
+        <result column="CONTACT_PHONE" property="contactPhone"/>
+        <result column="STATION_LATITUDE" property="stationLatitude"/>
+        <result column="STATION_LOCATION" property="stationLocation"/>
+        <result column="STATION_LONGITUDE" property="stationLongitude"/>
+        <result column="SURV_FREQUENCY" property="survFrequency"/>
+        <result column="STATION_PIC" property="stationPic" typeHandler="org.jeecg.common.mybatis.typehandler.ArrayStringTypeHandler"/>
+        <result column="STATION_ICON" property="stationIcon"/>
+        <result column="STATION_ORG" property="stationIntro"/>
+        <result column="STATION_INTRO" property="stationOrg"/>
+        <collection property="deviceList"  select="getDeviceList" column="{STATION_CODE = STATION_CODE,deviceType = deviceType,ysToken = ysToken}" />
+    </resultMap>
+
+
     <select id="getDeviceCount" resultType="Integer">
         select count(*) from surv_device_deploy where STATION_CODE = #{STATION_CODE}
     </select>
@@ -68,10 +90,10 @@
     </select>
 
     <sql id="baseSql" >
-        ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO,GROUP_ID,GROUP_NAME
+        ID,STATION_NAME,STATION_LATITUDE,STATION_TYPE,STATION_LONGITUDE,CORP_ID,SORT_NO,CONTACT_NAME,STATION_CODE,CONTACT_PHONE,BUILD_TIME,STATION_LOCATION,SURV_RANGE,SURV_OBJ,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATED_TIME,IS_DEL,SURV_FREQUENCY,STATION_PIC,STATION_ICON,STATION_ORG,STATION_INTRO
     </sql>
 
-    <select id="pages" resultMap="countMap">
+    <select id="pages" resultMap="baseResultMap">
         select <include refid="baseSql"/>
         from surv_station_info  where 1=1
         <if test="param2.stationCode != null and param2.stationCode != ''">
@@ -80,7 +102,7 @@
         order by SORT_NO,CREATE_TIME desc
     </select>
 
-    <select id="getStationInfo" resultMap="countMap">
+    <select id="getStationInfo" resultMap="baseResultMap">
         select <include refid="baseSql"/>
         from surv_station_info  where 1=1
         <if test="stationCode != null and stationCode != ''">
@@ -89,7 +111,7 @@
         order by SORT_NO,CREATE_TIME desc
     </select>
 
-    <select id="listALlStation" resultMap="countMap">
+    <select id="listALlStation" resultMap="baseResultMap">
         select <include refid="baseSql"/>
         from surv_station_info  where 1=1
         order by SORT_NO,CREATE_TIME desc
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java
index 94ebf44..0a457ad 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java
@@ -149,12 +149,6 @@ public class SurvStationInfo implements Serializable {
     @ApiModelProperty(value = "站点介绍")
     private String stationIntro;
 
-    @ApiModelProperty(value = "分组ID")
-    private String groupId;
-
-    @ApiModelProperty(value = "分组名称")
-    private String groupName;
-
 
     @TableField(exist = false)
     @ApiModelProperty(value = "设备数量")
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java
index c5fb967..1773edc 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/StationSummry.java
@@ -20,8 +20,5 @@ public class StationSummry {
     private List<Double> CODSummry;
     @JSONField(name = "dateStr")
     private List<String> dateStr;
-    @JSONField(name = "groupId")
-    private String groupId;
-    @JSONField(name = "groupName")
-    private String groupName;
+
 }