Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DVR界面添加条件筛选

Browse Source
This commit is contained in:
xy
2025-01-06 19:18:30 +08:00
parent 1f4e8c7e25
commit 81da6e54ca
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
View File

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* *
@@ -46,7 +45,4 @@ public class CsEventUserQueryPage extends CsEventUserQueryParam{
@ApiModelProperty(value = "测点id") @ApiModelProperty(value = "测点id")
private String lineId; private String lineId;
} }

8
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
View File

@@ -45,10 +45,14 @@ public class CsEventUserQueryParam {
private String level; private String level;
@ApiModelProperty(value="起始时间") @ApiModelProperty(value="起始时间")
// @NotNull(message="起始时间不能为空！")
private String startTime; private String startTime;
@ApiModelProperty(value="结束时间") @ApiModelProperty(value="结束时间")
// @NotNull(message="结束时间不能为空！")
private String endTime; private String endTime;
@ApiModelProperty(value = "事件类型 Evt_Sys_DipStr:电压暂降 Evt_Sys_SwlStr:电压暂升 Evt_Sys_IntrStr:电压中断")
private String eventType;
@ApiModelProperty(value = "位置 grid:电网侧 load:负载侧")
private String location;
} }

9
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
View File

@@ -140,7 +140,6 @@
AND DATE(b.start_time) >= DATE(#{csEventUserQueryPage.startTime}) AND DATE(b.start_time) >= DATE(#{csEventUserQueryPage.startTime})
</if> </if>
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0"> <if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0">
and b.tag in and b.tag in
<foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")"> <foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")">
#{item} #{item}
@@ -162,6 +161,14 @@
<if test="csEventUserQueryPage!=null and csEventUserQueryPage.level != null and csEventUserQueryPage.level !=''"> <if test="csEventUserQueryPage!=null and csEventUserQueryPage.level != null and csEventUserQueryPage.level !=''">
AND b.level = #{ csEventUserQueryPage.level} AND b.level = #{ csEventUserQueryPage.level}
</if> </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 order by b.start_time desc
</select> </select>
</mapper> </mapper>