From ae844683ede273edad59085227e36ae3ce02de06 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 22 十月 2024 09:25:30 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java | 7
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 55 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java | 7
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 98 +------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java | 7
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 54 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/ComResVo.java | 11
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA1Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA2Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java | 7
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(test测试).xml | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java | 7
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(ym元谋).xml | 284 ++++++++++----------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java | 8
pipIrr-platform/pipIrr-global/src/main/resources/application-global(开发测试---166PC机).yml | 50 ++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java | 7
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java | 7
31 files changed, 405 insertions(+), 328 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/ComResVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/ComResVo.java
new file mode 100644
index 0000000..b640822
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/ComResVo.java
@@ -0,0 +1,11 @@
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/10/21 16:29
+ * @Description
+ */
+public interface ComResVo {
+ public String comLog() ;
+ public String comLog(String code) ;
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
index 0750acd..1bdef54 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd10Vo {
+public class DataCd10Vo implements ComResVo {
public String newRtuAddr ;
public String toString(){
@@ -30,4 +30,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
index df6c205..6919f28 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd21Vo {
+public class DataCd21Vo implements ComResVo {
public String ip ;
public Integer port ;
@@ -35,4 +35,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
index b07a362..c4a6056 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java
@@ -3,7 +3,7 @@
import lombok.Data;
@Data
-public class DataCd36Vo {
+public class DataCd36Vo implements ComResVo {
public String ip ;//IP鍦板潃
public Integer port ;//绔彛鍙�
@@ -29,4 +29,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
index 1f99f4b..d84df37 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd37And67Vo {
+public class DataCd37And67Vo implements ComResVo {
public Integer second ;
public String toString(){
@@ -22,6 +22,12 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog() {
+ return null;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_37)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
index d024748..5086eef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd38And68Vo {
+public class DataCd38And68Vo implements ComResVo {
public Double remainMoneyAlarm ;
public String toString(){
@@ -23,6 +23,11 @@
return sb.toString() ;
}
+ @Override
+ public String comLog() {
+ return null;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_38)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
index e49012c..66bafe5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd39And69Vo {
+public class DataCd39And69Vo implements ComResVo {
public Double batteryVoltAlarm ;
public String toString(){
@@ -24,6 +24,11 @@
}
+ @Override
+ public String comLog() {
+ return null;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_39)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
index 5e0fe65..f26ecda 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd3AAnd6AVo {
+public class DataCd3AAnd6AVo implements ComResVo {
public Double current ;
public String toString(){
@@ -24,6 +24,11 @@
}
+ @Override
+ public String comLog() {
+ return null ;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_3A)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
index bd11554..20fe44f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd3BAnd6BVo {
+public class DataCd3BAnd6BVo implements ComResVo {
public Integer second ;
public String toString(){
@@ -24,6 +24,11 @@
}
+ @Override
+ public String comLog() {
+ return null;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_3B)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java
index 774b616..a7f572f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java
@@ -10,7 +10,7 @@
* @Description
*/
@Data
-public class DataCd3CAnd65Vo {
+public class DataCd3CAnd65Vo implements ComResVo {
public Integer minute ;
public String toString(){
@@ -22,6 +22,12 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog() {
+ return null;
+ }
+
public String comLog(String code){
StringBuilder sb = new StringBuilder() ;
if(code.equals(CodeV1_0_1.cd_3C)){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
index 9412efa..ce0935a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd3DVo {
+public class DataCd3DVo implements ComResVo {
public Double price ;
public String toString(){
@@ -32,4 +32,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java
index ed2c077..95e6dcc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd3EVo {
+public class DataCd3EVo implements ComResVo {
public String icCardNo ;
public String toString(){
@@ -31,4 +31,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java
index b255ce4..253fbed 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd51Vo {
+public class DataCd51Vo implements ComResVo {
public String rtuDt ;
public String toString(){
@@ -32,4 +32,9 @@
return sb.toString() ;
}
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
index 6a20d79..a271fe9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java
@@ -1,6 +1,5 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import lombok.Data;
/**
@@ -10,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd5EVo {
+public class DataCd5EVo implements ComResVo {
public DataAlarmVo alarmVo ;
public DataStateVo stateVo ;
@@ -41,4 +40,9 @@
}
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
index 5de4b9e..4d0294e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java
@@ -3,7 +3,7 @@
import lombok.Data;
@Data
-public class DataCd66Vo {
+public class DataCd66Vo implements ComResVo {
public String ip ;//IP鍦板潃
public Integer port ;//绔彛鍙�
@@ -30,4 +30,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
index e8866ad..4a86d3d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd6CVo {
+public class DataCd6CVo implements ComResVo {
public Double price ;
public String toString(){
@@ -30,4 +30,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
index ec3bf56..5d648f7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java
@@ -3,7 +3,7 @@
import lombok.Data;
@Data
-public class DataCd71Vo {
+public class DataCd71Vo implements ComResVo {
public Byte state ;//闃�闂ㄧ姸鎬佺爜锛�0锛氶榾闂ㄥ叧闂姸鎬侊紱1锛氶榾闂ㄦ墦寮�鐘舵�侊級
public String stateName ;
@@ -28,4 +28,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
index a12724c..e64ce2d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd92Vo {
+public class DataCd92Vo implements ComResVo {
public boolean success;
public String toString(){
@@ -31,4 +31,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
index d37d40f..d8f6597 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd93Vo {
+public class DataCd93Vo implements ComResVo {
public boolean success;
public String toString(){
@@ -29,4 +29,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
index f311fbd..93f03f1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd97Vo {
+public class DataCd97Vo implements ComResVo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -37,4 +37,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
index bc4b72f..ab03553 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd98Vo {
+public class DataCd98Vo implements ComResVo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -39,4 +39,9 @@
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
index 34a546c..6776a37 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCd99Vo {
+public class DataCd99Vo implements ComResVo{
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -38,4 +38,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
index 519fe64..923bf4c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCdA0Vo {
+public class DataCdA0Vo implements ComResVo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -38,4 +38,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA1Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA1Vo.java
index 0d7f5e8..2891232 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA1Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA1Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCdA1Vo {
+public class DataCdA1Vo implements ComResVo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -38,4 +38,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA2Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA2Vo.java
index 2134a16..be0e67a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA2Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA2Vo.java
@@ -9,7 +9,7 @@
* @Description
*/
@Data
-public class DataCdA2Vo {
+public class DataCdA2Vo implements ComResVo {
public String cardNo ;//铏氭嫙鍗″彿
public boolean success;
@@ -38,4 +38,9 @@
sb.append("\n");
return sb.toString() ;
}
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 4fac75c..bb275f8 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -73,6 +73,8 @@
global:
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
mw:
webPort: 8072
actutorPort: 9072
@@ -129,45 +131,44 @@
actutorPort: 9089
idSuffix: 11
-
file:
idSuffix: 99
file1:
webPort: 8180
actutorPort: 9180
file2:
- webPort: 8181
- actutorPort: 9181
+ webPort: 8180
+ actutorPort: 9180
file3:
- webPort: 8182
- actutorPort: 9182
+ webPort: 8180
+ actutorPort: 9180
file4:
- webPort: 8183
- actutorPort: 9183
+ webPort: 8180
+ actutorPort: 9180
file5:
- webPort: 8184
- actutorPort: 9184
+ webPort: 8180
+ actutorPort: 9180
file6:
- webPort: 8185
- actutorPort: 9185
+ webPort: 8180
+ actutorPort: 9180
file7:
- webPort: 8186
- actutorPort: 9186
+ webPort: 8180
+ actutorPort: 9180
file8:
- webPort: 8187
- actutorPort: 9187
+ webPort: 8180
+ actutorPort: 9180
file9:
- webPort: 8188
- actutorPort: 9188
+ webPort: 8180
+ actutorPort: 9180
file10:
- webPort: 8189
- actutorPort: 9189
+ webPort: 8180
+ actutorPort: 9180
file11:
- webPort: 8190
- actutorPort: 9190
+ webPort: 8180
+ actutorPort: 9180
file12:
- webPort: 8191
- actutorPort: 9191
+ webPort: 8180
+ actutorPort: 9180
#web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +176,7 @@
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
- supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -285,7 +286,6 @@
webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
-
#椤圭洰缂栧彿
#projectCode:
# ym: 100
@@ -301,7 +301,7 @@
divisionCode: 120114403100
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
@@ -329,6 +329,8 @@
- /remote/comRes/receive
- /wx/comRes/receive
- /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
startHour: 0 #寮�濮嬪皬鏃� 0
@@ -360,6 +362,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+
#闃�鎺у櫒鍙傛暟
rtu:
batteryVolt: 17
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index e925bd5..46e2aab 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -73,6 +73,8 @@
global:
dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
mw:
webPort: 8070
actutorPort: 9070
@@ -129,45 +131,44 @@
actutorPort: 9089
idSuffix: 11
-
file:
idSuffix: 99
file1:
webPort: 8180
actutorPort: 9180
file2:
- webPort: 8181
- actutorPort: 9181
+ webPort: 8180
+ actutorPort: 9180
file3:
- webPort: 8182
- actutorPort: 9182
+ webPort: 8180
+ actutorPort: 9180
file4:
- webPort: 8183
- actutorPort: 9183
+ webPort: 8180
+ actutorPort: 9180
file5:
- webPort: 8184
- actutorPort: 9184
+ webPort: 8180
+ actutorPort: 9180
file6:
- webPort: 8185
- actutorPort: 9185
+ webPort: 8180
+ actutorPort: 9180
file7:
- webPort: 8186
- actutorPort: 9186
+ webPort: 8180
+ actutorPort: 9180
file8:
- webPort: 8187
- actutorPort: 9187
+ webPort: 8180
+ actutorPort: 9180
file9:
- webPort: 8188
- actutorPort: 9188
+ webPort: 8180
+ actutorPort: 9180
file10:
- webPort: 8189
- actutorPort: 9189
+ webPort: 8180
+ actutorPort: 9180
file11:
- webPort: 8190
- actutorPort: 9190
+ webPort: 8180
+ actutorPort: 9180
file12:
- webPort: 8191
- actutorPort: 9191
+ webPort: 8180
+ actutorPort: 9180
#web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +176,7 @@
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
- supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -285,7 +286,6 @@
webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
-
#椤圭洰缂栧彿
#projectCode:
# ym: 100
@@ -301,7 +301,7 @@
divisionCode: 120114403100
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
#protocol: DYJS_2023,DYJS_2024
mw:
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
@@ -329,6 +329,8 @@
- /remote/comRes/receive
- /wx/comRes/receive
- /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
startHour: 0 #寮�濮嬪皬鏃� 0
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
index aa0e4cb..399f1c8 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
@@ -73,6 +73,8 @@
global:
dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
mw:
webPort: 8070
actutorPort: 9070
@@ -136,38 +138,38 @@
webPort: 8180
actutorPort: 9180
file2:
- webPort: 8181
- actutorPort: 9181
+ webPort: 8180
+ actutorPort: 9180
file3:
- webPort: 8182
- actutorPort: 9182
+ webPort: 8180
+ actutorPort: 9180
file4:
- webPort: 8183
- actutorPort: 9183
+ webPort: 8180
+ actutorPort: 9180
file5:
- webPort: 8184
- actutorPort: 9184
+ webPort: 8180
+ actutorPort: 9180
file6:
- webPort: 8185
- actutorPort: 9185
+ webPort: 8180
+ actutorPort: 9180
file7:
- webPort: 8186
- actutorPort: 9186
+ webPort: 8180
+ actutorPort: 9180
file8:
- webPort: 8187
- actutorPort: 9187
+ webPort: 8180
+ actutorPort: 9180
file9:
- webPort: 8188
- actutorPort: 9188
+ webPort: 8180
+ actutorPort: 9180
file10:
- webPort: 8189
- actutorPort: 9189
+ webPort: 8180
+ actutorPort: 9180
file11:
- webPort: 8190
- actutorPort: 9190
+ webPort: 8180
+ actutorPort: 9180
file12:
- webPort: 8191
- actutorPort: 9191
+ webPort: 8180
+ actutorPort: 9180
#web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +177,7 @@
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
- supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
sv1:
id: dyFile1
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -329,6 +331,8 @@
- /remote/comRes/receive
- /wx/comRes/receive
- /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
auto-statistics:
startHour: 0 #寮�濮嬪皬鏃� 0
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
index 1c5f8aa..0cc4cc6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
@@ -53,96 +53,32 @@
}
public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
- po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
if(obj instanceof DataCd97Vo){
DataCd97Vo vo = (DataCd97Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd98Vo){
DataCd98Vo vo = (DataCd98Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd92Vo){
DataCd92Vo vo = (DataCd92Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd93Vo){
DataCd93Vo vo = (DataCd93Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd3AAnd6AVo){
- DataCd3AAnd6AVo vo = (DataCd3AAnd6AVo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd3BAnd6BVo){
- DataCd3BAnd6BVo vo = (DataCd3BAnd6BVo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd3BAnd6BVo){
- DataCd3CAnd65Vo vo = (DataCd3CAnd65Vo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd3DVo){
- DataCd3DVo vo = (DataCd3DVo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd3EVo){
- DataCd3EVo vo = (DataCd3EVo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd5EVo){
- DataCd5EVo vo = (DataCd5EVo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd6CVo){
- DataCd6CVo vo = (DataCd6CVo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd10Vo){
- DataCd10Vo vo = (DataCd10Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd21Vo){
- DataCd21Vo vo = (DataCd21Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd36Vo){
- DataCd36Vo vo = (DataCd36Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd37And67Vo){
- DataCd37And67Vo vo = (DataCd37And67Vo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd38And68Vo){
- DataCd38And68Vo vo = (DataCd38And68Vo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd39And69Vo){
- DataCd39And69Vo vo = (DataCd39And69Vo)obj ;
- po.setResultText(vo.comLog(code));
- log.info("----------------------------------\n" + vo.comLog(code));
- }else if(obj instanceof DataCd51Vo){
- DataCd51Vo vo = (DataCd51Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd66Vo){
- DataCd66Vo vo = (DataCd66Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd71Vo){
- DataCd71Vo vo = (DataCd71Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCd99Vo){
- DataCd99Vo vo = (DataCd99Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
- }else if(obj instanceof DataCdA0Vo){
- DataCdA0Vo vo = (DataCdA0Vo)obj ;
- po.setResultText(vo.comLog());
- log.info("----------------------------------\n" + vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
+ }else if(obj instanceof ComResVo){
+ ComResVo vo = (ComResVo)obj ;
+ po.setResult((byte)1);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}
return po ;
}
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
index 957c7ba..32a3a8f 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
@@ -20,7 +20,7 @@
cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
- intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭锛�
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
-->
<base
@@ -38,7 +38,7 @@
cacheUpDownDataMaxCount="110000"
disconnectedByNoUpDataMinutes="3"
workReportDealOneByTimes="5"
- intakeAlarmLossMinValue="1"
+ intakeAlarmLossMinValue="1.0"
sendDingDingAlarmMsInterval="60"
/>
@@ -56,7 +56,7 @@
<!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
- 杞欢鍗囩骇 -->
+ 杞欢鍗囩骇 -->
<updateRtuSoft enable="true">
<soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
<newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
@@ -97,14 +97,14 @@
<!--
璧勬簮妯″潡
rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
- rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(KB)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
-->
<resource
rtuLogDir="rtuLogs/"
- rtuLogFileMaxSize="1000"
+ rtuLogFileMaxSize="100000"
rtuLogFileMaxCount="2"
monitorInterval="2"
saveDbInterval="10"
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
index bfb298d..6181178 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
@@ -1,148 +1,148 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
- <!--
- 鍩烘湰閰嶇疆
- orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
- isLowPower: 鏄惁涓轰綆鍔熻��
- onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
- onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
- 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
- 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
- onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
- downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
- commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
- cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
- offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
- lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
- dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
- cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
- cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
- disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
- workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
- intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭锛�
- sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
- -->
- <base
- orgTag="ym"
- isLowPower="false"
- onlyDealRtus=""
- onlyOneProtocol="false"
- downComandMaxResendTimes="1"
- commandSendInterval="2"
- cachWaitResultTimeout="120"
- offLineCachTimeout="86400"
- lastUpDataTimeLive="500"
- dbDataIdSuffix="0"
- cacheUpDownDataWarnCount="100000"
- cacheUpDownDataMaxCount="110000"
- disconnectedByNoUpDataMinutes="3"
- workReportDealOneByTimes="5"
- intakeAlarmLossMinValue="1"
- sendDingDingAlarmMsInterval="60"
- />
-
- <!--
- 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
- centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
- synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
- synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
- -->
- <protocol
- centerAddr="1"
- synchroRtuClock="true"
- synchroRtuClockTimepieces="300000"
- />
-
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="ym"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="2"
+ cachWaitResultTimeout="120"
+ offLineCachTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="5"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
- <!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
- 杞欢鍗囩骇 -->
- <updateRtuSoft enable="true">
- <soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
- <newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
- </soft1>
- <!--
- <soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" >
- <newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion>
- </soft2>
- -->
- </updateRtuSoft>
-
- <!--
- 鏀寔妯″潡
- 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
- short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
- short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
- short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
- short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
- 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
- long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
- long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
- long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
- long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
- enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
- -->
- <support
- short_maxThread="6"
- short_minThread="6"
- short_freeTimeout="60"
- short_busyTimeout="5"
- long_maxThread="6"
- long_minThread="6"
- long_freeTimeout="60"
- long_busyTimeout="-1"
- enableThreadPool="true"
- />
-
- <!--
- 璧勬簮妯″潡
- rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
- rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
- rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
- monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
- saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
- -->
- <resource
- rtuLogDir="rtuLogs/"
- rtuLogFileMaxSize="100000"
- rtuLogFileMaxCount="2"
- monitorInterval="2"
- saveDbInterval="10"
- />
-
-
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+
+ <!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
+ 杞欢鍗囩骇 -->
+ <updateRtuSoft enable="true">
+ <soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
+ <newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
+ </soft1>
<!--
- 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
- port锛歳mi鏈嶅姟绔彛鍙�
- context锛歳mi鏈嶅姟涓婁笅鏂�
- -->
- <rmi enable="true"
- port="65400"
- context="rtuMw"
- />
-
- <!--
- sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
- sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
- queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
- queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
- -->
- <core
- sleepBigBusy="100"
- sleepSmallBusy="500"
- queueWarnSize="100000"
- queueMaxSize="300000"
- />
-
- <!--
- port锛氱鍙�
- processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
- idle: 鍙戝憜鏃堕暱锛堢锛�
- -->
- <tcp enable="true"
- port="60000"
- processors="3"
- idle="10"
- />
+ <soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" >
+ <newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion>
+ </soft2>
+ -->
+ </updateRtuSoft>
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="100000"
+ rtuLogFileMaxCount="2"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+ sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ sleepBigBusy="100"
+ sleepSmallBusy="500"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60000"
+ processors="3"
+ idle="10"
+ />
</config>
\ No newline at end of file
--
Gitblit v1.8.0