From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 7480f18..da5dd1f 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
@@ -10,34 +10,64 @@
* @Description
*/
//浣胯捣浣滅敤锛屾湰绫绘敞瑙Component锛屽苟鍦≒ipIrrMwRtuApplication娉ㄨВ@EnableScheduling
-//@Component
+@Component
public class TestMsResource {
- // 璁剧疆瀹氭椂鍗佺涓�娆�
- @Scheduled(cron = "0/5 * * * * ?")
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/4 * * * * ?")
public void test1() throws Exception {
MsObj msObj = new MsObj() ;
msObj.put("name", "寮�闃�");
- msObj.put("clientId", 1233445345);
- msObj.put("clientName", "寮犱笁");
- msObj.put("clientAddress", "鍖椾含甯�");
+ msObj.put("clientId", 2024090517284400002L);
+ msObj.put("clientName", "鐢颁粊鏄�");
+ msObj.put("clientAddress", "鍏冭皨鍘垮厓椹晣娓呭拰鏉戝浼氭尐閭ｆ湜鏉�");
msObj.put("icCardNo", "123456789");
msObj.put("rtuAddr", "123456789");
- msObj.put("intakeId", 987654321);
+ msObj.put("intakeId", 2024090517395800007L);
msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
MsCenterUnit.getInstance().pushMs(msObj);
}
- // 璁剧疆瀹氭椂鍗佺涓�娆�
+
+ // 璁剧疆瀹氭椂N绉掍竴娆�
@Scheduled(cron = "0/6 * * * * ?")
public void test2() throws Exception {
MsObj msObj = new MsObj() ;
- msObj.put("name", "鎶ヨ");
- msObj.put("rtuAddr","123456789");
- msObj.put("intakeId", 1233445345);
- msObj.put("alarm", "姘磋〃瓒呴噺绋�");
+ msObj.put("name", "鍏抽榾");
+ msObj.put("clientId", 2024090517284400002L);
+ msObj.put("clientName", "鐢颁粊鏄�");
+ msObj.put("clientAddress", "鍏冭皨鍘垮厓椹晣娓呭拰鏉戝浼氭尐閭ｆ湜鏉�");
+ msObj.put("icCardNo", "123456789");
+ msObj.put("rtuAddr", "123456789");
+ msObj.put("intakeId", 2024090517395800007L);
msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
MsCenterUnit.getInstance().pushMs(msObj);
}
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/10 * * * * ?")
+ public void test4() throws Exception {
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "闃�鎬�");
+ msObj.put("rtuAddr","123456789");
+ msObj.put("intakeId", 2024090517395800007L);
+ msObj.put("state", 0);
+ msObj.put("stateName", "寮�");
+ msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+
+ // 璁剧疆瀹氭椂N绉掍竴娆�
+ @Scheduled(cron = "0/15 * * * * ?")
+ public void test3() throws Exception {
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "鎶ヨ");
+ msObj.put("rtuAddr","123456789");
+ msObj.put("intakeId", 2024090517395800007L);
+ msObj.put("alarm", "娴侀噺璁℃晠闅滄姤璀︺�佹紡鎹熸姤璀�");
+ msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+
+
}
--
Gitblit v1.8.0