feat: 补充预警统计查询条件

shuili-admin/src/main/resources/application-sy.yml

@@ -173,6 +173,7 @@ ignored:
   /system/user/exportExcel,
   /system/kaptcha/render,
   /test/**,
+  /run/api/,
   /map/**
 # http请求连接池
 http:

shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningQueDto.java

@@ -35,6 +35,9 @@ public class WarningQueDto {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("对象编码")
+    private String code;
+
     @ApiModelProperty("类型:1堤防，2水闸")
     private List<String> types;
 

shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.Getter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName: WarningStatisticQueDto
@@ -41,6 +42,9 @@ public class WarningStatisticQueDto {
     @ApiModelProperty("对象编码")
     private String code;
 
+    @ApiModelProperty("对象类型:1堤防，2水闸")
+    private List<String> objTypes;
+
     @Getter
     public enum StatisticType {
         /**

shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java

@@ -30,6 +30,12 @@ public interface WarningMapper extends BaseMapper<DeviceCheckingRecordView> {
             "<if test='sp.adcd != null and sp.adcd != \"\"'>" +
             "AND adcd like concat(#{sp.adcd},'%') " +
             "</if>" +
+            "<if test='sp.objTypes != null and sp.objTypes.size() > 0'>" +
+            "AND TYPE in " +
+            "<foreach collection='sp.objTypes' item='item' open='(' separator=',' close=')'>" +
+            "#{item}" +
+            "</foreach>" +
+            "</if>" +
             "GROUP BY CODE" +
             "</script>")
     IPage<WarningStatisticDto.Statistic> statisticByCode(Page<WarningStatisticDto.Statistic> page, @Param("sp") WarningStatisticQueDto sp);
@@ -53,6 +59,12 @@ public interface WarningMapper extends BaseMapper<DeviceCheckingRecordView> {
             "<if test='sp.code != null and sp.code != \"\"'>" +
             "AND CODE = #{sp.code} " +
             "</if>" +
+            "<if test='sp.objTypes != null and sp.objTypes.size() > 0'>" +
+            "AND TYPE in " +
+            "<foreach collection='sp.objTypes' item='item' open='(' separator=',' close=')'>" +
+            "#{item}" +
+            "</foreach>" +
+            "</if>" +
             "GROUP BY WARNING_TYPE" +
             "</script>")
     IPage<WarningStatisticDto.Statistic> statisticByWarningType(Page<WarningStatisticDto.Statistic> page, @Param("sp") WarningStatisticQueDto sp);

shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java

@@ -66,6 +66,7 @@ public class WarningService {
         LambdaQueryWrapper<DeviceCheckingRecordView> wrapper = Wrappers.<DeviceCheckingRecordView>lambdaQuery()
                 .like(StringUtils.isNotBlank(data.getName()), DeviceCheckingRecordView::getName, sp.getData().getName())
                 .likeLeft(StringUtils.isNotBlank(data.getAdcd()), DeviceCheckingRecordView::getAdcd, sp.getData().getAdcd())
+                .eq(StringUtils.isNotBlank(data.getCode()), DeviceCheckingRecordView::getCode, sp.getData().getCode())
                 .in(CollectionUtils.isNotEmpty(data.getTypes()), DeviceCheckingRecordView::getType, sp.getData().getTypes());
 
         if (data.getStartTime() != null && data.getEndTime() != null) {