设备

zoniot-water/zoniot-water-api/src/main/java/com/zcxk/water/api/dto/AlarmTypeDetailsDto.java

@@ -25,6 +25,9 @@ public class AlarmTypeDetailsDto extends BasePageDto {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    @ApiModelProperty(value="场景类型SceneTypeEnum：1.水源 2.水厂 3.泵站 4.管网")
+    private Integer sceneType;
+
     @ApiModelProperty("0 : 历史报警 1:实时报警")
     private int state;
 

zoniot-water/zoniot-water-api/src/main/java/com/zcxk/water/api/dto/AlarmTypePageDto.java

@@ -18,4 +18,6 @@ public class AlarmTypePageDto extends BasePageDto {
     @ApiModelProperty(value="告警分类 1：设备告警，2：离线告警")
     private Integer alarmCategory;
 
+    @ApiModelProperty(value="场景类型SceneTypeEnum：1.水源 2.水厂 3.泵站 4.管网")
+    private Integer sceneType;
 }

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/mapper/AlarmTypeDetailMapper.xml

@@ -73,6 +73,9 @@
             <if test="dto.state != null">
                 and sad.state = #{dto.state}
             </if>
+            <if test="dto.sceneType != null and dto.sceneType!=''" >
+                and sat.scene_type = #{dto.sceneType}
+            </if>
             <include refid="permissionCondition"></include>
             order by sad.create_date desc
         </where>
@@ -102,6 +105,9 @@
             <if test="dto.state != null">
                 and sad.state >=#{dto.state}
             </if>
+            <if test="dto.sceneType != null and dto.sceneType!=''" >
+                and sat.scene_type = #{dto.sceneType}
+            </if>
             <include refid="permissionCondition"></include>
             order by sad.create_date desc
         </where>

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/mapper/AlarmTypeMapper.xml

@@ -247,6 +247,9 @@
       <if test="dto.alarmCategory !=null and dto.alarmCategory!=''" >
         and sat.alarm_category  = #{dto.alarmCategory}
       </if>
+      <if test="dto.sceneType !=null and dto.sceneType!=''" >
+        and sat.scene_type  = #{dto.sceneType}
+      </if>
       and sat.status = 1
       <include refid="permissionCondition"></include>
       order by sat.create_date desc

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/controller/AlarmDetailsController.java

@@ -50,7 +50,7 @@ public class AlarmDetailsController {
     @RequestMapping(value="export" , method = RequestMethod.GET)
     @ApiOperation(value = "导出告警信息")
     public void exportRealTime(AlarmTypeDetailsDto dto, HttpServletResponse response) throws Exception {
-        EasyExcelUtil.excelWrite(response, AlarmDetailsRealTimeDto.class, "实时报警记录", alarmTypeDetailsService.selectList(dto));
+        EasyExcelUtil.excelWrite(response, AlarmDetailsRealTimeDto.class, "告警记录", alarmTypeDetailsService.selectList(dto));
     }
 
 }

zoniot-water/zoniot-water-web/src/main/java/com/zcxk/water/web/service/handle/ReceiveDeviceDataService.java

@@ -147,8 +147,6 @@ public class ReceiveDeviceDataService {
         dispatchReportHandler.handler(monitorDataEntity, receiveData, receiveDateTime);
         // 水泵运行状态报表业务处理
         reportWaterPumpStateHandler.handler(monitorDataEntity, receiveData, receiveDateTime);
-        // 异步处理报警信息
-        //alarmDataHandler.hanlder(monitorDataEntity, receiveData, receiveDateTime);
     }