From accb89965840fbb2c03fe7577d0421844c9dcff5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 21 十月 2024 16:45:35 +0800
Subject: [PATCH] 1、通信中间件增加命令应答对象接口；2、修改通信中间件对命令应答处理逻辑。
---
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-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-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 | 2
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-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-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-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 +
26 files changed, 169 insertions(+), 106 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..6370cb5 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;
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-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 ;
}
--
Gitblit v1.8.0