diff --git a/shuili-admin/src/main/resources/application-sy.yml b/shuili-admin/src/main/resources/application-sy.yml index ab7fbda1..e075bcbf 100644 --- a/shuili-admin/src/main/resources/application-sy.yml +++ b/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: diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningQueDto.java index 696c2bae..a44900f7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningQueDto.java +++ b/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 types; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java index b531bc4e..99fe5906 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/WarningStatisticQueDto.java +++ b/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 objTypes; + @Getter public enum StatisticType { /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java index ed33f9e3..1f4b0d6e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/WarningMapper.java @@ -30,6 +30,12 @@ public interface WarningMapper extends BaseMapper { "" + "AND adcd like concat(#{sp.adcd},'%') " + "" + + "" + + "AND TYPE in " + + "" + + "#{item}" + + "" + + "" + "GROUP BY CODE" + "") IPage statisticByCode(Page page, @Param("sp") WarningStatisticQueDto sp); @@ -53,6 +59,12 @@ public interface WarningMapper extends BaseMapper { "" + "AND CODE = #{sp.code} " + "" + + "" + + "AND TYPE in " + + "" + + "#{item}" + + "" + + "" + "GROUP BY WARNING_TYPE" + "") IPage statisticByWarningType(Page page, @Param("sp") WarningStatisticQueDto sp); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java index 6dda7c12..7ecc135a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/WarningService.java @@ -66,6 +66,7 @@ public class WarningService { LambdaQueryWrapper wrapper = Wrappers.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) {