From 77d2e1f1456d51ab8d1201102a724b1a7ecb8ae7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 七月 2024 10:44:40 +0800
Subject: [PATCH] 1、完善quarz的任务工厂类； 2、完善DateTime类； 3、application-global.yml中增加统计任务启动时刻； 4、通信中间件加入对阀开工作报处理间隔控制； 5、统计子模块中自动统计逻辑继续实现。
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
index 27fcf68..e77a63c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
@@ -40,7 +40,7 @@
long start = System.currentTimeMillis() ;
try {
sv.conf = new ConfigXml() ;
- sv.doc = sv.conf.createDom(sv.getClass(), "/config.xml") ;
+ sv.doc = sv.conf.createDom(sv.getClass(), "config.xml") ;
////////////////
//鏈嶅姟 閰嶇疆
sv.showStartInfo = sv.conf.getSetAttrBoolean(sv.doc, "config.server", "showStartInfo", null, null) ;
@@ -105,8 +105,8 @@
if(txt.startsWith("0")){
throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊间笉鑳戒互0寮�澶�!");
}
- if(txt.length() != 10){
- throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ if(!(txt.length() == 10 || txt.length() == 12)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
}
ServerProperties.rtuAddrStart = Long.valueOf(txt) ;
@@ -121,8 +121,8 @@
if(txt.startsWith("0")){
throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊间笉鑳戒互0寮�澶�!");
}
- if(txt.length() != 10){
- throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+ if(!(txt.length() == 10 || txt.length() == 12)){
+ throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
}
ServerProperties.rtuAddrEnd = Long.valueOf(txt) ;
if(ServerProperties.rtuAddrEnd <= ServerProperties.rtuAddrStart){
@@ -135,8 +135,11 @@
}
ServerProperties.tcpServerIp = conf.getSetAttrTxt(doc, "config.base", "tcpServerIp", null, false, null) ;
ServerProperties.tcpServerPort = conf.getSetAttrPlusInt(doc, "config.base", "tcpServerPort", null, 1, 65535, null) ;
+ ServerProperties.sendInterval = conf.getSetAttrPlusInt(doc, "config.base", "sendInterval", null, 1, null, null) ;
+ ServerProperties.heartbeatTimes = conf.getSetAttrPlusInt(doc, "config.base", "heartbeatTimes", null, 1, null, null) ;
ServerProperties.sendTimes = conf.getSetAttrPlusInt(doc, "config.base", "sendTimes", null, 1, null, null) ;
-
+ ServerProperties.sendOverThenCloseConnect = conf.getSetAttrPlusInt(doc, "config.base", "sendOverThenCloseConnect", null, 0, 1, null) ;
+
/////////////////
//RMI妯″潡
--
Gitblit v1.8.0