From 5c2e156834eb636be330e9d6c6e93e16381ec81c Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Fri, 14 Nov 2025 11:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/SurvDeviceDeployMapper.xml     | 25 +++++-----
 .../mapper/xml/SurvDeviceDeployMapper.xml     | 50 ++++++++++---------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml
index 96a0e3a..a4ea8ca 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvDeviceDeployMapper.xml
@@ -4,33 +4,34 @@
 
     <resultMap id="baseResultMap" type="org.jeecg.common.entity.SurvDeviceDeploy">
         <result property="id" column="ID" jdbcType="VARCHAR"/>
-        <result property="tenantId" column="TENANT_ID" jdbcType="VARCHAR"/>
-        <result property="reVision" column="RE_VISION" jdbcType="INTEGER"/>
-        <result property="createdBy" column="CREATED_BY" jdbcType="VARCHAR"/>
-        <result property="createTime" column="CREATE_TIME" />
-        <result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
-        <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
-        <result property="updatedTime" column="UPDATED_TIME" />
         <result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
         <result property="stationCode" column="STATION_CODE" jdbcType="VARCHAR"/>
         <result property="runStatus" column="RUN_STATUS" jdbcType="VARCHAR"/>
         <result property="powerStatus" column="POWER_STATUS" jdbcType="VARCHAR"/>
-        <result property="lastsyncTime" column="LASTSYNC_TIME" />
+        <result property="lastsyncTime" column="LASTSYNC_TIME" jdbcType="TIMESTAMP"/>
         <result property="deviceCode" column="DEVICE_CODE" jdbcType="VARCHAR"/>
         <result property="deployDes" column="DEPLOY_DES" jdbcType="VARCHAR"/>
-        <result column="DEPLOY_PIC" property="deployPic"/>
+        <result property="deployPic" column="DEPLOY_PIC" jdbcType="VARCHAR"/>
         <result property="deviceUrl" column="DEVICE_URL" jdbcType="VARCHAR"/>
         <result property="sortNo" column="SORT_NO" jdbcType="INTEGER"/>
+        <result property="tenantId" column="TENANT_ID" jdbcType="VARCHAR"/>
+        <result property="reVision" column="RE_VISION" jdbcType="INTEGER"/>
+        <result property="createdBy" column="CREATED_BY" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+        <result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
+        <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
+        <result property="updatedTime" column="UPDATED_TIME" jdbcType="TIMESTAMP"/>
         <result property="deployType" column="DEPLOY_TYPE" jdbcType="VARCHAR"/>
+        <result property="deviceLatitude" column="DEVICE_LATITUDE" jdbcType="VARCHAR"/>
+        <result property="deviceLongitude" column="DEVICE_LONGITUDE" jdbcType="VARCHAR"/>
         <result property="groupId" column="GROUP_ID" jdbcType="VARCHAR"/>
         <result property="izBaojing" column="IZ_BAOJING" jdbcType="VARCHAR"/>
         <result property="ipAddr" column="IP_ADDR" jdbcType="VARCHAR"/>
         <result property="port" column="PORT" jdbcType="VARCHAR"/>
-        <result column="DEVICE_LONGITUDE" property="deviceLongitude" jdbcType="VARCHAR"/>
-        <result column="DEVICE_LATITUDE" property="deviceLatitude" jdbcType="VARCHAR"/>
+        <result property="sendInfo" column="SEND_INFO" jdbcType="VARCHAR"/>
+        <result property="mapIcon" column="MAP_ICON" jdbcType="VARCHAR"/>
         <result property="deviceIotUrl" column="DEVICE_IOT_URL" jdbcType="VARCHAR"/>
         <result property="deviceReverseIotUrl" column="DEVICE_REVERSE_IOT_URL" jdbcType="VARCHAR"/>
-        <result property="mapIcon" column="MAP_ICON" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="extMap" type="org.jeecg.common.entity.SurvDeviceDeploy" extends="baseResultMap">
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml
index 98d815e..b159ccf 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml
@@ -2,31 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.system.applet.mapper.SurvDeviceDeployMapper">
     <resultMap id="baseResultMap" type="org.jeecg.common.entity.SurvDeviceDeploy">
-        <id column="ID" property="id"/>
-        <result column="IS_DEL" property="isDel"/>
-        <result column="SORT_NO" property="sortNo"/>
-        <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="RUN_STATUS" property="runStatus"/>
-        <result column="DEPLOY_DES" property="deployDes"/>
-        <result column="DEPLOY_PIC" property="deployPic"/>
-        <result column="DEVICE_URL" property="deviceUrl"/>
-        <result column="CREATE_TIME" property="createTime"/>
-        <result column="DEPLOY_CODE" property="deployCode"/>
-        <result column="DEVICE_CODE" property="deviceCode"/>
-        <result column="DEPLOY_TYPE" property="deployType"/>
-        <result column="UPDATED_TIME" property="updatedTime"/>
-        <result column="STATION_CODE" property="stationCode"/>
-        <result column="POWER_STATUS" property="powerStatus"/>
-        <result column="LASTSYNC_TIME" property="lastsyncTime"/>
-        <result column="DEVICE_LONGITUDE" property="deviceLongitude"/>
-        <result column="DEVICE_LATITUDE" property="deviceLatitude"/>
-        <result column="GROUP_ID" property="groupId"/>
+        <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
+        <result property="stationCode" column="STATION_CODE" jdbcType="VARCHAR"/>
+        <result property="runStatus" column="RUN_STATUS" jdbcType="VARCHAR"/>
+        <result property="powerStatus" column="POWER_STATUS" jdbcType="VARCHAR"/>
+        <result property="lastsyncTime" column="LASTSYNC_TIME" jdbcType="TIMESTAMP"/>
+        <result property="deviceCode" column="DEVICE_CODE" jdbcType="VARCHAR"/>
+        <result property="deployDes" column="DEPLOY_DES" jdbcType="VARCHAR"/>
+        <result property="deployPic" column="DEPLOY_PIC" jdbcType="VARCHAR"/>
+        <result property="deviceUrl" column="DEVICE_URL" jdbcType="VARCHAR"/>
+        <result property="sortNo" column="SORT_NO" jdbcType="INTEGER"/>
+        <result property="tenantId" column="TENANT_ID" jdbcType="VARCHAR"/>
+        <result property="reVision" column="RE_VISION" jdbcType="INTEGER"/>
+        <result property="createdBy" column="CREATED_BY" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+        <result property="updatedBy" column="UPDATED_BY" jdbcType="VARCHAR"/>
+        <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
+        <result property="updatedTime" column="UPDATED_TIME" jdbcType="TIMESTAMP"/>
+        <result property="deployType" column="DEPLOY_TYPE" jdbcType="VARCHAR"/>
+        <result property="deviceLatitude" column="DEVICE_LATITUDE" jdbcType="VARCHAR"/>
+        <result property="deviceLongitude" column="DEVICE_LONGITUDE" jdbcType="VARCHAR"/>
+        <result property="groupId" column="GROUP_ID" jdbcType="VARCHAR"/>
+        <result property="izBaojing" column="IZ_BAOJING" jdbcType="VARCHAR"/>
+        <result property="ipAddr" column="IP_ADDR" jdbcType="VARCHAR"/>
+        <result property="port" column="PORT" jdbcType="VARCHAR"/>
+        <result property="sendInfo" column="SEND_INFO" jdbcType="VARCHAR"/>
+        <result property="mapIcon" column="MAP_ICON" jdbcType="VARCHAR"/>
         <result property="deviceIotUrl" column="DEVICE_IOT_URL" jdbcType="VARCHAR"/>
         <result property="deviceReverseIotUrl" column="DEVICE_REVERSE_IOT_URL" jdbcType="VARCHAR"/>
-        <result property="mapIcon" column="MAP_ICON" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="adResultMap" type="org.jeecg.common.entity.SurvDeviceDeploy" extends="baseResultMap">
         <association property="stationName" javaType="java.lang.String" select="getStationName" column="STATION_CODE"></association>