From dbf59228a93ac492d6d9f34ed4402c7124f8ad34 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 24 二月 2025 09:59:45 +0800
Subject: [PATCH] 控制器报警与状态相关3个接口查询条件优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java | 5 +++--
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java | 15 +++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
index 3609963..4a405f4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java
@@ -6,8 +6,6 @@
import lombok.*;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
/**
* @author :WuZeYu
* @Date :2024/7/22 20:01
@@ -35,13 +33,22 @@
@Schema(description = "寮�濮嬫椂闂�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDt;
+ private String startDt;
@Schema(description = "缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDt;
+ private String endDt;
@Schema(description = "鎶ヨ鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)//锛�0姝ｅ父銆�1鎶ヨ锛�
private Byte alarmState;
+
+ public void completionTime(){
+ if(this.startDt != null && !this.startDt.trim().equals("")) {
+ this.startDt = startDt + " 00:00:00";
+ }
+ if(this.endDt != null && !this.endDt.trim().equals("")) {
+ this.endDt = endDt + " 23:59:59";
+ }
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
index 8f44dfe..7f5862a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
@@ -35,7 +35,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
-
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -54,6 +54,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -74,7 +75,7 @@
* @return
*/
public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) {
-
+ vo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params);
--
Gitblit v1.8.0