diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java
index 47985d353..767cce69f 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @ApiModel
-public class AlarmParam {
+public class AlarmParam extends BaseParam{
 
     @NotBlank(message = "起始时间不可为空")
     @DateTimeStrValid
@@ -45,12 +45,4 @@ public class AlarmParam {
 
     @ApiModelProperty(name = "processTime",value = "处理时间")
     private String processTime;
-
-
-
-    @ApiModelProperty("页码")
-    private Integer pageNum;
-
-    @ApiModelProperty("页面尺寸")
-    private Integer pageSize;
 }
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java
index 996784b91..0abc8840d 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java
@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 public class TerminalAlarmVO implements Serializable {
 
 
+    // 变电站
     private String subName;
 
     private String lineGrade;
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
index 3e9678f21..1c499dbe6 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml
@@ -64,7 +64,7 @@ FROM
 			f.NAME type,
 		    f.id typeId,
 			f.`Level`,
-			max( a.Occurred_Time ) occurredTime,
+			max(a.Occurred_Time) occurredTime,
 			e.NAME subName,
 			b.NAME devLineName,
 			b.id devLineId,
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index ce6587d11..cacba3110 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -401,12 +401,6 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             if (CollectionUtils.isEmpty(deviceIndexes)) {
                 continue;
             }
-            // 监测点流量统计
-//            deviceList = lineMapper.getNewDeviceRunStatistics(lineIndexes,
-//                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
-//                    DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())),
-//                    (deviceInfoParam.getPageNum()-1)*deviceInfoParam.getPageSize(),
-//                    deviceInfoParam.getPageSize());
 
             page = lineMapper.getNewDeviceRunStatistics(
                     new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()),
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java
index 30aa20c4e..b41843f97 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java
@@ -29,19 +29,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
     @Override
     public Page<TerminalAlarmVO> alarmList(AlarmParam alarmParam) {
 
-        String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type  FROM pqs_alarm  group by type,line_id,dev_line_type";
-
-
-
-
-
-
-
-
-
-        //Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
-        //return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
-        return null;
+       // String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type  FROM pqs_alarm  group by type,line_id,dev_line_type";
+        Page<TerminalAlarmVO> page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam));
+        return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade());
     }
 
     @Override