From 00d54db361d697cf8fdf2f15940f4650b21b3185 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 21 四月 2025 15:05:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config(121服务器).xml | 8 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/queue/Node.java | 7 ++-
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/msCenter/TestMsResource.java | 52 +++++++++++++------------
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 11 ++++-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java | 2
8 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/queue/Node.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/queue/Node.java
index f6b36b4..115eecd 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/queue/Node.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/queue/Node.java
@@ -2,7 +2,8 @@
public class Node {
- public Node pre ;
- public Node next ;
- public NodeObj obj ;
+ public Node pre ;//鍓嶇疆缁撶偣
+ public Node next ;//鍚庣疆缁撶偣
+ public NodeObj obj ;//鏈粨鐐规暟鎹璞�
}
+
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml" "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
index 3d1fb9a..9cca4e1 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
@@ -254,7 +254,7 @@
<item3 typeName="璁惧淇濆吇"/>
</taskType>
</org4>
- <org4 tag="lz" name="鍑夊窞" enable="true">
+ <org5 tag="lz" name="鍑夊窞" enable="true">
<districts>
<province name="鐢樿們鐪�" num="62" level="0">
<city name="姝﹀▉甯�" num="06" level="1">
@@ -316,8 +316,8 @@
<item2 typeName="璁惧缁翠慨"/>
<item3 typeName="璁惧淇濆吇"/>
</taskType>
- </org4>
- <org5 tag="jc" name="閲戝窛" enable="true">
+ </org5>
+ <org6 tag="jc" name="閲戝窛" enable="true">
<districts>
<province name="鐢樿們鐪�" num="62" level="0">
<city name="閲戞槍甯�" num="03" level="1">
@@ -379,6 +379,6 @@
<item2 typeName="璁惧缁翠慨"/>
<item3 typeName="璁惧淇濆吇"/>
</taskType>
- </org5>
+ </org6>
</orgs>
</config>
\ No newline at end of file
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";
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
index 8b9334d..a4321b4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -31,7 +31,7 @@
protected static String rtuAddr = "37142501020100229" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
- protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
+ protected static String controllerType = "02" ;//鎺у埗鍣ㄧ被鍨� 57姘存车锛�02闃�闂�
protected static Integer projectNo = 10 ;//椤圭洰缂栫爜
protected static String icCardAddr = "04BEA5BB" ;//IC鍗″湴鍧�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 34149e8..6a76675 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -508,7 +508,7 @@
if(res == null) {
return BaseResponseUtils.buildException(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
}
- System.out.println(" :" + res);
+ //System.out.println(" :" + res);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鐢ㄦ埛淇℃伅寮傚父", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index c535adf..6a4d699 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -20,6 +20,7 @@
import com.dy.pipIrrGlobal.pojoSe.SeRechargeProfile;
import com.dy.pipIrrGlobal.pojoSe.SeWaterType;
import com.dy.pipIrrGlobal.util.DistrictLevel;
+import lombok.extern.slf4j.Slf4j;
import org.jdom2.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -34,6 +35,7 @@
* Spring瀹瑰櫒骞舵病鏈夊垱寤哄畬锛岃�屾湰绫讳腑鐢ㄤ簡Spring瀹瑰櫒涓殑Bean锛屽嵆distriDao, userDao銆�
* 鎵�浠ラ噰鐢ㄤ簡Spring浜嬩欢鐩戝惉鍣ㄦ潵瀹炵幇
*/
+@Slf4j
@Component
public class InitListener implements ApplicationListener<ApplicationReadyEvent> {
@@ -137,17 +139,22 @@
Document doc = configXml.createDom(this.resourceLoader, "init-config.xml") ;
this.doInit(configXml, doc);
} catch (Exception e) {
- System.out.println("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
- System.out.println(e.getMessage());
+ log.error("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
+ log.error(e.getMessage());
e.printStackTrace();
}
}
private void doInit(ConfigXml4Springboot configXml, Document doc) throws Exception{
+ //Check if configXml and doc are not null
if(configXml != null && doc != null){
+ //Loop through 10000 orgs
for(int num = 1; num <= 10000; num++){
+ //Check if the org exists
if(configXml.existElement(doc, "config.orgs.org" + num)){
+ //Get the tag and enable value of the org
String orgTag = configXml.getSetAttrTxt(doc, "config.orgs.org" + num,"tag", null, false, null) ;
Boolean enable = configXml.getSetAttrBoolean(doc, "config.orgs.org" + num, "enable", null, null);
+ //If the org is enabled
if(enable != null && enable.booleanValue()){
//璁剧疆鏁版嵁婧�
DataSourceContext.set(orgTag);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index be352d7..60e5c20 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -213,7 +213,7 @@
jsonArray.add(jsonObject);
});
}
- System.out.println(jsonArray);
+ // System.out.println(jsonArray);
//} else {
// VoUnclosedParam voUnclosedParam = new VoUnclosedParam();
// return voUnclosedParam;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
index ae9cb03..fc76796 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
@@ -61,7 +61,7 @@
}
/**
- * 鏌ヨRTU鍦ㄩ�氫俊涓棿浠朵腑鐨勫湪绾跨姸鎬�
+ * 鏌ヨRTU鍦ㄩ�氫俊涓棿浠朵腑鐨勭姸鎬�
* @param rtuAddr
* @return
*/
--
Gitblit v1.8.0