From 016d28eba8f0d8f8632828c4589a3b39274a5f02 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 07 五月 2025 14:58:37 +0800 Subject: [PATCH] 1、协议命令生成器增量开发,增加实现几个设置与对应的查询命令; 2、修改陈旧bug。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 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 f9c2ad9..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 @@ -56,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