From 66160634b3f6ee11af600cc17ef477aed657d28e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 18 七月 2024 16:47:44 +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 | 18 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java | 18 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java | 5
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Open.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java | 13 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java | 13 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Close.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpDownCommandCache.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 83 +++++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd6CVo.java | 9
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java | 17 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd5EVo.java | 14 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd66Vo.java | 12 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd71Vo.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java | 34 ++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionToRtu.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java | 35 ++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd84.java | 89 +++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd51Vo.java | 11
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdA0Vo.java | 13 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java | 12 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java | 15
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java | 18 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd98Vo.java | 14 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java | 13 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java | 19 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd93Vo.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java | 17 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java | 64 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml | 6
/dev/null | 24 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd10Vo.java | 9
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd37And67Vo.java | 16 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java | 19 -
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java | 17 +
42 files changed, 583 insertions(+), 125 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
index b8063d6..46abf65 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_3D_Up.java
@@ -2,7 +2,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3CVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd3DVo;
import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -58,7 +58,7 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
- DataCd3CVo cdData = new DataCd3CVo() ;
+ DataCd3DVo cdData = new DataCd3DVo() ;
dV1.subData = cdData ;
int priceInt = ByteUtilUnsigned.bytes2Short_LE(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
cdData.price = priceInt/100.0D;
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 7ec0cde..0750acd 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
@@ -21,4 +21,13 @@
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("璁剧疆RTU鍦板潃鍛戒护鍥炲:\n");
+ sb.append(" 鍦板潃锛�");
+ sb.append(newRtuAddr);
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 f622f71..df6c205 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
@@ -15,7 +15,7 @@
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 璁剧疆IP搴旂瓟:\n");
+ sb.append(" 璁剧疆鏈嶅姟绔疘P鍜岀鍙ｅ簲绛�:\n");
sb.append(" IP锛�");
sb.append(ip);
sb.append(" 绔彛锛�");
@@ -24,4 +24,15 @@
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("璁剧疆鏈嶅姟绔疘P鍜岀鍙ｅ懡浠ゅ洖澶�:\n");
+ sb.append(" IP锛�");
+ sb.append(ip);
+ sb.append(" 绔彛锛�");
+ sb.append(port);
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 7a557fc..b07a362 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
@@ -9,7 +9,7 @@
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 璁剧疆璇P鍦板潃鍜岀鍙�:\n");
+ sb.append(" 璁剧疆涓讳俊閬揑P鍜岀鍙�:\n");
sb.append(" IP鍦板潃锛�");
sb.append(ip);
sb.append("\n");
@@ -18,4 +18,15 @@
sb.append("\n");
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("璁剧疆涓讳俊閬揑P鍜岀鍙ｅ懡浠ゅ洖澶�:\n");
+ sb.append(" IP锛�");
+ sb.append(ip);
+ sb.append(" 绔彛锛�");
+ sb.append(port==null?"":port);
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 01501cc..1f99f4b 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,19 @@
return sb.toString() ;
}
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_37)){
+ sb.append("璁剧疆娴侀噺閲囬泦鍛ㄦ湡鍛戒护鍥炲:\n");
+ sb.append(" 绉掗挓锛�");
+ sb.append(second);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_67)){
+ sb.append("鏌ヨ娴侀噺閲囬泦鍛ㄦ湡鍛戒护鍥炲:\n");
+ sb.append(" 绉掗挓锛�");
+ sb.append(second);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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/DataCd38And68Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java
index 5a8a9a4..d024748 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,20 @@
return sb.toString() ;
}
+
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_38)){
+ sb.append("璁剧疆鐢ㄦ埛浣欓鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 浣欓锛�");
+ sb.append(remainMoneyAlarm);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_68)){
+ sb.append("鏌ヨ鐢ㄦ埛浣欓鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 浣欓锛�");
+ sb.append(remainMoneyAlarm);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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/DataCd39And69Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd39And69Vo.java
index 2122403..e49012c 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,21 @@
return sb.toString() ;
}
+
+
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_39)){
+ sb.append("璁剧疆鐢垫睜鐢靛帇鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 鐢靛帇鎶ヨ鍊硷細");
+ sb.append(batteryVoltAlarm);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_69)){
+ sb.append("鏌ヨ鐢垫睜鐢靛帇鎶ヨ鍊煎懡浠ゅ洖澶�:\n");
+ sb.append(" 鐢靛帇鎶ヨ鍊硷細");
+ sb.append(batteryVoltAlarm);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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/DataCd3AAnd6AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3AAnd6AVo.java
index 1dfe3ac..5e0fe65 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,21 @@
return sb.toString() ;
}
+
+
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_3A)){
+ sb.append("璁剧疆闃�闂ㄥ牭杞數娴佸懡浠ゅ洖澶�:\n");
+ sb.append(" 鐢垫祦锛�");
+ sb.append(current);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_6A)){
+ sb.append("鏌ヨ闃�闂ㄥ牭杞數娴佸懡浠ゅ洖澶�:\n");
+ sb.append(" 鐢垫祦锛�");
+ sb.append(current);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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/DataCd3BAnd6BVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3BAnd6BVo.java
index 4da25a5..bd11554 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,21 @@
return sb.toString() ;
}
+
+
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_3B)){
+ sb.append("璁剧疆闃�闂ㄨ秴鏃舵椂闂村懡浠ゅ洖澶�:\n");
+ sb.append(" 绉掗挓锛�");
+ sb.append(second);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_6B)){
+ sb.append("鏌ヨ闃�闂ㄨ秴鏃舵椂闂村懡浠ゅ洖澶�:\n");
+ sb.append(" 绉掗挓锛�");
+ sb.append(second);
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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/DataCd3CAnd65Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java
index 67da1f0..774b616 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import lombok.Data;
/**
@@ -21,4 +22,20 @@
return sb.toString() ;
}
+ public String comLog(String code){
+ StringBuilder sb = new StringBuilder() ;
+ if(code.equals(CodeV1_0_1.cd_3C)){
+ sb.append("璁剧疆鑷姤鍛ㄦ湡鍛戒护鍥炲:\n");
+ sb.append(" 鍒嗛挓锛�");
+ sb.append(minute);
+ sb.append("\n");
+ } else if(code.equals(CodeV1_0_1.cd_65)){
+ sb.append("鏌ヨ鑷姤鍛ㄦ湡鍛戒护鍥炲:\n");
+ sb.append(" 鍒嗛挓锛�");
+ sb.append(minute);
+ sb.append("\n");
+ }
+
+ return sb.toString() ;
+ }
}
\ 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/DataCd3CVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java
deleted file mode 100644
index e2da9a3..0000000
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CVo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dy.common.mw.protocol.p206V1_0_0.upVos;
-
-import lombok.Data;
-
-/**
- * @Author liurunyu
- * @Date 2024/4/10 18:44
- * @LastEditTime 2024/4/10 18:44
- * @Description
- */
-@Data
-public class DataCd3CVo {
- public Double price ;
-
- public String toString(){
- StringBuilder sb = new StringBuilder() ;
- sb.append(" 璁剧疆姘翠环搴旂瓟:\n");
- sb.append(" 姘翠环锛�");
- sb.append(price);
- sb.append("\n");
-
- return sb.toString() ;
- }
-}
\ 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/DataCd3DVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3DVo.java
index 2a10047..9412efa 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
@@ -10,13 +10,24 @@
*/
@Data
public class DataCd3DVo {
- public String icCardNo ;
+ public Double price ;
public String toString(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 璁剧疆榛戝悕鍗曞簲绛�:\n");
- sb.append(" 鍗″彿锛�");
- sb.append(icCardNo);
+ sb.append(" 璁剧疆姘翠环搴旂瓟:\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(price);
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("璁剧疆姘翠环鍛戒护鍥炲:\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(price);
sb.append("\n");
return sb.toString() ;
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
new file mode 100644
index 0000000..ed2c077
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3EVo.java
@@ -0,0 +1,34 @@
+package com.dy.common.mw.protocol.p206V1_0_0.upVos;
+
+import lombok.Data;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/4/10 18:44
+ * @LastEditTime 2024/4/10 18:44
+ * @Description
+ */
+@Data
+public class DataCd3EVo {
+ public String icCardNo ;
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append(" 璁剧疆榛戝悕鍗曞簲绛�:\n");
+ sb.append(" 鍗″彿锛�");
+ sb.append(icCardNo);
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("璁剧疆榛戝悕鍗曞懡浠ゅ洖澶�:\n");
+ sb.append(" 鍗″彿锛�");
+ sb.append(icCardNo);
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
+}
\ 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 6318537..b255ce4 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
@@ -21,4 +21,15 @@
return sb.toString() ;
}
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨ缁堢鏃堕挓鍛戒护鍥炲:\n");
+ sb.append(" 鏃堕挓锛�");
+ sb.append(rtuDt);
+ sb.append("\n");
+ return sb.toString() ;
+ }
+
}
\ 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 db92ff2..6a20d79 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
@@ -27,4 +27,18 @@
}
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append(" 鏌ヨ缁堢鐘舵�佸拰鎶ヨ鐘舵�佸懡浠ゅ洖澶�:\n");
+ if(alarmVo != null){
+ sb.append(alarmVo.toString());
+ sb.append("\n");
+ }
+ if(stateVo != null){
+ sb.append(stateVo.toString());
+ sb.append("\n");
+ }
+ return sb.toString() ;
+ }
}
\ 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 275f3ef..5de4b9e 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
@@ -18,4 +18,16 @@
sb.append("\n");
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨIP鍦板潃鍜岀鍙ｅ懡浠ゅ洖澶�:\n");
+ sb.append(" IP鍦板潃锛�");
+ sb.append(ip);
+ sb.append("\n");
+ sb.append(" 绔彛鍙凤細");
+ sb.append(port==null?"":port);
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 41cde9e..e8866ad 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
@@ -21,4 +21,13 @@
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨ姘翠环鍛戒护鍥炲:\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(price);
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
\ 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 742e112..ec3bf56 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
@@ -18,4 +18,14 @@
return sb.toString() ;
}
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨ闃�闂ㄧ姸鎬佸懡浠ゅ洖澶�:\n");
+ sb.append(" 闃�闂ㄧ姸鎬侊細");
+ sb.append(state==null?"":state);
+ sb.append(stateName==null?"":("(" + stateName + ")"));
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 f0e1755..a12724c 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
@@ -21,4 +21,14 @@
return sb.toString() ;
}
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("寮哄埗鏃犲崱寮�闃�鍛戒护鍥炲:\n");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
}
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 105b845..d37d40f 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
@@ -21,4 +21,12 @@
return sb.toString() ;
}
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("寮哄埗鏃犲崱鍏抽榾鍛戒护鍥炲:\n");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
}
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 fcc3ad6..f311fbd 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
@@ -25,4 +25,16 @@
return sb.toString() ;
}
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("APP杩滅▼寮�闃�鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append(cardNo);
+ sb.append("\n");
+ sb.append(" 缁撴灉锛�");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
}
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 78183eb..bc4b72f 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
@@ -25,4 +25,18 @@
return sb.toString() ;
}
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("APP杩滅▼鍏抽榾鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append(cardNo);
+ sb.append("\n");
+ sb.append(" 缁撴灉锛�");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
}
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 67ebed5..1360407 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
@@ -25,4 +25,17 @@
return sb.toString() ;
}
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("瀹氭椂鍏抽榾寮�闃�鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append(cardNo);
+ sb.append("\n");
+ sb.append(" 缁撴灉锛�");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
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 058b9f7..cca055f 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
@@ -25,4 +25,17 @@
return sb.toString() ;
}
+
+
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("瀹氶噺鍏抽榾寮�闃�鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append(cardNo);
+ sb.append("\n");
+ sb.append(" 缁撴灉锛�");
+ sb.append(success?"鎵ц":"澶辫触");
+ sb.append("\n");
+ return sb.toString() ;
+ }
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
index 01ef2c9..cedbfa8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
@@ -138,6 +138,21 @@
if(ServerProperties.isLowPower == null){
ServerProperties.isLowPower = false ;
}
+
+ String onlyDealRtus = conf.getSetAttrTxt(doc, "config.base", "onlyDealRtus", null, true, null) ;
+ if(onlyDealRtus == null || onlyDealRtus.trim().equals("")){
+ ServerProperties.onlyDealRtusTest = false ;
+ }else{
+ onlyDealRtus = onlyDealRtus.replaceAll("锛�", ",") ;
+ onlyDealRtus = onlyDealRtus.replaceAll(" ", "") ;
+ ServerProperties.onlyDealRtus = onlyDealRtus.split(",") ;
+ if(ServerProperties.onlyDealRtus != null && ServerProperties.onlyDealRtus.length > 0){
+ ServerProperties.onlyDealRtusTest = true ;
+ }else{
+ ServerProperties.onlyDealRtusTest = false ;
+ }
+ }
+
//鍦ㄦ敮鎸佸閫氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
//濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
// 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
@@ -151,7 +166,7 @@
//閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧
ServerProperties.commandSendInterval = conf.getSetAttrPlusInt(doc, "config.base", "commandSendInterval", null, 1, 40, null) * 1000L ;
//鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�
- ServerProperties.cachWaitResultTimeout = conf.getSetAttrPlusInt(doc, "config.base", "cachWaitResultTimeout", null, 10, 60, null) * 1000L ;
+ ServerProperties.cachWaitResultTimeout = conf.getSetAttrPlusInt(doc, "config.base", "cachWaitResultTimeout", null, 10, 360, null) * 1000L ;
//涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�
ServerProperties.offLineCachTimeout = conf.getSetAttrPlusInt(doc, "config.base", "offLineCachTimeout", null, 15, 172800, null) * 1000L ;
//TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婃暟鎹悓鏃朵笅鍙戞暟鎹紝鍥犱负RTU澶勭悊涓嶈繃鏉�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
index 19e02ec..e225ebd 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/ServerProperties.java
@@ -6,6 +6,11 @@
public static String orgTag = "ym" ;
//鏄惁涓轰綆鍔熻��
public static Boolean isLowPower = false ;
+ //鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛屽鏋滈厤缃┖涓诧紙鍗虫棤IMEI鍙凤級锛屽垯鎺ユ敹鍏ㄩ儴姘磋〃鏁版嵁锛岃缃鐩殑鏄拡瀵规煇涓按琛ㄨ繘琛岃皟璇�
+ public static Boolean onlyDealRtusTest = false ;
+ public static String[] onlyDealRtus ;
+
+
//鍦ㄦ敮鎸佸閫氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
//濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
// 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
index 95a86a8..7de3eba 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
@@ -34,6 +34,7 @@
this.nextDealRtuData(false, resFromRtu);
this.nextDealRtuComResult(resFromRtu);
}else{
+ log.error("鍖归厤鍛戒护澶辫触锛屽姛鑳界爜鏄細" + ((MidResultFromRtu) result).upCode );
this.nextDealRtuData(false, resFromRtu);
//鏈尮閰嶅埌涓嬪彂鐨勫懡浠わ紝鍛戒护鍦ㄧ紦瀛樺洜瓒呮椂琚竻闄や簡
RtuStatusDealer.commandFail2Success(resFromRtu.rtuAddr) ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionToRtu.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionToRtu.java
index 8d906fc..c112773 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionToRtu.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionToRtu.java
@@ -16,7 +16,7 @@
try {
MidResultToRtu resToRtu = (MidResultToRtu)result ;
TcpDownCommandCache.cacheCommand(resToRtu);
- log.info("涓嬭鍛戒护(toRtu)" + resToRtu.downCode + "涓棿缁撴灉宸茬粡鏀惧叆涓嬭鍛戒护缂撳瓨涓�");
+ log.info("涓嬭鍛戒护(toRtu锛宨d=" + resToRtu.commandId + ")" + resToRtu.downCode + "涓棿鏁版嵁(MidResult)宸茬粡鏀惧叆涓嬭鍛戒护缂撳瓨涓�");
} catch (Exception e) {
log.error(e);
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpDownCommandCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpDownCommandCache.java
index 54d5ecd..b4fc611 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpDownCommandCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/TcpDownCommandCache.java
@@ -62,7 +62,7 @@
obj.onceReceivedResult = true ;//鏍囪瘑宸茬粡鏀跺埌鍛戒护缁撴灉
return res ;
}else{
- node = node.pre ;
+ node = node.next ;
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java
index 840352d..71e7df0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java
@@ -25,7 +25,7 @@
@Override
public void execute(Object data) {
Data d = (Data)data ;
- if(d.getCommandId() != null && d.getCommandId().trim().equals("")){
+ if(d.getCommandId() != null && !d.getCommandId().trim().equals("")){
//鏃犲懡浠D
this.toNextTasks(data);
}
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 7db52e3..0c0db5f 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
@@ -2,10 +2,7 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
@@ -43,8 +40,10 @@
try{
RmCommandHistory po = sv.getCommandLog(d.commandId) ;
if(po != null){
- po = this.updateCommandLogPo(po, dV1_0_1, dV1_0_1.subData) ;
+ po = this.updateCommandLogPo(po, d.code, dV1_0_1, dV1_0_1.subData) ;
sv.updateCommandLog(po);
+ }else{
+ log.error("鏈緱鍒板懡浠ゆ棩蹇楋紙" + d.getCommandId() + ")");
}
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
@@ -53,27 +52,75 @@
}
}
- public RmCommandHistory updateCommandLogPo(RmCommandHistory po, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
+ 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.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- //po.setResultText((JSONObject) JSON.toJSON(vo));
- po.setResultText(vo.toString());
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd98Vo){
DataCd98Vo vo = (DataCd98Vo)obj ;
- po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt));
- //po.setResultText((JSONObject) JSON.toJSON(vo));
- po.setResultText(vo.toString());
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd92Vo){
DataCd92Vo vo = (DataCd92Vo)obj ;
- po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- //po.setResultText((JSONObject) JSON.toJSON(vo));
- po.setResultText(vo.toString());
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd93Vo){
DataCd93Vo vo = (DataCd93Vo)obj ;
- po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- //po.setResultText((JSONObject) JSON.toJSON(vo));
- po.setResultText(vo.toString());
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd3AAnd6AVo){
+ DataCd3AAnd6AVo vo = (DataCd3AAnd6AVo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd3BAnd6BVo){
+ DataCd3BAnd6BVo vo = (DataCd3BAnd6BVo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd3BAnd6BVo){
+ DataCd3CAnd65Vo vo = (DataCd3CAnd65Vo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd3DVo){
+ DataCd3DVo vo = (DataCd3DVo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd3EVo){
+ DataCd3EVo vo = (DataCd3EVo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd5EVo){
+ DataCd5EVo vo = (DataCd5EVo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd6CVo){
+ DataCd6CVo vo = (DataCd6CVo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd10Vo){
+ DataCd10Vo vo = (DataCd10Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd21Vo){
+ DataCd21Vo vo = (DataCd21Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd36Vo){
+ DataCd36Vo vo = (DataCd36Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd37And67Vo){
+ DataCd37And67Vo vo = (DataCd37And67Vo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd38And68Vo){
+ DataCd38And68Vo vo = (DataCd38And68Vo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd39And69Vo){
+ DataCd39And69Vo vo = (DataCd39And69Vo)obj ;
+ po.setResultText(vo.comLog(code));
+ }else if(obj instanceof DataCd51Vo){
+ DataCd51Vo vo = (DataCd51Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd66Vo){
+ DataCd66Vo vo = (DataCd66Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd71Vo){
+ DataCd71Vo vo = (DataCd71Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCd99Vo){
+ DataCd99Vo vo = (DataCd99Vo)obj ;
+ po.setResultText(vo.comLog());
+ }else if(obj instanceof DataCdA0Vo){
+ DataCdA0Vo vo = (DataCdA0Vo)obj ;
+ po.setResultText(vo.comLog());
}
return po ;
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java
index 2c050c2..722a930 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java
@@ -24,7 +24,7 @@
@Override
public void execute(Object data) {
Data d = (Data)data ;
- if(d.getCommandId() != null && d.getCommandId().trim().equals("")){
+ if(d.getCommandId() != null && !d.getCommandId().trim().equals("")){
//鏃犲懡浠D
this.toNextTasks(data);
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java
index bc1c97a..c88ca9e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java
@@ -65,38 +65,38 @@
//浠ヤ笅瀹炵幇锛岄噰鐢ㄤ簡閫掑綊璋冪敤锛屽綋闃熷垪缂撳瓨缁撶偣寰堝鏃讹紝浼氫骇鐢熸爤婧㈠嚭寮傚父
//
////////////////////////////////////////////////
- /**
- * 澶勭悊涓婅鏁版嵁
- */
- public Integer dealRtuComResult_() {
- Node first = RtuComResultCache.getFirstQueueNode() ;
- if(first != null){
- Integer count = RtuComResultCache.size() ;
- Node last = RtuComResultCache.getLastQueueNode() ;
- this.doDealRtuComResult_(first, last);
- return count ;
- }
- return null ;
- }
-
- /**
- * 澶勭悊缂撳瓨鐨勪笂琛屾暟鎹妭鐐�
- * @param first 绗竴涓妭鐐�
- * @param last 鏈�鍚庝竴涓妭鐐�
- */
- private void doDealRtuComResult_(Node first, Node last){
- if(last != null){
- //鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
- Node pre = last.pre ;
- dealNode(last) ;
- if(first != last){
- doDealRtuComResult_(first, pre) ;
- }else{
- //鍋滄
- }
- }
- }
-
+// /**
+// * 澶勭悊涓婅鏁版嵁
+// */
+// public Integer dealRtuComResult_() {
+// Node first = RtuComResultCache.getFirstQueueNode() ;
+// if(first != null){
+// Integer count = RtuComResultCache.size() ;
+// Node last = RtuComResultCache.getLastQueueNode() ;
+// this.doDealRtuComResult_(first, last);
+// return count ;
+// }
+// return null ;
+// }
+//
+// /**
+// * 澶勭悊缂撳瓨鐨勪笂琛屾暟鎹妭鐐�
+// * @param first 绗竴涓妭鐐�
+// * @param last 鏈�鍚庝竴涓妭鐐�
+// */
+// private void doDealRtuComResult_(Node first, Node last){
+// if(last != null){
+// //鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
+// Node pre = last.pre ;
+// dealNode(last) ;
+// if(first != last){
+// doDealRtuComResult_(first, pre) ;
+// }else{
+// //鍋滄
+// }
+// }
+// }
+//
/**
* 澶勭悊涓�涓妭鐐�
* @param node 鑺傜偣
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
index 167f7d7..bedf45e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
@@ -78,18 +78,33 @@
}
}
}
-
if(rtuAddr != null){
- if(protocolName == null){
- protocolName = TcpSessionCache.getTcpProtocolName(rtuAddr) ;
+ boolean toDeal = true ;
+ if(ServerProperties.onlyDealRtusTest){
+ boolean find = false ;
+ for(String testRtu : ServerProperties.onlyDealRtus){
+ if(testRtu.equals(rtuAddr)){
+ find = true ;
+ break ;
+ }
+ }
+ if(!find){
+ //涓嶅湪澶勭悊鑼冨洿鍐�
+ toDeal = false ;
+ }
}
-
- //璁剧疆鏀跺埌鏁版嵁鏃跺埢
- TcpSessionCache.cacheUpDataTime(rtuAddr);
-
- if(protocolName != null){
- //瀵逛笂琛屾暟鎹繘琛屽鐞�
- this.dealUpData(session, rtuAddr, protocolName, isOnLine, upBuf, upHex) ;
+ if(toDeal){
+ if(protocolName == null){
+ protocolName = TcpSessionCache.getTcpProtocolName(rtuAddr) ;
+ }
+
+ //璁剧疆鏀跺埌鏁版嵁鏃跺埢
+ TcpSessionCache.cacheUpDataTime(rtuAddr);
+
+ if(protocolName != null){
+ //瀵逛笂琛屾暟鎹繘琛屽鐞�
+ this.dealUpData(session, rtuAddr, protocolName, isOnLine, upBuf, upHex) ;
+ }
}
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
index 10534e5..58b046e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/web/comResult/CommandResultDeal.java
@@ -2,7 +2,8 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.Data;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.converter.StringHttpMessageConverter;
@@ -18,10 +19,11 @@
* @LastEditTime 2023/12/21 20:28
* @Description
*/
-@Slf4j
@Component()
public class CommandResultDeal {
+ private static final Logger log = LogManager.getLogger(CommandResultDeal.class.getName());
+
private RestTemplate restTemplate;
@Autowired
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index 87ad035..bddaf88 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -5,6 +5,7 @@
鍩烘湰閰嶇疆
orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
@@ -22,10 +23,11 @@
<base
orgTag="ym"
isLowPower="false"
- onlyOneProtocol="true"
+ onlyDealRtus="532328059995"
+ onlyOneProtocol="false"
downComandMaxResendTimes="1"
commandSendInterval="2"
- cachWaitResultTimeout="60"
+ cachWaitResultTimeout="120"
offLineCachTimeout="86400"
lastUpDataTimeLive="500"
dbDataIdSuffix="0"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
index 4550f5a..6c9ad33 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
@@ -3,6 +3,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd83Close;
import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd83Open;
+import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd84;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,9 +23,11 @@
@GetMapping(path = "test")
public BaseResponse<String> test(String com) {
if(com.equals("83Open")){
- this.cd83Open() ;
+ UpCd83Open.upCd83Data();
}else if(com.equals("83Close")){
- this.cd83Close() ;
+ UpCd83Close.upCd83Data();
+ }else if(com.equals("84")){
+ UpCd84.upCd84Data();
}
BaseResponse<String> rt = new BaseResponse<String>() ;
rt.setCode("001") ;
@@ -32,18 +35,6 @@
rt.setSuccess(true) ;
return rt ;
}
-
-
- private void cd83Open(){
- UpCd83Open.upCd83Data();
- }
-
-
- private void cd83Close(){
- UpCd83Close.upCd83Data();
- }
-
-
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Close.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Close.java
index 9a82f4c..05a43a0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Close.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Close.java
@@ -2,7 +2,6 @@
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
import com.dy.pipIrrMwTestRtu.ServerProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -31,13 +30,14 @@
/**
- * 鏋勯�犲績璺虫暟鎹�
+ * 鏋勯�犱笂琛屾暟鎹�
*
* @return 瀛楄妭鏁扮粍
* @throws Exception 寮傚父
*/
private static byte[] createData(String rtuAddr) throws Exception {
- UpConstant.closeValve();
+ UpConstant.addValve();//璋冩暣娴侀噺
+
byte[] bytes = creatHead(rtuAddr, "83", (byte)0xB0);
byte[] bs = new byte[1] ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Open.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Open.java
index 9273b94..d2dad7c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Open.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd83Open.java
@@ -31,7 +31,7 @@
/**
- * 鏋勯�犲績璺虫暟鎹�
+ * 鏋勯�犱笂琛屾暟鎹�
*
* @return 瀛楄妭鏁扮粍
* @throws Exception 寮傚父
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd84.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd84.java
new file mode 100644
index 0000000..c015151
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpCd84.java
@@ -0,0 +1,89 @@
+package com.dy.pipIrrMwTestRtu.tcpClient.upData;
+
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.util.ByteUtil;
+import com.dy.pipIrrMwTestRtu.ServerProperties;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/7/16 19:32
+ * @Description
+ */
+public class UpCd84 extends UpData {
+
+ private static final Logger log = LogManager.getLogger(UpCd84.class);
+
+ public static void upCd84Data() {
+ try {
+ if (UpData.session != null && UpData.session.isConnected()) {
+ byte[] bs = createData(ServerProperties.rtuAddr);
+ UpData.upSend(bs);
+ } else {
+ log.error("鏈繛鎺ラ�氫俊涓棿浠讹紝涓嶈兘鍙戦�佹暟鎹�");
+ }
+ } catch (Exception e) {
+ log.error("鍚戦�氫俊涓棿浠跺彂閫佹暟鎹骇鐢熷紓甯�", e);
+ }
+ }
+
+
+ /**
+ * 鏋勯�犲績璺虫暟鎹�
+ *
+ * @return 瀛楄妭鏁扮粍
+ * @throws Exception 寮傚父
+ */
+ private static byte[] createData(String rtuAddr) throws Exception {
+ UpConstant.addValve();//璋冩暣娴侀噺
+
+ byte[] bytes = creatHead(rtuAddr, "84", (byte)0xB0);
+
+ byte[] bs = new byte[1] ;
+ bs[0] = (byte)0x01 ;//鍒峰崱寮�闃�
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[1] ;
+ bs[0] = (byte)0x01 ;//鍗＄被鍨� 鐢ㄦ埛鍗�
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//IC鍗″湴鍧�
+ ByteUtil.hex2Bytes_LE(ServerProperties.icCardAddr, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[8] ;//IC鍗＄紪鍙�
+ GlCreate.createIcCardNo(ServerProperties.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[4] ;//鐢ㄦ按鎴蜂綑棰�
+ ByteUtil.int2BCD_LE(UpConstant.remainMoney, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//绱娴侀噺
+ ByteUtil.int2BCD_LE(UpConstant.totalAmount, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[5] ;//鐬椂娴侀噺
+ ByteUtil.int2BCD_LE(UpConstant.instantAmount, bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[]{0x00, 0x00} ;//鎶ヨ
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[]{0x00, 0x00} ;//鐘舵��
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ bs = new byte[6] ;//鎺у埗鍣ㄦ椂閽�
+ GlCreate.createTp(bs, 0);
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+
+ GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
+
+ byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+
+ bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
+
+ return bytes ;
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
index ce2ba66..6d4213f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/upData/UpConstant.java
@@ -13,15 +13,16 @@
private static String openValveDt ;
private static String closeValveDt ;
+ public static Integer instantAmount = 10123;//鐬椂娴侀噺10.000
public static Integer totalAmount = 1234567;//瀹炰负12345.67
public static Integer remainMoney = 56789;//瀹炰负567.89
- public static Integer thisAmount = 1000;//瀹炰负10.00
- public static Integer thisMoney = 1000;//瀹炰负10.00
+ public static Integer thisAmount = 0;//
+ public static Integer thisMoney = 0;//
public static Integer thisTime = 10;//瀹炰负10
public static Integer thisPrice = 100;//瀹炰负1.00
- public static Integer perAmount = thisAmount;
- public static Integer perMoney = thisMoney;
+ public static Integer perAmount = 10;
+ public static Integer perMoney = 0;
public static void clearOpenValveDt(){
@@ -40,7 +41,11 @@
return closeValveDt ;
}
- public static void closeValve(){
+ public static void addValve(){
+ perMoney = perAmount / (thisPrice / 100) ;
+ thisAmount += perAmount ;
+ thisMoney += perMoney ;
+
totalAmount = totalAmount + perAmount ;
remainMoney = remainMoney - perMoney ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
index b5dd099..6b98168 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/ComSupportP206V1_0_0.java
@@ -20,8 +20,12 @@
public class ComSupportP206V1_0_0 {
protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ;
protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
-
protected static String rtuAddr = "532328059995" ;
+
+// protected static String mwUrlTest = "http://8.140.179.55:8071/rtuMw/com/test" ;
+// protected static String mwUrlSendCom = "http://8.140.179.55:8071/rtuMw/com/send" ;
+// protected static String rtuAddr = "620202000066" ;
+
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
protected static String vsIcCardNo = "61181622830147822" ;//铏氭嫙IC鍗＄紪鍙凤紙鐢ㄦ埛铏氭嫙鍗″簭鍒楀彿锛�
--
Gitblit v1.8.0