diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
index a0e8b34..c42da51 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
@@ -26,4 +26,8 @@
 
     @ApiModelProperty("异常原因")
     private String alarmContent;
+
+    @ApiModelProperty("厂商")
+    private String manufacturerName;
+
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
index a0e8b34..c42da51 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
@@ -26,4 +26,8 @@
 
     @ApiModelProperty("异常原因")
     private String alarmContent;
+
+    @ApiModelProperty("厂商")
+    private String manufacturerName;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
index d306388..19c352f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
@@ -19,6 +19,8 @@
 
     void deleteDeviceLedgers(List<Long> deviceIds);
 
+    void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds);
+
     List<BusDeviceLedger> getListByDeviceId(Long deviceId);
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
index a0e8b34..c42da51 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
@@ -26,4 +26,8 @@
 
     @ApiModelProperty("异常原因")
     private String alarmContent;
+
+    @ApiModelProperty("厂商")
+    private String manufacturerName;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
index d306388..19c352f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
@@ -19,6 +19,8 @@
 
     void deleteDeviceLedgers(List<Long> deviceIds);
 
+    void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds);
+
     List<BusDeviceLedger> getListByDeviceId(Long deviceId);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
index 2e4ab78..faeb7c6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
@@ -44,6 +44,14 @@
     }
 
     @Override
+    public void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds) {
+        UpdateWrapper<BusDeviceLedger> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("LEDGER_ID", ledgerIds);
+        updateWrapper.set("VALID", "-" + System.currentTimeMillis());
+        this.update(updateWrapper);
+    }
+
+    @Override
     public List<BusDeviceLedger> getListByDeviceId(Long deviceId) {
         QueryWrapper<BusDeviceLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVICE_ID", deviceId);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
index a0e8b34..c42da51 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
@@ -26,4 +26,8 @@
 
     @ApiModelProperty("异常原因")
     private String alarmContent;
+
+    @ApiModelProperty("厂商")
+    private String manufacturerName;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
index d306388..19c352f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
@@ -19,6 +19,8 @@
 
     void deleteDeviceLedgers(List<Long> deviceIds);
 
+    void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds);
+
     List<BusDeviceLedger> getListByDeviceId(Long deviceId);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
index 2e4ab78..faeb7c6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
@@ -44,6 +44,14 @@
     }
 
     @Override
+    public void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds) {
+        UpdateWrapper<BusDeviceLedger> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("LEDGER_ID", ledgerIds);
+        updateWrapper.set("VALID", "-" + System.currentTimeMillis());
+        this.update(updateWrapper);
+    }
+
+    @Override
     public List<BusDeviceLedger> getListByDeviceId(Long deviceId) {
         QueryWrapper<BusDeviceLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVICE_ID", deviceId);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d9a9566..a6c7ae0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceLedgerService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.modular.system.model.Dept;
@@ -46,6 +47,7 @@
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
     private final AbstractDeptService abstractDeptService;
+    private final IBusDeviceLedgerService busDeviceLedgerService;
     @Lazy
     @Autowired
     private IBusDeviceService iBusDeviceService;
@@ -108,7 +110,7 @@
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
-            busLedgerPipeResponseDTO.setStatus("0".equals(busLedgerPipeResponseDTO.getStatus()) ? "离线" : "正常");
+            busLedgerPipeResponseDTO.setStatus(abstractDictService.getDictNameByCode("onlineState",busLedgerPipeResponseDTO.getOnlineState()));
             busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值
             busLedgerPipeResponseDTO.setDeptName(ObjectUtil.isNotEmpty(busLedgerPipeResponseDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid()) : ""); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
@@ -266,6 +268,10 @@
 
     @Override
     public boolean batchDelete(List<Long> ids) {
+
+        //删除绑定关系
+        busDeviceLedgerService.deleteDeviceLedgersByLedgerIds(ids);
+        //修改删除标志
         UpdateWrapper<BusLedgerPipe> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("ID", ids);
         updateWrapper.set("VALID", "0");

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 7403c48..0111eb5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -16,8 +16,10 @@
 import com.casic.missiles.modular.alarm.dto.*;
 import com.casic.missiles.modular.alarm.entity.AlarmRecords;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import com.casic.missiles.modular.alarm.entity.User1;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
 import com.casic.missiles.util.ReturnUtil;
+import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -206,5 +208,20 @@
     public void test( ) {
         iAlarmRecordsService.processOffline();
     }
+
+    @JsonView(User1.PublicView.class)
+    @GetMapping("/query")
+    public User1 query() {
+        User1 user1 = new User1();
+        user1.setId(1L);
+        user1.setName("张三");
+        user1.setAddress("北京");
+        user1.setPassword("123456");
+        user1.setIdCard("123456789012345678");
+        user1.setEmail("123456789@qq.com");
+        return user1;
+    }
+
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 39a5e66..37c9e62 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +27,7 @@
 
     Page<TrackResponseDTO> tracksList(Page<TrackResponseDTO> page, @Param("request") TrackRequestDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<DeviceAlarmResponseDTO> deviceAlarmListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
     Page<DeviceAlarmResponseDTO> deviceAlarmHistoryListPage(Page<DeviceAlarmResponseDTO> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
@@ -34,9 +35,9 @@
 
     List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(@Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request,@Param("deptIdStr") String deptIdStr);
+    Page<AlarmRecords> historyListPage(Page<AlarmRecords> page, @Param("request") AlarmRecordDTO request, @Param("deptIdStr") String deptIdStr);
 
-    Map<String,Object> view(@Param("id") Long id);
+    Map<String, Object> view(@Param("id") Long id);
 
     AlarmRecordDetailDTO historyAlarmDetail(@Param("id") Long id);
 
@@ -44,11 +45,16 @@
 
     DeviceAlarmDetailDTO deviceAlarmDetail(@Param("id") Long id);
 
-    void updateCell(@Param("devCode") String devCode,@Param("onLineStatus") String onLineStatus, @Param("cell") String cell, @Param("value") String value, @Param("alarmContent") String alarmContent);
+    void updateCell(@Param("devCode") String devCode,
+                    @Param("onLineStatus") String onLineStatus,
+                    @Param("cell") String cell,
+                    @Param("value") String value,
+                    @Param("alarmContent") String alarmContent,
+                    @Param("logTime") Date logTime);
 
-    void updateWellStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updateWellStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
-    void updatePipeStatus(@Param("tagNumber") String tagNumber,@Param("onLineStatus") String onLineStatus);
+    void updatePipeStatus(@Param("tagNumber") String tagNumber, @Param("onLineStatus") String onLineStatus);
 
     Page<AlarmRecords> pop(Page<AlarmRecords> page, @Param("deptIdStr") String deptIdStr);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index 3ba5a38..c8583d1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -56,10 +56,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -82,7 +82,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -94,6 +94,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE,
         bm.NAME AS manufactureName
         FROM
@@ -117,10 +118,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -140,7 +141,7 @@
         <if test="request.overtime != null and request.overtime !='' ">
             and  TIMESTAMPDIFF(HOUR, rd.ALARM_TIME, NOW())  <![CDATA[ > ]]> 48
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -153,6 +154,7 @@
         lr.DEPTID as deptid,
         rd.POSITION,
         rd.id,
+        rd.TS,
         ay.ALARM_TYPE
         FROM
         alarm_records rd
@@ -173,10 +175,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -193,7 +195,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
@@ -204,6 +206,7 @@
         rd.ALARM_CONTENT,
         rd.ALARM_MSG,
         rd.ALARM_TIME,
+        rd.TS,
         rd.PROCESS_STATUS,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
@@ -231,10 +234,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -251,7 +254,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="batchExportDeviceAlarmHistoryList"
@@ -261,7 +264,7 @@
         rd.DEVCODE,
         ay.ALARM_TYPE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.POSITION, rd.CANCEL_TIME,
         TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
@@ -288,10 +291,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -308,7 +311,7 @@
         <if test="request.manufacturerId != null and request.manufacturerId !='' ">
             and bp.MANUFACTURER_ID =#{request.manufacturerId}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <select id="historyAlarmDetail" resultType="com.casic.missiles.modular.alarm.dto.AlarmRecordDetailDTO">
@@ -365,6 +368,7 @@
                ay.ALARM_TYPE,
                rd.ALARM_CONTENT,
                rd.ALARM_TIME,
+               rd.TS,
                rd.PROCESS_STATUS,
                bt.TYPE_NAME                                          AS devTypeName,
                rd.POSITION AS address,
@@ -444,10 +448,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -552,7 +556,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.PROCESS_STATUS asc ,rd.ALARM_TIME DESC
+        ORDER BY rd.PROCESS_STATUS asc ,rd.TS DESC
     </select>
 
 
@@ -563,7 +567,7 @@
         rd.ALARM_LEVEL,
         rd.ALARM_CONTENT,
         rd.PROCESS_STATUS,
-        rd.ALARM_TIME,
+        rd.TS as alarmTime,
         bt.TYPE_NAME AS devTypeName,
         rd.LEDGER_NUMBER as tagNumber,
         ay.ALARM_TYPE,
@@ -589,10 +593,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -609,7 +613,7 @@
         <if test="request.alarmLevel != null and request.alarmLevel !='' ">
             and rd.ALARM_LEVEL =#{request.alarmLevel}
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
 
@@ -736,7 +740,7 @@
         distinct (rd.id),
         rd.DEVCODE,
         rd.ALARM_CONTENT,
-        rd.ALARM_TIME,
+        rd.TS AS alarmTime,
         rd.REAL_ALARM,
         rd.CANCEL_TIME,
         bt.TYPE_NAME AS devTypeName,
@@ -747,7 +751,7 @@
         ay.ALARM_TYPE,
         ay.ALARM_CATEGORY,
         ac.ALARM_LEVEL as alarmLevelName,
-        TIMESTAMPDIFF(MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME) as cancelDuration
+        TIMESTAMPDIFF(MINUTE, rd.TS, rd.CANCEL_TIME) as cancelDuration
         FROM
         alarm_records rd
         LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -764,10 +768,10 @@
             and bd.DEVICE_TYPE =#{request.devTypeId}
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and rd.ALARM_TIME >= #{request.begTime}
+            and rd.TS >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and rd.ALARM_TIME <![CDATA[ <= ]]> #{request.endTime}
+            and rd.TS <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.alarmTypeId != null and request.alarmTypeId !='' ">
             and rd.ALARM_TYPE_ID =#{request.alarmTypeId}
@@ -791,7 +795,7 @@
         <if test="deptIdStr != null and deptIdStr !='' ">
             and lr.DEPTID in (${deptIdStr})
         </if>
-        ORDER BY rd.ALARM_TIME DESC
+        ORDER BY rd.TS DESC
     </select>
 
     <update id="updateCell" flushCache="true">
@@ -800,7 +804,7 @@
             ONLINE_STATE  = #{onLineStatus},
             MONITOR_VALUE = #{value},
             MONITOR_CONTENT = #{alarmContent},
-            LOGTIME       = now()
+            LOGTIME       = #{logTime}
         where DEVCODE = #{devCode}
           and valid > 0
     </update>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
index 8792f78..7aff0f0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmStaticsMapper.xml
@@ -31,25 +31,25 @@
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=CURDATE()
+        SELECT count(1) as sum,"2" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=CURDATE()
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+        SELECT count(1) as sum,"3" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>=DATE_FORMAT(NOW(),'%Y-%m-01')
+        SELECT count(1) as sum,"4" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>=DATE_FORMAT(NOW(),'%Y-%m-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
         </if>
         UNION ALL
-        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.ALARM_TIME>= DATE_FORMAT(CURDATE(), '%Y-01-01')
+        SELECT count(1) as sum,"5" as type FROM `alarm_records` ar left join bus_ledger_all_view bl ON ar.LEDGER_CODE = bl.ledgerCode  where  ar.TS>= DATE_FORMAT(CURDATE(), '%Y-01-01')
         and ar.EXCEPTION_TYPE='0'
         <if test="deptStrs != null and deptStrs !='' ">
             and bl.DEPTID in (${deptStrs})
@@ -61,19 +61,19 @@
             where  av.exceptionType='0'
 
             <if test="request.timeType ==1 ">
-                and  av.alarmTime >= CURDATE()
+                and  av.ts >= CURDATE()
             </if>
             <if test="request.timeType ==2 ">
-                and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+                and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
             </if>
             <if test="request.timeType ==3 ">
-                and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+                and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
             </if>
             <if test="request.begTime != null and request.begTime !='' ">
-                and av.alarmTime >= #{request.begTime}
+                and av.ts >= #{request.begTime}
             </if>
             <if test="request.endTime != null and request.endTime !='' ">
-                and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+                and av.ts <![CDATA[ <= ]]> #{request.endTime}
             </if>
             <if test="request.ledgerType != null and request.ledgerType !='' ">
                 and av.watchObject = #{request.ledgerType}
@@ -91,19 +91,19 @@
         where  av.exceptionType='0'
 
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -136,7 +136,7 @@
                 bt.WATCH_OBJECT
         ) SELECT
               ay.id,
-              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '场站', ay.alarm_type ),
+              IF(bt.WATCH_OBJECT = 1,CONCAT( '', ay.alarm_type ),IF(bt.WATCH_OBJECT = 2,CONCAT( '', ay.alarm_type ),
               IF( bt.WATCH_OBJECT = 3, CONCAT( '管线', ay.alarm_type ), ay.alarm_type ))) as alarm_name,
               ay.alarm_type,
               bt.WATCH_OBJECT
@@ -154,22 +154,22 @@
         count( 1 ) AS sum,
         alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' ) AS dateStr
+        DATE_FORMAT( av.ts, '%Y-%m-%d' ) AS dateStr
         FROM
         alarm_records_view av
         WHERE
         av.exceptionType = 0
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
@@ -180,7 +180,7 @@
         GROUP BY
         av.alarmTypeId,
         av.watchObject,
-        DATE_FORMAT( av.alarmTime, '%Y-%m-%d' )
+        DATE_FORMAT( av.ts, '%Y-%m-%d' )
         ) ,
         alarm_group as(SELECT ad.ALARM_TYPE_ID,bt.WATCH_OBJECT  FROM alarm_type_devicetype ad LEFT JOIN base_device_type bt ON bt.id = ad.device_type GROUP BY ad.ALARM_TYPE_ID,bt.WATCH_OBJECT),
         alarm_type_tmp as(
@@ -190,7 +190,7 @@
         SELECT
         ay.alarm_type AS alarmTypeName,
         IFNULL( alarms.sum, 0 ) AS `value`,
-        alarms.dateStr as alarmTime,
+        alarms.dateStr as ts,
         alarms.watchObject
         FROM
         alarm_type_tmp ay
@@ -210,19 +210,19 @@
         WHERE
         av.exceptionType = '0'
         <if test="request.timeType ==1 ">
-            and  av.alarmTime >= CURDATE()
+            and  av.ts >= CURDATE()
         </if>
         <if test="request.timeType ==2 ">
-            and  av.alarmTime >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
+            and  av.ts >= CURDATE() - INTERVAL DAYOFWEEK(CURDATE()) - 2 DAY
         </if>
         <if test="request.timeType ==3 ">
-            and av.alarmTime >= DATE_FORMAT(NOW(),'%Y-%m-01')
+            and av.ts >= DATE_FORMAT(NOW(),'%Y-%m-01')
         </if>
         <if test="request.begTime != null and request.begTime !='' ">
-            and av.alarmTime >= #{request.begTime}
+            and av.ts >= #{request.begTime}
         </if>
         <if test="request.endTime != null and request.endTime !='' ">
-            and av.alarmTime <![CDATA[ <= ]]> #{request.endTime}
+            and av.ts <![CDATA[ <= ]]> #{request.endTime}
         </if>
         <if test="request.ledgerType != null and request.ledgerType !='' ">
             and av.watchObject = #{request.ledgerType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
index 797476d..3e0edd6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmDetailDTO.java
@@ -48,6 +48,9 @@
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
+    @ApiModelProperty("报警创建时间")
+    private String ts;
+
     private String tagNumber;
     private String ledgerName;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index a20a497..1931a49 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -50,14 +50,18 @@
     @ApiModelProperty("状态")
     private String processStatus;
 
-    @ColumnWidth(20)
-    @ExcelProperty(value = "报警时间", order = 6)
+
     @ApiModelProperty("报警时间")
     private String alarmTime;
 
     @ApiModelProperty("解除时间")
     private String cancelTime;
 
+    @ColumnWidth(20)
+    @ExcelProperty(value = "报警时间", order = 6)
+    @ApiModelProperty("报警上传时间")
+    private String ts;
+
     @ApiModelProperty("解除时长")
     private String cancelDuration;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
index 632ddc9..97ed9c4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRecords.java
@@ -169,7 +169,7 @@
     public AlarmRecords(Long id,String devcode, String ledgerCode,
                         String ledgerNumber, Long alarmTypeId,
                         String alarmContent, String alarmValue,
-                        Long alarmLevel, Date alarmTime,
+                        Long alarmLevel, Date alarmTime,Date logTime,
                         String alarmMsg, String position,
                         String exceptionType) {
         this.id=id;
@@ -184,6 +184,7 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = logTime;
     }
 
     public AlarmRecords(String devcode, String ledgerCode,
@@ -202,5 +203,6 @@
         this.alarmMsg = alarmMsg;
         this.position = position;
         this.exceptionType = exceptionType;
+        this.ts = alarmTime;
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
new file mode 100644
index 0000000..8a2fc6f
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/User1.java
@@ -0,0 +1,29 @@
+package com.casic.missiles.modular.alarm.entity;
+
+import com.fasterxml.jackson.annotation.JsonView;
+import lombok.Data;
+
+@Data
+public class User1 {
+    public interface PublicView {
+    }
+
+    ;
+
+    public interface InternalView extends PublicView {
+    }
+
+    ;
+    @JsonView(PublicView.class)
+    private Long id;
+    @JsonView(PublicView.class)
+    private String name;
+    @JsonView(PublicView.class)
+    private String address;
+    @JsonView(InternalView.class)
+    private String password;
+    @JsonView(InternalView.class)
+    private String idCard;
+    @JsonView(PublicView.class)
+    private String email;
+}
\ No newline at end of file
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b7b0a98..40af59d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -77,7 +77,7 @@
 
     void processOffline();
 
-    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent);
+    void updateCell(String devCode, String onLineStatus, String cell, String value,String alarmContent,String logTime);
 
     void updateWellStatus(String tagNumber, String onLineStatus);
 
@@ -89,11 +89,11 @@
 
     boolean cancelDeviceAlarmByEventCode(String devCode, String alarmEventCode);
 
-    boolean saveAlarms(String devCode, String gas, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
+    boolean saveAlarms(String devCode, String gas, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName);
 
     boolean saveDeviceAlarms(String devCode, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, Optional<AlarmDeviceRuleResponseDTO> alarmRuleResponseDTO);
 
-    boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    boolean saveWatchAlarms(String devCode, String data, String upTime,  String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                             Long alarmTypeId,Long alarmLevelId,String alarmTypeName,String typeName);
 
     boolean cancelWatchAlarms(String devCode, String code);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index c76f892..ac4cabe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -382,7 +382,7 @@
         parasMap.put("alarmId", alarmRecords.getId());
         parasMap.put("alarmType", alarmRecords.getAlarmTypeId());
         parasMap.put("alarmLevel", alarmRecords.getAlarmLevel());
-        parasMap.put("alarmTime", alarmRecords.getAlarmTime());
+        parasMap.put("alarmTime", alarmRecords.getTs());
         parasMap.put("devType", appRequestDTO.getDevType());
         parasMap.put("devcode", alarmRecords.getDevcode());
         parasMap.put("tagNumber", alarmRecords.getLedgerCode());
@@ -665,7 +665,7 @@
      * @return
      */
     @Override
-    public boolean saveAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
+    public boolean saveAlarms(String devCode, String data, String upTime, String logTime, List<BusAlarmLedgerDTO> busWellDTOList, AlarmRuleResponseDTO alarmRuleResponseDTO, String typeName) {
 
 
         Long alarmId = SnowFlakeUtil.getId();
@@ -674,7 +674,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.getAlarmTypeId(),
                         data.concat("%LEL"), data,
-                        alarmRuleResponseDTO.getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmRuleResponseDTO.getAlarmLevelId(),DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmRuleResponseDTO.getAlarmTypeName(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -704,7 +704,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -721,7 +721,7 @@
 
 
     @Override
-    public boolean saveWatchAlarms(String devCode, String data, String upTime, List<BusAlarmLedgerDTO> busWellDTOList,
+    public boolean saveWatchAlarms(String devCode, String data, String upTime, String logTime,List<BusAlarmLedgerDTO> busWellDTOList,
                                    Long alarmTypeId, Long alarmLevelId, String alarmTypeName, String typeName) {
 
 
@@ -730,7 +730,7 @@
             try {
                 AlarmRecords alarmRecords = new AlarmRecords(alarmId, devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmTypeId, AlarmEnum.getValue(data), data,
-                        alarmLevelId, CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)),
+                        alarmLevelId, DateUtil.parse(upTime),DateUtil.parse(logTime),
                         alarmTypeName, busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "0");
                 this.save(alarmRecords);
                 alarmId = alarmRecords.getId();
@@ -759,7 +759,7 @@
                 msg.put("tagNumber", busWellDTOList.get(0).getTagNumber());
                 msg.put("tagName", busWellDTOList.get(0).getLedgerName());
                 msg.put("deptid", busWellDTOList.get(0).getDeptid());
-                msg.put("alarmTime", CommonUtil.DateFormat(upTime));
+                msg.put("alarmTime", CommonUtil.DateFormat(logTime));
                 msg.put("status", "未读");
                 msg.put("value", data);
                 msg.put("typeName", typeName);
@@ -792,7 +792,7 @@
                 AlarmRecords alarmRecords = new AlarmRecords(devCode, busLedgerDTO.getLedgerCode(),
                         busLedgerDTO.getTagNumber(), alarmRuleResponseDTO.get().getAlarmTypeId(),
                         alarmRuleResponseDTO.get().getAlarmTypeName(),
-                        alarmRuleResponseDTO.get().getAlarmLevelId(), CommonUtil.sdf4.parse(CommonUtil.DateFormat(logTime)),
+                        alarmRuleResponseDTO.get().getAlarmLevelId(), DateUtil.parse(logTime),
                         alarmRuleResponseDTO.get().getAlarmThreshold(), busLedgerDTO.getTagNumber().concat("|").concat(busLedgerDTO.getLedgerName()), "1");
                 this.save(alarmRecords);
             } catch (Exception e) {
@@ -846,8 +846,8 @@
      * @param cell
      */
     @Override
-    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent) {
-        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent);
+    public void updateCell(String devCode, String onLineStatus, String cell, String value, String alarmContent,String logTime) {
+        this.baseMapper.updateCell(devCode, onLineStatus, cell, value, alarmContent,DateUtil.parse(logTime));
     }
 
     @Override
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
index dfbc243..a082d00 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,6 @@
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataGasOtherMapper;
 import com.casic.missiles.modular.data.entity.DataGasOther;
-import com.casic.missiles.modular.data.entity.DataTubeOther;
 import com.casic.missiles.modular.data.service.IDataAbstractService;
 import com.casic.missiles.modular.data.service.IDataGasOtherService;
 import com.casic.missiles.modular.data.service.ITrackLogService;
@@ -26,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -153,9 +152,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -176,8 +176,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -205,7 +205,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -216,7 +216,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index bacb089..dd80611 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -1,6 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +24,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -122,7 +121,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         if (i < jsonArray.size() - 1) continue;
                         //更新设备状态
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -137,17 +136,18 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -158,8 +158,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -183,7 +183,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -194,7 +194,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.contains("V")?cell:cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index caee721..302b446 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -21,11 +22,9 @@
 import com.casic.missiles.util.CommonUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -61,8 +60,6 @@
     @Override
     public void process(String dataContent) {
 
-        System.out.println("接收到数据--->" + dataContent);
-
         //解析数据+根据业务处理存储数据
         JSONObject json = JSONObject.parseObject(dataContent);
         String devCode = json.get("devCode").toString();
@@ -134,7 +131,7 @@
                         alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
                         //更新设备状态
                         if (i < jsonArray.size() - 1) continue;
-                        busDeviceService.updateBusDeviceStatus(devCode,DictEnum.DEVICE_FAILURE);
+                        busDeviceService.updateBusDeviceStatus(devCode, DictEnum.DEVICE_FAILURE);
                     } catch (Exception e) {
                         e.printStackTrace();
                         log.error("--------ERROR:设备编号：" + devCode + "，存储报警数据：" + jsonArray.get(i).toString() + "失败-------");
@@ -148,9 +145,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray1 = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = getBusAlarmLedgerList(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -165,8 +163,8 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
-                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
-                    gas="0";
+                if ("40".equals(gas) || "60".equals(gas) || "40.0".equals(gas) || "60.0".equals(gas)) {
+                    gas = "0";
                 }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
@@ -177,8 +175,8 @@
                         .devcode(devCode)
                         .cell(cell)
                         .strength(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .pci(pci)
                         .rsrp(rsrp)
                         .snr(snr)
@@ -201,7 +199,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
                         }
@@ -212,7 +210,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及设备状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell.concat("%"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 92b5803..e5ba8f7 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -171,9 +171,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -192,7 +193,7 @@
                 String VibL = ((JSONObject) jsonArray.get(i)).getString("VibL");
                 String VibR = ((JSONObject) jsonArray.get(i)).getString("VibR");
                 String uptime = ((JSONObject) jsonArray.get(i)).getString("uptime");
-                String alarmContent="";
+                String alarmContent = "";
                 //1.存数据
                 save(DataMonitorPipeOther.builder()
                         .wellCode(busWellDTOList != null && busWellDTOList.size() > 0 ? busWellDTOList.get(0).getLedgerCode() : "")
@@ -211,75 +212,75 @@
                         .rightOffLineAlarm(DiscR)
                         .leftVibrateAlarm(VibL)
                         .rightVibrateAlarm(VibR)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(uptime))
+                        .logtime(DateUtil.parse(logTime))
                         .build());
 
                 List<AlarmDeviceRuleResponseDTO> ruleResponseDTOList = alarmRuleService.getDeviceAlarmRuleByCode(devCode);
-                ruleResponseDTOList.forEach(ruleResponseDTO -> {
+                for (AlarmDeviceRuleResponseDTO ruleResponseDTO : ruleResponseDTOList) {
 
                     if ("Sloping".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Sloping)&&(!alarmRecordsService.isWatchAlarms(devCode,"Sloping"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
+                        if ("1".equals(Sloping) && (!alarmRecordsService.isWatchAlarms(devCode, "Sloping"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Sloping", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Sloping")).concat(",");
                         } else if ("0".equals(Sloping)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Sloping");
 
                         }
                     }
                     if ("Destroy".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Destroy)&&(!alarmRecordsService.isWatchAlarms(devCode,"Destroy"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
+                        if ("1".equals(Destroy) && (!alarmRecordsService.isWatchAlarms(devCode, "Destroy"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Destroy", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Destroy")).concat(",");
                         } else if ("0".equals(Destroy)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Destroy");
 
                         }
                     }
                     if ("Leak".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(Leak)&&(!alarmRecordsService.isWatchAlarms(devCode,"Leak"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
+                        if ("1".equals(Leak) && (!alarmRecordsService.isWatchAlarms(devCode, "Leak"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "Leak", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("Leak")).concat(",");
                         } else if ("0".equals(Leak)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "Leak");
 
                         }
                     }
                     if ("DiscL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscL)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
+                        if ("1".equals(DiscL) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscL")).concat(",");
                         } else if ("0".equals(DiscL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscL");
 
                         }
                     }
                     if ("DiscR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(DiscR)&&(!alarmRecordsService.isWatchAlarms(devCode,"DiscR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
+                        if ("1".equals(DiscR) && (!alarmRecordsService.isWatchAlarms(devCode, "DiscR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "DiscR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("DiscR")).concat(",");
                         } else if ("0".equals(DiscR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "DiscR");
                         }
                     }
 
                     if ("VibL".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibL)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibL"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
+                        if ("1".equals(VibL) && (!alarmRecordsService.isWatchAlarms(devCode, "VibL"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibL", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibL")).concat(",");
                         } else if ("0".equals(VibL)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibL");
                         }
                     }
                     if ("VibR".equals(ruleResponseDTO.getAlarmThreshold())) {
-                        if ("1".equals(VibR)&&(!alarmRecordsService.isWatchAlarms(devCode,"VibR"))) {
-                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
-                            alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
+                        if ("1".equals(VibR) && (!alarmRecordsService.isWatchAlarms(devCode, "VibR"))) {
+                            alarmRecordsService.saveWatchAlarms(devCode, "VibR", uptime, logTime, busWellDTOList, ruleResponseDTO.getAlarmTypeId(), ruleResponseDTO.getAlarmLevelId(), ruleResponseDTO.getAlarmTypeName(), DeviceTypeEnum.MonitorPipeOther.getName());
+                            alarmContent = alarmContent.concat(AlarmEnum.getValue("VibR")).concat(",");
                         } else if ("0".equals(VibR)) {
                             alarmRecordsService.cancelWatchAlarms(devCode, "VibR");
                         }
                     }
-                });
+                }
 
 //                //处理报警事件
 //                processEventAlarm(devCode,"Sloping",uptime,Sloping);
@@ -321,7 +322,7 @@
                                 //写入报警
                                 //1、判断报警是否已存在
                                 if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), gas)) {
-                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
+                                    alarmRecordsService.saveAlarms(devCode, gas + "", uptime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
                             }
@@ -333,11 +334,11 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", cell, "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "");
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
-                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
+                    alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag || ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
index 250ee57..5dc8c2b 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataPanGasServiceImpl.java
@@ -13,7 +13,6 @@
 import com.casic.missiles.modular.alarm.service.IAlarmRuleService;
 import com.casic.missiles.modular.data.dao.DataGasMapper;
 import com.casic.missiles.modular.data.dao.DataPanGasMapper;
-import com.casic.missiles.modular.data.entity.DataGas;
 import com.casic.missiles.modular.data.entity.DataPanGas;
 import com.casic.missiles.modular.data.service.IDataPanGasService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
@@ -117,7 +116,7 @@
                                 dataTime = dataTime.replaceAll("-", "");
                                 dataTime = dataTime.replaceAll(":", "");
                                 dataTime = dataTime.replaceAll("\\s+", "");
-                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, dataTime, dataTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.PANTILT.getName());
                             }
                             break;
                         }
@@ -128,7 +127,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas,alarmFlag?"浓度达到".concat(gas).concat("PPM.M"):"");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", "", gas, alarmFlag ? "浓度达到".concat(gas).concat("PPM.M") : "", DateUtil.formatDateTime(new Date()));
                 //7.更新监测井状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updateWellStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
@@ -151,7 +150,7 @@
             String uploadUrl = jsonObject.getString("uploadUrl");
             String collDate = jsonObject.getString("collDate");
             String eventType = jsonObject.getString("eventType");
-            log.info("uploadUrl--->"+uploadUrl+",collDate---->"+collDate+",eventType---->"+eventType);
+            log.info("uploadUrl--->" + uploadUrl + ",collDate---->" + collDate + ",eventType---->" + eventType);
             //1.存报警
             //若没绑定井，则不产生报警
             boolean alarmFlag = false;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index 62cd5a5..37d731d 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -26,7 +27,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -141,7 +141,7 @@
 //                        alarmRecordsService.saveDeviceAlarms(devCode, logTime, busWellDTOList, alarmDeviceRuleResponseDTO);
 
                         if (!alarmRecordsService.isWatchAlarms(devCode, alarmType)) {
-                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
+                            alarmRecordsService.saveWatchAlarms(devCode, alarmType, logTime, logTime, busWellDTOList, alarmDeviceRuleResponseDTO.get().getAlarmTypeId(), alarmDeviceRuleResponseDTO.get().getAlarmLevelId(), alarmDeviceRuleResponseDTO.get().getAlarmTypeName(), DeviceTypeEnum.TubeOther.getName());
                             //更新设备报警状态
                             busDeviceService.updateBusDeviceStatus(devCode, AlarmEnum.getValue(alarmType));
                         }
@@ -157,9 +157,10 @@
     @Transactional
     public void processNormalData(JSONObject jsonObject, String devCode) {
         String cell = jsonObject.getString("cell");
-        String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : "";
-        String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : "";
-        String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : "";
+        String pci = jsonObject.getString("pci");
+        String rsrp = jsonObject.getString("rsrp");
+        String snr = jsonObject.getString("snr");
+        String logTime = jsonObject.getString("logTime");
         JSONArray jsonArray = jsonObject.getJSONArray("datas");
         List<BusAlarmLedgerDTO> busWellDTOList = dataGasMapper.getListByDevCode(devCode);
         String bfcf = busDeviceService.getBfcf(devCode);
@@ -180,8 +181,8 @@
                         .devcode(devCode)
 //                        .cell(cell)
                         .gasval(gas)
-                        .uptime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(upTime)))
-                        .logtime(new Date())
+                        .uptime(DateUtil.parse(upTime))
+                        .logtime(DateUtil.parse(logTime))
                         .vbat(vbat)
                         .batsta(batsta)
                         .rsrp(rsrp)
@@ -209,7 +210,7 @@
                             //写入报警
                             //1、判断报警是否已存在
                             if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
-                                alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
+                                alarmRecordsService.saveAlarms(devCode, gas, upTime, logTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
                         }
@@ -220,7 +221,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", cell, gas, alarmFlag ? gas.concat("%LEL") : "");
+                alarmRecordsService.updateCell(devCode, alarmFlag ? "2" : "1", vbat.concat("mV"), gas, alarmFlag ? gas.concat("%LEL") : "", logTime);
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
                     alarmRecordsService.updatePipeStatus(busWellDTOList.get(0).getTagNumber(), alarmFlag ? "2" : "1");
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
index 49a37a8..d09f2fe 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/TrackLogServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.data.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.modular.data.dao.TrackLogMapper;
 import com.casic.missiles.modular.data.entity.TrackLog;
@@ -27,7 +28,7 @@
                     devcode(devCode).
                     lngGaode(doubles[0] + "").
                     latGaode(doubles[1] + "").
-                    upTime(CommonUtil.sdf4.parse(CommonUtil.DateFormat(uptime)))
+                    upTime(DateUtil.parse(uptime))
                     .build());
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
index 32ca924..5f9d323 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLeakMonitorController.java
@@ -69,19 +69,18 @@
 //        return ReturnUtil.success(leakMonitorService.lifecycleRecord(requestDTO));
 //    }
 //
-//    @ApiOperation("列表导出")
-//    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
-//    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
-//        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
-//        page.setCurrent(1);
-//        page.setSize(Integer.MAX_VALUE);
-//        page=leakMonitorService.pageList(page, request);
-//        try {
+    @ApiOperation("列表导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void lifecycleRecordExp(LeakMonitorRequestDTO request, HttpServletResponse response) {
+        Page<LeakMonitorDTO> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSize(Integer.MAX_VALUE);
+        try {
 //            iBaseExportService.exportExcel(response, LifeCycleRecordDTO.class, leakMonitorService.lifecycleRecord(requestDTO), ExportEnum.LIFE_CYCLE_RECORD_EXPORT.getSheetName());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 //
 //    @ApiOperation("监控设备维护记录")
 //    @PostMapping("/repairLog")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index 2e9f7a3..57123c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -29,14 +29,15 @@
     List<WellMapDTO> list(@Param("deptIds") String deptIds,
                           @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE,bd.MONITOR_VALUE,bd.PRODUCT_ID,bd.ONLINE_STATE,bd.MONITOR_CONTENT, " +
             "IF( bd.ONLINE_STATE = '0', IF ( bd.LOGTIME is not null, bd.LOGTIME, bd.INSTALL_DATE ), '' ) AS offDate "+
             " FROM bus_device bd where " +
             " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId}  and bl.VALID=1))  " +
-            " SELECT device.devcode , " +
+            " SELECT device.devcode , bm.name as manufacturerName," +
             " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName,device.MONITOR_VALUE as latestValue,device.ONLINE_STATE as state,device.MONITOR_CONTENT AS alarmContent, " +
             " TIMESTAMPDIFF(DAY, device.offDate , NOW()) as offDays "+
-            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+            " FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE LEFT JOIN base_product bp on bp.id=device.PRODUCT_ID " +
+            " LEFT JOIN bus_manufacturer bm on bm.id= bp.manufacturer_id")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
index 1e8ae63..8ba4b15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceMapper.xml
@@ -75,7 +75,7 @@
            and bd.valid =#{request.valid}
        </if>
        <if test="request.cell != null and request.cell !='' ">
-           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <=  ]]> #{request.cell}
+           and CAST(bd.CELL AS UNSIGNED) <![CDATA[  <  ]]> #{request.cell}
            and bd.CELL > 0 and bd.CELL not like '%V'
        </if>
        <if test="request.logTime1 != null and request.logTime1 !='' ">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index 62f3dcd..01d5913 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -159,7 +159,7 @@
 
         SELECT blp.*,
         bd.DEVCODE,
-        bd.INSTALL_DATE,
+        DATE_FORMAT(bd.INSTALL_DATE, '%Y-%m-%d') AS INSTALL_DATE ,
         bt.TYPE_NAME,
         bp.CONSTRUCT_ERA,
         bp.MATERIAL,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
index a0e8b34..c42da51 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorDTO.java
@@ -26,4 +26,8 @@
 
     @ApiModelProperty("异常原因")
     private String alarmContent;
+
+    @ApiModelProperty("厂商")
+    private String manufacturerName;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
index d306388..19c352f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceLedgerService.java
@@ -19,6 +19,8 @@
 
     void deleteDeviceLedgers(List<Long> deviceIds);
 
+    void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds);
+
     List<BusDeviceLedger> getListByDeviceId(Long deviceId);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
index 2e4ab78..faeb7c6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceLedgerServiceImpl.java
@@ -44,6 +44,14 @@
     }
 
     @Override
+    public void deleteDeviceLedgersByLedgerIds(List<Long> ledgerIds) {
+        UpdateWrapper<BusDeviceLedger> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("LEDGER_ID", ledgerIds);
+        updateWrapper.set("VALID", "-" + System.currentTimeMillis());
+        this.update(updateWrapper);
+    }
+
+    @Override
     public List<BusDeviceLedger> getListByDeviceId(Long deviceId) {
         QueryWrapper<BusDeviceLedger> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVICE_ID", deviceId);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d9a9566..a6c7ae0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -16,6 +16,7 @@
 import com.casic.missiles.modular.device.dao.BusLedgerPipeMapper;
 import com.casic.missiles.modular.device.dto.*;
 import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusDeviceLedgerService;
 import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
 import com.casic.missiles.modular.system.model.Dept;
@@ -46,6 +47,7 @@
     private final BusDeviceMapper busDeviceMapper;
     private final CommonServer commonServer;
     private final AbstractDeptService abstractDeptService;
+    private final IBusDeviceLedgerService busDeviceLedgerService;
     @Lazy
     @Autowired
     private IBusDeviceService iBusDeviceService;
@@ -108,7 +110,7 @@
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
-            busLedgerPipeResponseDTO.setStatus("0".equals(busLedgerPipeResponseDTO.getStatus()) ? "离线" : "正常");
+            busLedgerPipeResponseDTO.setStatus(abstractDictService.getDictNameByCode("onlineState",busLedgerPipeResponseDTO.getOnlineState()));
             busLedgerPipeResponseDTO.setOnState(abstractDictService.getDictNameByCode("useStatus", busLedgerPipeResponseDTO.getOnState())); // 使用状态字典值
             busLedgerPipeResponseDTO.setDeptName(ObjectUtil.isNotEmpty(busLedgerPipeResponseDTO.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedgerPipeResponseDTO.getDeptid()) : ""); // 管理单位名称
             busLedgerPipeResponseDTO.setPressType(abstractDictService.getDictNameByCode("wellType", busLedgerPipeResponseDTO.getPressType())); // 位置状态字典值
@@ -266,6 +268,10 @@
 
     @Override
     public boolean batchDelete(List<Long> ids) {
+
+        //删除绑定关系
+        busDeviceLedgerService.deleteDeviceLedgersByLedgerIds(ids);
+        //修改删除标志
         UpdateWrapper<BusLedgerPipe> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("ID", ids);
         updateWrapper.set("VALID", "0");
diff --git a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
index 4a89a33..0ff43b6 100644
--- a/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
+++ b/casic-public/src/main/java/com/casic/missiles/util/CommonUtil.java
@@ -4,13 +4,16 @@
 import cn.hutool.core.util.StrUtil;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
 public class CommonUtil {
-    public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH,mm,ss");
+//    public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     public static boolean isNumber(String str) {
         if (StrUtil.isNotEmpty(str)) {
@@ -19,12 +22,23 @@
         return false;
     }
 
+    public static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    public static String formatDate(LocalDate date) {
+        return date.format(dateFormatter);
+    }
+//
+//    public Date String paDate(LocalDate date) {
+//        return date.format(dateFormatter);
+//    }
+
+
     public static String DateFormat(String dataString) {
 
         String strymd = dataString.substring(0, 8);
         String str1 = strymd.substring(0, 4) + "-" + strymd.substring(4, 6) + "-" + strymd.substring(6, 8) + " ";
         String strhms = dataString.substring(8);
-        String str2 = strhms.substring(0, 2) + "," + strhms.substring(2, 4) + "," + strhms.substring(4, 6);
+        String str2 = strhms.substring(0, 2) + ":" + strhms.substring(2, 4) + ":" + strhms.substring(4, 6);
         dataString = str1 + str2;
         return dataString;
     }