From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 21 四月 2025 10:45:16 +0800
Subject: [PATCH] 1、江海测试系统设备类型默认为阀； 2、完善通信中间件测试消息推送代码； 3、增加队列数据结构注释； 4、121服务器相关的初始化配置文件bug修改； 5、其他注释完善。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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 da5dd1f..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
@@ -17,30 +17,15 @@
@Scheduled(cron = "0/4 * * * * ?")
public void test1() throws Exception {
MsObj msObj = new MsObj() ;
- 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());
+ setAttr4OpenCloseValve("寮�闃�", msObj) ;
MsCenterUnit.getInstance().pushMs(msObj);
}
-
// 璁剧疆瀹氭椂N绉掍竴娆�
@Scheduled(cron = "0/6 * * * * ?")
public void test2() throws Exception {
MsObj msObj = new MsObj() ;
- 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());
+ setAttr4OpenCloseValve("鍏抽榾", msObj) ;
MsCenterUnit.getInstance().pushMs(msObj);
}
@@ -48,12 +33,9 @@
@Scheduled(cron = "0/10 * * * * ?")
public void test4() throws Exception {
MsObj msObj = new MsObj() ;
- msObj.put("name", "闃�鎬�");
- msObj.put("rtuAddr","123456789");
- msObj.put("intakeId", 2024090517395800007L);
+ setAttr4StateAlarm("闃�鎬�", msObj) ;
msObj.put("state", 0);
msObj.put("stateName", "寮�");
- msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
MsCenterUnit.getInstance().pushMs(msObj);
}
@@ -61,13 +43,33 @@
@Scheduled(cron = "0/15 * * * * ?")
public void test3() throws Exception {
MsObj msObj = new MsObj() ;
- msObj.put("name", "鎶ヨ");
- msObj.put("rtuAddr","123456789");
- msObj.put("intakeId", 2024090517395800007L);
+ setAttr4StateAlarm("闃�鎬�", msObj) ;
msObj.put("alarm", "娴侀噺璁℃晠闅滄姤璀︺�佹紡鎹熸姤璀�");
- msObj.put("dt", DateTime.yyyy_MM_dd_HH_mm_ss());
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