From eb2d3ef0e4fa144d5a76823709a1ab2bc27a2ae9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 七月 2025 17:42:34 +0800
Subject: [PATCH] 1、通信中间件去除上报消息测试类（去除注解） ; 2、remote模块，webSocket模块修改完善，增加机构orgTag控制； 3、从SSO模块获取当前用户信息部分进行集成完善，以供其他部分共享应用。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 62 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 30 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..452eeff 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,64 +10,66 @@
* @Description
*/
//浣胯捣浣滅敤锛屾湰绫绘敞瑙Component锛屽苟鍦≒ipIrrMwRtuApplication娉ㄨВ@EnableScheduling
-@Component
+//@Component
public class TestMsResource {
// 璁剧疆瀹氭椂N绉掍竴娆�
- @Scheduled(cron = "0/4 * * * * ?")
+ //@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 * * * * ?")
+ //@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);
}
// 璁剧疆瀹氭椂N绉掍竴娆�
- @Scheduled(cron = "0/10 * * * * ?")
+ //@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);
}
// 璁剧疆瀹氭椂N绉掍竴娆�
- @Scheduled(cron = "0/15 * * * * ?")
+ //@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