diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 2828eb5..a730841 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -4,23 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecord">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="DEVICE_CODE" property="deviceCode" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_CONTENT" property="alarmContent" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="ALARM_THRESH" property="alarmThresh" />
-        <result column="ALARM_DIRECTION" property="alarmDirection" />
-        <result column="ALARM_PITCH" property="alarmPitch" />
-        <result column="ALARM_TIME" property="alarmTime" />
-        <result column="ALARM_STATUS" property="alarmStatus" />
-        <result column="CANCEL_TIME" property="cancelTime" />
-        <result column="CANCEL_USER" property="cancelUser" />
-        <result column="RESUME_TIME" property="resumeTime" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="DEVICE_CODE" property="deviceCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_THRESH" property="alarmThresh"/>
+        <result column="ALARM_DIRECTION" property="alarmDirection"/>
+        <result column="ALARM_PITCH" property="alarmPitch"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="ALARM_STATUS" property="alarmStatus"/>
+        <result column="CANCEL_TIME" property="cancelTime"/>
+        <result column="CANCEL_USER" property="cancelUser"/>
+        <result column="RESUME_TIME" property="resumeTime"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -30,12 +30,16 @@
 
 
     <sql id="monitor_Column_List">
-       bi.MONITOR_NAME AS monitorName, bi.DEVICE_IP AS deviceIp, bi.DEVICE_PORT AS devicePort, bi.DEVICE_USER AS deviceUser, bi.DEVICE_PASSWORD AS devicePassword, bi.NVR_IP AS nvrIp, bi.NVR_PORT AS nvrPort, bi.NVR_CHANNEL AS nvrChannel, bi.NVR_USER AS nvrUser, bi.NVR_PASSWORD AS nvrPassword
+        bi.MONITOR_NAME AS monitorName, bi.DEVICE_IP AS deviceIp, bi.DEVICE_PORT AS devicePort, bi.DEVICE_USER AS deviceUser, bi.DEVICE_PASSWORD AS devicePassword, bi.NVR_IP AS nvrIp, bi.NVR_PORT AS nvrPort, bi.NVR_CHANNEL AS nvrChannel, bi.NVR_USER AS nvrUser, bi.NVR_PASSWORD AS nvrPassword
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType,
+        ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh,
+        ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS
+        AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime,
+        ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         bi.MONITOR_NAME as monitorName,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
@@ -48,16 +52,16 @@
         bi.VALID = 0
         AND bs.VALID = 0
         <if test="request.stationId != null and request.stationId !=''">
-            and bi.STATION_ID  = #{request.stationId}
+            and bi.STATION_ID = #{request.stationId}
         </if>
         <if test="request.monitorId!='' and request.monitorId!= null">
             AND ar.MONITOR_ID = #{request.monitorId}
         </if>
         <if test="request.alarmType!='' and request.alarmType!= null">
-            AND  ar.ALARM_TYPE = #{request.alarmType}
+            AND ar.ALARM_TYPE = #{request.alarmType}
         </if>
         <if test="request.alarmStatus!='' and request.alarmStatus!=null">
-            AND  ar.ALARM_STATUS= #{request.alarmStatus}
+            AND ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
@@ -70,7 +74,11 @@
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode,
+        ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS
+        alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime,
+        ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS
+        resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
@@ -119,26 +127,26 @@
     </update>
 
     <select id="dateStatistics" resultType="java.util.Map">
-        SELECT  DATE_FORMAT(ALARM_TIME, '%Y-%m-%d') AS alarmTime,count(ar.id) AS count
+        SELECT DATE_FORMAT(ALARM_TIME, '%Y-%m-%d') AS alarmTime,count(ar.id) AS count
         FROM alarm_record ar
         JOIN (
-            SELECT  id,STATION_ID
-            FROM bus_monipoi_info
-            WHERE VALID = 0
-            <if test="request.monitorId!='' and request.monitorId!=null">
-                AND id =  #{request.monitorId}
-            </if>
+        SELECT id,STATION_ID
+        FROM bus_monipoi_info
+        WHERE VALID = 0
+        <if test="request.monitorId!='' and request.monitorId!=null">
+            AND id = #{request.monitorId}
+        </if>
         )bi ON ar.MONITOR_ID = bi.ID
         JOIN (
-            SELECT ID,DEPT_ID
-            FROM bus_station_info
-            WHERE  VALID=0
-            <if test="request.stationId!='' and request.stationId!=null">
-                AND ID =  #{request.stationId}
-            </if>
+        SELECT ID,DEPT_ID
+        FROM bus_station_info
+        WHERE VALID=0
+        <if test="request.stationId!='' and request.stationId!=null">
+            AND ID = #{request.stationId}
+        </if>
         ) bs ON bs.ID = bi.STATION_ID
         left join bus_obserpoi_info bo on (bo.MONITOR_ID= ar.MONITOR_ID and bo.LINE_NUM=ar.LINE_NUM)
-        WHERE  1=1
+        WHERE 1=1
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
         </if>
@@ -149,26 +157,26 @@
     </select>
 
     <select id="typeStatistics" resultType="java.util.Map">
-        SELECT ALARM_TYPE AS  alarmType ,count(ar.id) AS count
+        SELECT ALARM_TYPE AS alarmType ,count(ar.id) AS count
         FROM alarm_record ar
-       JOIN (
-                 SELECT  id,STATION_ID
-                FROM bus_monipoi_info
-                WHERE VALID = 0
-                <if test="request.monitorId!='' and request.monitorId!=null">
-                    AND id =  #{request.monitorId}
-                </if>
+        JOIN (
+        SELECT id,STATION_ID
+        FROM bus_monipoi_info
+        WHERE VALID = 0
+        <if test="request.monitorId!='' and request.monitorId!=null">
+            AND id = #{request.monitorId}
+        </if>
         )bi ON ar.MONITOR_ID = bi.ID
         JOIN (
         SELECT ID,DEPT_ID
         FROM bus_station_info
-        WHERE  valid=0
+        WHERE valid=0
         <if test="request.stationId!='' and request.stationId!=null">
             AND ID = #{request.stationId}
         </if>
         ) bs ON bs.ID = bi.STATION_ID
         left join bus_obserpoi_info bo on (bo.MONITOR_ID= ar.MONITOR_ID and bo.LINE_NUM=ar.LINE_NUM)
-        WHERE  1=1
+        WHERE 1=1
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
         </if>

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 2828eb5..a730841 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -4,23 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecord">
-        <id column="ID" property="id" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="DEVICE_CODE" property="deviceCode" />
-        <result column="ALARM_TYPE" property="alarmType" />
-        <result column="ALARM_CONTENT" property="alarmContent" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="ALARM_THRESH" property="alarmThresh" />
-        <result column="ALARM_DIRECTION" property="alarmDirection" />
-        <result column="ALARM_PITCH" property="alarmPitch" />
-        <result column="ALARM_TIME" property="alarmTime" />
-        <result column="ALARM_STATUS" property="alarmStatus" />
-        <result column="CANCEL_TIME" property="cancelTime" />
-        <result column="CANCEL_USER" property="cancelUser" />
-        <result column="RESUME_TIME" property="resumeTime" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="DEVICE_CODE" property="deviceCode"/>
+        <result column="ALARM_TYPE" property="alarmType"/>
+        <result column="ALARM_CONTENT" property="alarmContent"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="ALARM_THRESH" property="alarmThresh"/>
+        <result column="ALARM_DIRECTION" property="alarmDirection"/>
+        <result column="ALARM_PITCH" property="alarmPitch"/>
+        <result column="ALARM_TIME" property="alarmTime"/>
+        <result column="ALARM_STATUS" property="alarmStatus"/>
+        <result column="CANCEL_TIME" property="cancelTime"/>
+        <result column="CANCEL_USER" property="cancelUser"/>
+        <result column="RESUME_TIME" property="resumeTime"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -30,12 +30,16 @@
 
 
     <sql id="monitor_Column_List">
-       bi.MONITOR_NAME AS monitorName, bi.DEVICE_IP AS deviceIp, bi.DEVICE_PORT AS devicePort, bi.DEVICE_USER AS deviceUser, bi.DEVICE_PASSWORD AS devicePassword, bi.NVR_IP AS nvrIp, bi.NVR_PORT AS nvrPort, bi.NVR_CHANNEL AS nvrChannel, bi.NVR_USER AS nvrUser, bi.NVR_PASSWORD AS nvrPassword
+        bi.MONITOR_NAME AS monitorName, bi.DEVICE_IP AS deviceIp, bi.DEVICE_PORT AS devicePort, bi.DEVICE_USER AS deviceUser, bi.DEVICE_PASSWORD AS devicePassword, bi.NVR_IP AS nvrIp, bi.NVR_PORT AS nvrPort, bi.NVR_CHANNEL AS nvrChannel, bi.NVR_USER AS nvrUser, bi.NVR_PASSWORD AS nvrPassword
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        <include refid="Base_Column_List"/>,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType,
+        ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh,
+        ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS
+        AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime,
+        ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         bi.MONITOR_NAME as monitorName,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
@@ -48,16 +52,16 @@
         bi.VALID = 0
         AND bs.VALID = 0
         <if test="request.stationId != null and request.stationId !=''">
-            and bi.STATION_ID  = #{request.stationId}
+            and bi.STATION_ID = #{request.stationId}
         </if>
         <if test="request.monitorId!='' and request.monitorId!= null">
             AND ar.MONITOR_ID = #{request.monitorId}
         </if>
         <if test="request.alarmType!='' and request.alarmType!= null">
-            AND  ar.ALARM_TYPE = #{request.alarmType}
+            AND ar.ALARM_TYPE = #{request.alarmType}
         </if>
         <if test="request.alarmStatus!='' and request.alarmStatus!=null">
-            AND  ar.ALARM_STATUS= #{request.alarmStatus}
+            AND ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
@@ -70,7 +74,11 @@
 
     <select id="detail" resultType="com.casic.missiles.modular.system.dto.AlarmRecordResponse">
         SELECT
-        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
+        distinct(ar.ID) AS id, ar.MONITOR_ID AS monitorId,ar.DETAIL AS detail, ar.DEVICE_CODE AS deviceCode,
+        ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS
+        alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime,
+        ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS
+        resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts,
         <include refid="monitor_Column_List"/>,
         bs.STATION_NAME as stationName,
         bo.LINE_NAME as lineName
@@ -119,26 +127,26 @@
     </update>
 
     <select id="dateStatistics" resultType="java.util.Map">
-        SELECT  DATE_FORMAT(ALARM_TIME, '%Y-%m-%d') AS alarmTime,count(ar.id) AS count
+        SELECT DATE_FORMAT(ALARM_TIME, '%Y-%m-%d') AS alarmTime,count(ar.id) AS count
         FROM alarm_record ar
         JOIN (
-            SELECT  id,STATION_ID
-            FROM bus_monipoi_info
-            WHERE VALID = 0
-            <if test="request.monitorId!='' and request.monitorId!=null">
-                AND id =  #{request.monitorId}
-            </if>
+        SELECT id,STATION_ID
+        FROM bus_monipoi_info
+        WHERE VALID = 0
+        <if test="request.monitorId!='' and request.monitorId!=null">
+            AND id = #{request.monitorId}
+        </if>
         )bi ON ar.MONITOR_ID = bi.ID
         JOIN (
-            SELECT ID,DEPT_ID
-            FROM bus_station_info
-            WHERE  VALID=0
-            <if test="request.stationId!='' and request.stationId!=null">
-                AND ID =  #{request.stationId}
-            </if>
+        SELECT ID,DEPT_ID
+        FROM bus_station_info
+        WHERE VALID=0
+        <if test="request.stationId!='' and request.stationId!=null">
+            AND ID = #{request.stationId}
+        </if>
         ) bs ON bs.ID = bi.STATION_ID
         left join bus_obserpoi_info bo on (bo.MONITOR_ID= ar.MONITOR_ID and bo.LINE_NUM=ar.LINE_NUM)
-        WHERE  1=1
+        WHERE 1=1
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
         </if>
@@ -149,26 +157,26 @@
     </select>
 
     <select id="typeStatistics" resultType="java.util.Map">
-        SELECT ALARM_TYPE AS  alarmType ,count(ar.id) AS count
+        SELECT ALARM_TYPE AS alarmType ,count(ar.id) AS count
         FROM alarm_record ar
-       JOIN (
-                 SELECT  id,STATION_ID
-                FROM bus_monipoi_info
-                WHERE VALID = 0
-                <if test="request.monitorId!='' and request.monitorId!=null">
-                    AND id =  #{request.monitorId}
-                </if>
+        JOIN (
+        SELECT id,STATION_ID
+        FROM bus_monipoi_info
+        WHERE VALID = 0
+        <if test="request.monitorId!='' and request.monitorId!=null">
+            AND id = #{request.monitorId}
+        </if>
         )bi ON ar.MONITOR_ID = bi.ID
         JOIN (
         SELECT ID,DEPT_ID
         FROM bus_station_info
-        WHERE  valid=0
+        WHERE valid=0
         <if test="request.stationId!='' and request.stationId!=null">
             AND ID = #{request.stationId}
         </if>
         ) bs ON bs.ID = bi.STATION_ID
         left join bus_obserpoi_info bo on (bo.MONITOR_ID= ar.MONITOR_ID and bo.LINE_NUM=ar.LINE_NUM)
-        WHERE  1=1
+        WHERE 1=1
         <if test="request.startTime!='' and request.startTime!=null">
             AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
         </if>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
index 9a6b1da..1409061 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
@@ -11,6 +11,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -155,7 +156,7 @@
     /**
      * 描述
      */
-    @TableField("DESCRIPTION")
+    @TableField(value = "DESCRIPTION",updateStrategy = FieldStrategy.IGNORED)
     private String description;
     /**
      * 0：离线，1在线，2报警