From cdb3a90ab6af6fe8878aa8750253314a91c6d837 Mon Sep 17 00:00:00 2001
From: wgx <31655391@qq.com>
Date: Thu, 8 Jan 2026 16:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5STATION=5FS?=
 =?UTF-8?q?HORT=5FNAME?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/appmana/mapper/xml/SurvStationInfoMapper.xml | 9 ++++++---
 .../system/applet/mapper/xml/SurvStationInfoMapper.xml   | 8 ++++----
 .../java/org/jeecg/common/entity/SurvStationInfo.java    | 4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

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 789d024..2c8d819 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
@@ -18,6 +18,7 @@
         <result column="CREATE_TIME" property="createTime"/>
         <result column="UPDATED_TIME" property="updatedTime"/>
         <result column="STATION_NAME" property="stationName"/>
+        <result column="STATION_SHORT_NAME" property="stationShortName"/>
         <result column="STATION_TYPE" property="stationType"/>
         <result column="CONTACT_NAME" property="contactName"/>
         <result column="STATION_CODE" property="stationCode"/>
@@ -39,11 +40,12 @@
     </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_SHORT_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
     </sql>
 
     <select id="getDeviceList" resultType="org.jeecg.common.entity.SurvDeviceDeploy">
-        select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEPLOY_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken from surv_device_deploy where IS_DEL = 0 AND STATION_CODE = #{STATION_CODE}
+        select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEPLOY_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken
+        from surv_device_deploy where IS_DEL = 0 AND STATION_CODE = #{STATION_CODE}
         <if test="deviceType != null and deviceType != ''">
             AND DEPLOY_TYPE = #{deviceType}
         </if>
@@ -51,7 +53,8 @@
     </select>
 
     <select id="countStations" resultType="java.util.LinkedHashMap">
-        select ssi.STATION_TYPE as stationType,count(ssi.STATION_NAME) as stationCount   from surv_station_info ssi  group by ssi.STATION_TYPE
+        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">
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 3a41815..6298210 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
@@ -17,6 +17,7 @@
         <result column="CREATE_TIME" property="createTime"/>
         <result column="UPDATED_TIME" property="updatedTime"/>
         <result column="STATION_NAME" property="stationName"/>
+        <result column="STATION_SHORT_NAME" property="stationShortName"/>
         <result column="STATION_TYPE" property="stationType"/>
         <result column="CONTACT_NAME" property="contactName"/>
         <result column="STATION_CODE" property="stationCode"/>
@@ -33,6 +34,9 @@
         <result column="GROUP_NAME" property="groupName"/>
     </resultMap>
 
+    <sql id="baseSql" >
+        ID,STATION_NAME,STATION_SHORT_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
+    </sql>
 
     <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}" />
@@ -66,10 +70,6 @@
         select ID,DEPLOY_TYPE,DEVICE_URL,DEPLOY_CODE,DEVICE_CODE,DEPLOY_DES,DEPLOY_PIC from surv_device_deploy where IS_DEL = 0 AND STATION_CODE = #{STATION_CODE}
     </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
-    </sql>
-
     <select id="pages" resultMap="countMap">
         select <include refid="baseSql"/>
         from surv_station_info  where 1=1
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 293b883..4b1a838 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
@@ -74,6 +74,10 @@ public class SurvStationInfo implements Serializable {
 	@Excel(name = "站点名称", width = 15)
     @ApiModelProperty(value = "站点名称")
     private java.lang.String stationName;
+    /**站点名称简写*/
+    @Excel(name = "站点名称简写", width = 15)
+    @ApiModelProperty(value = "站点名称简写")
+    private java.lang.String stationShortName;
     /**站点类型*/
     @Excel(name = "站点类型", width = 15)
     @ApiModelProperty(value = "站点类型")