From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java
index c6f4cc4..06b9826 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java
@@ -3,6 +3,9 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
/**
* @author ZhuBaoMin
* @date 2024-07-24 16:25
@@ -28,6 +31,11 @@
private String intakeNum;
/**
+ * 鍐滄埛濮撳悕
+ */
+ private String clientName;
+
+ /**
* 闃�鎺у櫒鍦板潃
*/
private String rtuAddr;
@@ -51,4 +59,51 @@
* 鏌ヨ缁撴潫鏃ユ湡_鍏抽榾
*/
private String timeStop_close;
+
+
+ public void completionTime(){
+ if(timeStart_open != null && !timeStart_open.trim().equals("")) {
+ timeStart_open = timeStart_open + " 00:00:00";
+ }
+ if(timeStop_open != null && !timeStop_open.trim().equals("")) {
+ timeStop_open = timeStop_open + " 23:59:59";
+ }
+
+ if(timeStart_close != null && !timeStart_close.trim().equals("")) {
+ timeStart_close = timeStart_close + " 00:00:00";
+ }
+ if(timeStop_close != null && !timeStop_close.trim().equals("")) {
+ timeStop_close = timeStop_close + " 23:59:59";
+ }
+ }
+
+
+ public void completionTimeNoEmpty(){
+ if(timeStart_open != null && !timeStart_open.trim().equals("")) {
+ timeStart_open = timeStart_open + " 00:00:00";
+ } else {
+ timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
+ }
+
+ if(timeStop_open != null && !timeStop_open.trim().equals("")) {
+ timeStop_open = timeStop_open + " 23:59:59";
+ }else {
+ timeStop_open = LocalDate.now() + " 23:59:59";
+ }
+
+ if(timeStart_close != null && !timeStart_close.trim().equals("")) {
+ timeStart_close = timeStart_close + " 00:00:00";
+ } else {
+ timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
+ }
+
+ if(timeStop_close != null && !timeStop_close.trim().equals("")) {
+ timeStop_close = timeStop_close + " 23:59:59";
+ }else {
+ timeStop_close = LocalDate.now() + " 23:59:59";
+ }
+
+ }
+
+
}
--
Gitblit v1.8.0