diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 1d090ee..31d8063 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -25,41 +25,38 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, MONITOR_ID AS monitorId, DEVICE_CODE AS deviceCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_THRESH AS alarmThresh, ALARM_DIRECTION AS alarmDirection, ALARM_PITCH AS alarmPitch, ALARM_TIME AS alarmTime, ALARM_STATUS AS alarmStatus, CANCEL_TIME AS cancelTime, CANCEL_USER AS cancelUser, RESUME_TIME AS resumeTime, LINE_NUM AS lineNum, SERIAL_NUM AS serialNum, TS AS ts
+        ar.ID AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        ar.ID AS id,
-        ar.DEVICE_ID AS deviceId,
-        ar.DEVCODE AS devcode,
-        ar.WELL_CODE AS wellCode,
-        ar.ALARM_TYPE AS alarmType,
-        ar.ALARM_CONTENT AS alarmContent,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_TIME AS alarmTime,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.STATUS AS status,
-        ar.JOB_ID AS jobId,
-        bwi.DEPTID AS deptid
-        FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
-        <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+        <include refid="Base_Column_List"/>,
+        bi.MONITOR_NAME as monitorName,
+        bs.STATION_NAME as stationName
+        FROM
+        alarm_record ar
+        LEFT JOIN bus_monipoi_info bi ON ar.MONITOR_ID = bi.ID
+        LEFT JOIN bus_station_info bs ON bs.ID = bi.STATION_ID
+        WHERE
+        bi.VALID = 0
+        AND bs.VALID = 0
+        <if test="request.stationId != null and request.stationId !=''">
+            and bi.STATION_ID  = #{request.stationId}
         </if>
-        <if test="alarmType!='' and alarmType!= null">
-            AND ar.ALARM_TYPE = #{alarmType}
+        <if test="request.monitorId!='' and request.monitorId!= null">
+            AND ar.MONITOR_ID = #{request.monitorId}
         </if>
-        <if test="alarmContent!='' and alarmContent!= null">
-            AND ar.ALARM_CONTENT = #{alarmContent}
+        <if test="request.alarmType!='' and request.alarmType!= null">
+            AND  ar.ALARM_TYPE = #{request.alarmType}
         </if>
-        <if test="beginTime!='' and beginTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{beginTime}
+        <if test="request.alarmStatus!='' and request.alarmStatus!=null">
+            AND  ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
-        <if test="endTime!='' and endTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{endTime}
+        <if test="request.startTime!='' and request.startTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
     </select>
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 1d090ee..31d8063 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -25,41 +25,38 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, MONITOR_ID AS monitorId, DEVICE_CODE AS deviceCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_THRESH AS alarmThresh, ALARM_DIRECTION AS alarmDirection, ALARM_PITCH AS alarmPitch, ALARM_TIME AS alarmTime, ALARM_STATUS AS alarmStatus, CANCEL_TIME AS cancelTime, CANCEL_USER AS cancelUser, RESUME_TIME AS resumeTime, LINE_NUM AS lineNum, SERIAL_NUM AS serialNum, TS AS ts
+        ar.ID AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        ar.ID AS id,
-        ar.DEVICE_ID AS deviceId,
-        ar.DEVCODE AS devcode,
-        ar.WELL_CODE AS wellCode,
-        ar.ALARM_TYPE AS alarmType,
-        ar.ALARM_CONTENT AS alarmContent,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_TIME AS alarmTime,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.STATUS AS status,
-        ar.JOB_ID AS jobId,
-        bwi.DEPTID AS deptid
-        FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
-        <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+        <include refid="Base_Column_List"/>,
+        bi.MONITOR_NAME as monitorName,
+        bs.STATION_NAME as stationName
+        FROM
+        alarm_record ar
+        LEFT JOIN bus_monipoi_info bi ON ar.MONITOR_ID = bi.ID
+        LEFT JOIN bus_station_info bs ON bs.ID = bi.STATION_ID
+        WHERE
+        bi.VALID = 0
+        AND bs.VALID = 0
+        <if test="request.stationId != null and request.stationId !=''">
+            and bi.STATION_ID  = #{request.stationId}
         </if>
-        <if test="alarmType!='' and alarmType!= null">
-            AND ar.ALARM_TYPE = #{alarmType}
+        <if test="request.monitorId!='' and request.monitorId!= null">
+            AND ar.MONITOR_ID = #{request.monitorId}
         </if>
-        <if test="alarmContent!='' and alarmContent!= null">
-            AND ar.ALARM_CONTENT = #{alarmContent}
+        <if test="request.alarmType!='' and request.alarmType!= null">
+            AND  ar.ALARM_TYPE = #{request.alarmType}
         </if>
-        <if test="beginTime!='' and beginTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{beginTime}
+        <if test="request.alarmStatus!='' and request.alarmStatus!=null">
+            AND  ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
-        <if test="endTime!='' and endTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{endTime}
+        <if test="request.startTime!='' and request.startTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
     </select>
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index b6a29a4..4586dae 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.system.model;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.core.base.json.DateDeserializer;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -72,6 +75,8 @@
     /**
      * 报警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ALARM_TIME")
     private Date alarmTime;
     /**
@@ -82,6 +87,8 @@
     /**
      * 消警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CANCEL_TIME")
     private Date cancelTime;
     /**
@@ -107,11 +114,22 @@
     /**
      * 时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("TS")
     private Date ts;
 
+    @TableField(exist = false)
+    private String monitorName;
 
+    @TableField(exist = false)
+    private String stationName;
 
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @TableField(exist = false)
+    private String alarmStatusName;
 
     @Override
     public String toString() {

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 1d090ee..31d8063 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -25,41 +25,38 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, MONITOR_ID AS monitorId, DEVICE_CODE AS deviceCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_THRESH AS alarmThresh, ALARM_DIRECTION AS alarmDirection, ALARM_PITCH AS alarmPitch, ALARM_TIME AS alarmTime, ALARM_STATUS AS alarmStatus, CANCEL_TIME AS cancelTime, CANCEL_USER AS cancelUser, RESUME_TIME AS resumeTime, LINE_NUM AS lineNum, SERIAL_NUM AS serialNum, TS AS ts
+        ar.ID AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        ar.ID AS id,
-        ar.DEVICE_ID AS deviceId,
-        ar.DEVCODE AS devcode,
-        ar.WELL_CODE AS wellCode,
-        ar.ALARM_TYPE AS alarmType,
-        ar.ALARM_CONTENT AS alarmContent,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_TIME AS alarmTime,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.STATUS AS status,
-        ar.JOB_ID AS jobId,
-        bwi.DEPTID AS deptid
-        FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
-        <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+        <include refid="Base_Column_List"/>,
+        bi.MONITOR_NAME as monitorName,
+        bs.STATION_NAME as stationName
+        FROM
+        alarm_record ar
+        LEFT JOIN bus_monipoi_info bi ON ar.MONITOR_ID = bi.ID
+        LEFT JOIN bus_station_info bs ON bs.ID = bi.STATION_ID
+        WHERE
+        bi.VALID = 0
+        AND bs.VALID = 0
+        <if test="request.stationId != null and request.stationId !=''">
+            and bi.STATION_ID  = #{request.stationId}
         </if>
-        <if test="alarmType!='' and alarmType!= null">
-            AND ar.ALARM_TYPE = #{alarmType}
+        <if test="request.monitorId!='' and request.monitorId!= null">
+            AND ar.MONITOR_ID = #{request.monitorId}
         </if>
-        <if test="alarmContent!='' and alarmContent!= null">
-            AND ar.ALARM_CONTENT = #{alarmContent}
+        <if test="request.alarmType!='' and request.alarmType!= null">
+            AND  ar.ALARM_TYPE = #{request.alarmType}
         </if>
-        <if test="beginTime!='' and beginTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{beginTime}
+        <if test="request.alarmStatus!='' and request.alarmStatus!=null">
+            AND  ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
-        <if test="endTime!='' and endTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{endTime}
+        <if test="request.startTime!='' and request.startTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
     </select>
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index b6a29a4..4586dae 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.system.model;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.core.base.json.DateDeserializer;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -72,6 +75,8 @@
     /**
      * 报警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ALARM_TIME")
     private Date alarmTime;
     /**
@@ -82,6 +87,8 @@
     /**
      * 消警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CANCEL_TIME")
     private Date cancelTime;
     /**
@@ -107,11 +114,22 @@
     /**
      * 时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("TS")
     private Date ts;
 
+    @TableField(exist = false)
+    private String monitorName;
 
+    @TableField(exist = false)
+    private String stationName;
 
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @TableField(exist = false)
+    private String alarmStatusName;
 
     @Override
     public String toString() {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
index 5137222..b0afea1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
@@ -28,17 +30,27 @@
 
     @Autowired
     private AbstractPermissionContext permissionContext;
-//    @Autowired
+    //    @Autowired
 //    private ICasicUserService casicUserService;
-
+    @Autowired
+    private AbstractDictService dictService;
 
     @Override
     public List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
 
 //        ShiroUser currentUser = permissionContext.getUserService().;
-        AuthUser user =permissionContext.getAuthService().getLoginUser();
+//        AuthUser user =permissionContext.getAuthService().getLoginUser();
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-        this.baseMapper.pageList(page,request,dataScope);
-        return null;
+        dataScope.setScopeName("DEPT_ID");
+        List<AlarmRecord> alarmRecordList = this.baseMapper.pageList(page, request, dataScope);
+        alarmRecordList.forEach(alarmRecord -> {
+            if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmStatus())) {
+                alarmRecord.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus", alarmRecord.getAlarmStatus()));
+            }
+            if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmType())) {
+                alarmRecord.setAlarmTypeName(dictService.getDictNameByCode("alarmType", alarmRecord.getAlarmType()));
+            }
+        });
+        return alarmRecordList;
     }
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
index 1d090ee..31d8063 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
@@ -25,41 +25,38 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, MONITOR_ID AS monitorId, DEVICE_CODE AS deviceCode, ALARM_TYPE AS alarmType, ALARM_CONTENT AS alarmContent, ALARM_VALUE AS alarmValue, ALARM_THRESH AS alarmThresh, ALARM_DIRECTION AS alarmDirection, ALARM_PITCH AS alarmPitch, ALARM_TIME AS alarmTime, ALARM_STATUS AS alarmStatus, CANCEL_TIME AS cancelTime, CANCEL_USER AS cancelUser, RESUME_TIME AS resumeTime, LINE_NUM AS lineNum, SERIAL_NUM AS serialNum, TS AS ts
+        ar.ID AS id, ar.MONITOR_ID AS monitorId, ar.DEVICE_CODE AS deviceCode, ar.ALARM_TYPE AS alarmType, ar.ALARM_CONTENT AS alarmContent, ar.ALARM_VALUE AS alarmValue, ar.ALARM_THRESH AS alarmThresh, ar.ALARM_DIRECTION AS alarmDirection, ar.ALARM_PITCH AS alarmPitch, ar.ALARM_TIME AS alarmTime, ar.ALARM_STATUS AS alarmStatus, ar.CANCEL_TIME AS cancelTime, ar.CANCEL_USER AS cancelUser, ar.RESUME_TIME AS resumeTime, ar.LINE_NUM AS lineNum, ar.SERIAL_NUM AS serialNum, ar.TS AS ts
     </sql>
 
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.AlarmRecord">
         SELECT
-        ar.ID AS id,
-        ar.DEVICE_ID AS deviceId,
-        ar.DEVCODE AS devcode,
-        ar.WELL_CODE AS wellCode,
-        ar.ALARM_TYPE AS alarmType,
-        ar.ALARM_CONTENT AS alarmContent,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_TIME AS alarmTime,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.STATUS AS status,
-        ar.JOB_ID AS jobId,
-        bwi.DEPTID AS deptid
-        FROM alarm_records ar
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE STATUS = 1
-        <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+        <include refid="Base_Column_List"/>,
+        bi.MONITOR_NAME as monitorName,
+        bs.STATION_NAME as stationName
+        FROM
+        alarm_record ar
+        LEFT JOIN bus_monipoi_info bi ON ar.MONITOR_ID = bi.ID
+        LEFT JOIN bus_station_info bs ON bs.ID = bi.STATION_ID
+        WHERE
+        bi.VALID = 0
+        AND bs.VALID = 0
+        <if test="request.stationId != null and request.stationId !=''">
+            and bi.STATION_ID  = #{request.stationId}
         </if>
-        <if test="alarmType!='' and alarmType!= null">
-            AND ar.ALARM_TYPE = #{alarmType}
+        <if test="request.monitorId!='' and request.monitorId!= null">
+            AND ar.MONITOR_ID = #{request.monitorId}
         </if>
-        <if test="alarmContent!='' and alarmContent!= null">
-            AND ar.ALARM_CONTENT = #{alarmContent}
+        <if test="request.alarmType!='' and request.alarmType!= null">
+            AND  ar.ALARM_TYPE = #{request.alarmType}
         </if>
-        <if test="beginTime!='' and beginTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{beginTime}
+        <if test="request.alarmStatus!='' and request.alarmStatus!=null">
+            AND  ar.ALARM_STATUS= #{request.alarmStatus}
         </if>
-        <if test="endTime!='' and endTime!=null">
-            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{endTime}
+        <if test="request.startTime!='' and request.startTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.startTime}
+        </if>
+        <if test="request.endTime!='' and request.endTime!=null">
+            AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{request.endTime}
         </if>
     </select>
 
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
index b6a29a4..4586dae 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.system.model;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.casic.missiles.core.base.json.DateDeserializer;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -72,6 +75,8 @@
     /**
      * 报警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ALARM_TIME")
     private Date alarmTime;
     /**
@@ -82,6 +87,8 @@
     /**
      * 消警时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("CANCEL_TIME")
     private Date cancelTime;
     /**
@@ -107,11 +114,22 @@
     /**
      * 时间
      */
+    @JSONField(serializeUsing = DateDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("TS")
     private Date ts;
 
+    @TableField(exist = false)
+    private String monitorName;
 
+    @TableField(exist = false)
+    private String stationName;
 
+    @TableField(exist = false)
+    private String alarmTypeName;
+
+    @TableField(exist = false)
+    private String alarmStatusName;
 
     @Override
     public String toString() {
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
index 5137222..b0afea1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
@@ -1,7 +1,9 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.modular.system.dto.AlarmRecordRequest;
@@ -28,17 +30,27 @@
 
     @Autowired
     private AbstractPermissionContext permissionContext;
-//    @Autowired
+    //    @Autowired
 //    private ICasicUserService casicUserService;
-
+    @Autowired
+    private AbstractDictService dictService;
 
     @Override
     public List<AlarmRecord> pageList(Page<AlarmRecord> page, AlarmRecordRequest request) {
 
 //        ShiroUser currentUser = permissionContext.getUserService().;
-        AuthUser user =permissionContext.getAuthService().getLoginUser();
+//        AuthUser user =permissionContext.getAuthService().getLoginUser();
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
-        this.baseMapper.pageList(page,request,dataScope);
-        return null;
+        dataScope.setScopeName("DEPT_ID");
+        List<AlarmRecord> alarmRecordList = this.baseMapper.pageList(page, request, dataScope);
+        alarmRecordList.forEach(alarmRecord -> {
+            if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmStatus())) {
+                alarmRecord.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus", alarmRecord.getAlarmStatus()));
+            }
+            if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmType())) {
+                alarmRecord.setAlarmTypeName(dictService.getDictNameByCode("alarmType", alarmRecord.getAlarmType()));
+            }
+        });
+        return alarmRecordList;
     }
 }
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index a621c2c..e46b460 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -49,4 +49,9 @@
 logging:
   level.root: info
   level.com.casic: debug
-  level.org.springframework.web: info
\ No newline at end of file
+  level.org.springframework.web: info
+mybatis-plus:
+  configuration:
+    # 配置结果集属性为空时 是否映射返回结果
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
\ No newline at end of file