From d7f38d8ae35743e02b041f247bf95696ebb7bc65 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 26 Nov 2025 17:37:52 +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

---
 .../applet/mapper/xml/SurvAlertRecordMapper.xml       |  5 +++--
 .../java/org/jeecg/common/entity/SurvAlertRecord.java | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
index 688f8fa..e26b016 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvAlertRecordMapper.xml
@@ -30,19 +30,20 @@
         <result property="survValue" column="SURV_VALUE" jdbcType="VARCHAR"/>
         <result property="survUnit" column="SURV_UNIT" jdbcType="VARCHAR"/>
         <result property="readStatus" column="READ_STATUS" jdbcType="VARCHAR"/>
+        <result property="stationName" column="STATION_NAME" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="extMap" type="org.jeecg.common.entity.SurvAlertRecord" extends="baseResultMap">
         <association property="stationName" select="getStationName" column="DEPLOY_CODE"/>
     </resultMap>
     <sql id="baseSql">
-        ID,ALERT_CONTENT,CORP_ID,ALERT_DTATA_TYPE,ALERT_DATA_ID,PUSH_STATUS,DEVICE_CODE,STATION_CDOE,DEPLOY_CODE,DEPLOY_ID,ALERT_TIME,ITEM_NAME,DEVICE_NAME,CORP_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,ORG_MESSAGE,ITEM_CODE,NORMAL_VALUE,SURV_VALUE,READ_STATUS,SURV_UNIT
+        ID,ALERT_CONTENT,CORP_ID,ALERT_DTATA_TYPE,ALERT_DATA_ID,PUSH_STATUS,DEVICE_CODE,STATION_CDOE,DEPLOY_CODE,DEPLOY_ID,ALERT_TIME,ITEM_NAME,DEVICE_NAME,CORP_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,ORG_MESSAGE,ITEM_CODE,NORMAL_VALUE,SURV_VALUE,READ_STATUS,SURV_UNIT,STATION_NAME
     </sql>
 
     <select id="getStationName" resultType="String">
         select s.STATION_NAME from surv_device_deploy t left join surv_station_info s on t.STATION_CODE = s.STATION_CODE where t.DEPLOY_CODE= #{DEPLOY_CODE}
     </select>
-    <select id="pages" resultMap="extMap">
+    <select id="pages" resultMap="baseResultMap">
         select <include refid="baseSql"/>
         from surv_alert_record where 1=1
         <if test="deviceList!=null">
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvAlertRecord.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvAlertRecord.java
index daca8e6..867805c 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvAlertRecord.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvAlertRecord.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.type.JdbcType;
 import org.jeecg.common.mybatis.typehandler.ArrayStringTypeHandler;
 import org.jeecg.common.mybatis.typehandler.JsonArrayTypeHandler;
@@ -168,6 +169,14 @@ public class SurvAlertRecord implements Serializable {
 
     /**站点名称*/
     @ApiModelProperty(value = "站点名称")
-    @TableField(exist = false)
     private String stationName;
+
+
+
+    public String getFullDeviceName() {
+        if(StringUtils.isNotBlank(this.stationName)){
+            return stationName+"-"+deviceName;
+        }
+        return deviceName;
+    }
 }