From 81da6e54ca3d8ebdff9d4c84f07d3f439bdac5f0 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Mon, 6 Jan 2025 19:18:30 +0800
Subject: [PATCH] =?UTF-8?q?DVR=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csharmonic/param/CsEventUserQueryPage.java   |  4 ----
 .../njcn/csharmonic/param/CsEventUserQueryParam.java  |  8 ++++++--
 .../csharmonic/mapper/mapping/CsEventUserPOMapper.xml | 11 +++++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
index 3ff9a97..9f6e0f0 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * 
@@ -46,7 +45,4 @@ public class CsEventUserQueryPage extends CsEventUserQueryParam{
 
     @ApiModelProperty(value = "测点id")
     private String lineId;
-
-
-
 }
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
index 1ba3de8..3e3f1b8 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
@@ -45,10 +45,14 @@ public class CsEventUserQueryParam {
 
     private String level;
     @ApiModelProperty(value="起始时间")
-//    @NotNull(message="起始时间不能为空！")
     private String startTime;
 
     @ApiModelProperty(value="结束时间")
-//    @NotNull(message="结束时间不能为空！")
     private String endTime;
+
+    @ApiModelProperty(value = "事件类型 Evt_Sys_DipStr:电压暂降 Evt_Sys_SwlStr:电压暂升 Evt_Sys_IntrStr:电压中断")
+    private String eventType;
+
+    @ApiModelProperty(value = "位置 grid:电网侧 load:负载侧")
+    private String location;
 }
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index aec76d4..6b422e0 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -140,7 +140,6 @@
       AND DATE(b.start_time) &gt;= DATE(#{csEventUserQueryPage.startTime})
     </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0">
-
       and b.tag in
       <foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")">
         #{item}
@@ -160,7 +159,15 @@
 
     </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.level != null and csEventUserQueryPage.level !=''">
-      AND   b.level =#{ csEventUserQueryPage.level}
+      AND   b.level = #{ csEventUserQueryPage.level}
+    </if>
+
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.eventType != null and csEventUserQueryPage.eventType !=''">
+      AND b.tag = #{csEventUserQueryPage.eventType}
+    </if>
+
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.location != null and csEventUserQueryPage.location !=''">
+      AND b.location = #{csEventUserQueryPage.location}
     </if>
     order by b.start_time desc
   </select>