From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时，不会出现时长设置过长的问题
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
index f0b09af..75e513f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java
@@ -1,6 +1,8 @@
package com.dy.rtuMw.server.msCenter;
+import com.dy.common.util.DateTime;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
/**
* @Author: liurunyu
@@ -8,16 +10,66 @@
* @Description
*/
//浣胯捣浣滅敤锛屾湰绫绘敞瑙Component锛屽苟鍦≒ipIrrMwRtuApplication娉ㄨВ@EnableScheduling
-//@Component
+@Component
public class TestMsResource {
- // 璁剧疆瀹氭椂鍗佺涓�娆�
- @Scheduled(cron = "0/1 * * * * ?")
- public void WsHeartBeat() throws Exception {
- MsObj obj = new MsObj() ;
- obj.put("id", System.currentTimeMillis());
- obj.put("ms", "娑堟伅" + System.currentTimeMillis());
- MsCenterUnit.getInstance().pushMs(obj);
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/4 * * * * ?")
+ public void test1() throws Exception {
+ MsObj msObj = new MsObj() ;
+ setAttr4OpenCloseValve("寮�闃�", msObj) ;
+ MsCenterUnit.getInstance().pushMs(msObj);
}
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/6 * * * * ?")
+ public void test2() throws Exception {
+ MsObj msObj = new MsObj() ;
+ setAttr4OpenCloseValve("鍏抽榾", msObj) ;
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/10 * * * * ?")
+ public void test4() throws Exception {
+ MsObj msObj = new MsObj() ;
+ setAttr4StateAlarm("闃�鎬�", msObj) ;
+ msObj.put("state", 0);
+ msObj.put("stateName", "寮�");
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/15 * * * * ?")
+ public void test3() throws Exception {
+ MsObj msObj = new MsObj() ;
+ setAttr4StateAlarm("闃�鎬�", msObj) ;
+ msObj.put("alarm", "娴侀噺璁℃晠闅滄姤璀︺�佹紡鎹熸姤璀�");
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+
+ private void setAttr4OpenCloseValve(String name, MsObj msObj){
+ msObj.put("name", name);
+ msObj.put("clientId", clientId);
+ msObj.put("clientName", clientName);
+ msObj.put("clientAddress", clientAddress);
+ msObj.put("icCardNo", icCardNo);
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", intakeId);
+ msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
+ }
+
+ private void setAttr4StateAlarm(String name, MsObj msObj){
+ msObj.put("name", name);
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", intakeId);
+ msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
+ }
+
+ private static final String clientName = "鐢颁粊鏄�";
+ private static final String clientAddress = "鍏冭皨鍘垮厓椹晣娓呭拰鏉戝浼氭尐閭ｆ湜鏉�";
+ private static final Long clientId = 2024090517284400002L;
+ private static final Long intakeId = 2024090517395800007L;
+ private static final String rtuAddr = "123456789";
+ private static final String icCardNo = "123456789";
}
--
Gitblit v1.8.0