告警

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/DeviceAlarmQueryDto.java

@@ -12,6 +12,10 @@ import java.time.LocalDateTime;
  */
 @Data
 public class DeviceAlarmQueryDto {
+
+    @ApiModelProperty(value = "设备id")
+    private Integer deviceId;
+
     @ApiModelProperty(value = "分类id")
     private Integer categoryId;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/readmeter/WaterMeterDto.java

@@ -1,8 +1,11 @@
 package com.zcxk.rmcp.api.dto.readmeter;
 
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -12,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2021-08-11 14:22
  */
 @Data
-public class WaterMeterDto {
+public class WaterMeterDto implements Comparable<WaterMeterDto> {
     @ApiModelProperty(value="id")
     private Long id;
 
@@ -101,4 +104,13 @@ public class WaterMeterDto {
     private String communityName;
 
 
+    @Override
+    public int compareTo(WaterMeterDto dto) {
+        if(!StrUtil.equals(tenantId,dto.tenantId))return 0;
+        if(!NumberUtil.equals(categoryId,dto.categoryId))return 0;
+        if(!NumberUtil.equals(companyOrgId,dto.companyOrgId))return 0;
+        if(!NumberUtil.equals(deptOrgId,dto.deptOrgId))return 0;
+
+        return 1;
+    }
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmMapper.xml

@@ -277,6 +277,7 @@
     left join rmcp_org rod on (rod.ID = rd.dept_org_id)
     <where>
       rda.status = 1 and rd.status = 1
+      <if test="dto.deviceId != null">and rd.id = #{dto.deviceId}</if>
       <if test="dto.categoryId != null">and rd.category_id = #{dto.categoryId}</if>
       <if test="dto.productId != null">and rd.product_id = #{dto.productId}</if>
       <if test="dto.deviceNo != null and dto.deviceNo != ''">and (rd.device_no LIKE concat('%',#{dto.deviceNo},'%') or rd.meter_no LIKE concat('%',#{dto.deviceNo},'%') )</if>