From e67870fff62635cd14beb0d5988f08aeef4b22fa Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 21:27:06 +0800 Subject: [PATCH] 添加远程关阀式终止灌溉计划,未测试 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 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 new file mode 100644 index 0000000..41739a8 --- /dev/null +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/qo/OpenCloseValveQO.java @@ -0,0 +1,109 @@ +package com.dy.pipIrrRemote.report.qo; + +import com.dy.common.webUtil.QueryConditionVo; +import lombok.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * @author ZhuBaoMin + * @date 2024-07-24 16:25 + * @LastEditTime 2024-07-24 16:25 + * @Description 寮�鍏抽榾鎶ユ煡璇㈠璞� + */ + +@Data +@EqualsAndHashCode(callSuper = false) +@ToString(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class OpenCloseValveQO extends QueryConditionVo { + /** + * 鍙栨按鍙D锛屾渶鏂拌褰曡烦杞巻鍙茶褰曟椂浣跨敤 + */ + private Long intakeId; + + /** + * 鍙栨按鍙g紪鍙� + */ + private String intakeNum; + + /** + * 鍐滄埛濮撳悕 + */ + private String clientName; + + /** + * 闃�鎺у櫒鍦板潃 + */ + private String rtuAddr; + + /** + * 鏌ヨ寮�濮嬫棩鏈焈寮�闃� + */ + private String timeStart_open; + + /** + * 鏌ヨ缁撴潫鏃ユ湡_寮�闃� + */ + private String timeStop_open; + + /** + * 鏌ヨ寮�濮嬫棩鏈焈鍏抽榾 + */ + private String timeStart_close; + + /** + * 鏌ヨ缁撴潫鏃ユ湡_鍏抽榾 + */ + 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