From 5f6ed08050c2a54a274d55eba694abadb70e1746 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Tue, 19 Mar 2024 09:44:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shuili-admin/src/main/resources/application-sy.yml   |  1 +
 .../java/com/kms/yxgh/common/dto/WarningQueDto.java  |  3 +++
 .../kms/yxgh/common/dto/WarningStatisticQueDto.java  |  4 ++++
 .../com/kms/yxgh/common/mapper/WarningMapper.java    | 12 ++++++++++++
 .../com/kms/yxgh/common/service/WarningService.java  |  1 +
 5 files changed, 21 insertions(+)

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<String> 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<String> 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<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);
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<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) {