From 23244726687acf8f5da68ea1db551567efaba374 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 17:02:02 +0800
Subject: [PATCH] RTU对命令的应答处理完善
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd97Vo.java | 12 ++++++++++++
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/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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 12 ++++--------
5 files changed, 48 insertions(+), 8 deletions(-)
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..9ab0f95 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..81bd5b2 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..a428056 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..c011269 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-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 8df75dd..9e80709 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
@@ -60,26 +60,22 @@
DataCd97Vo vo = (DataCd97Vo)obj ;
po.setResult((byte)1);
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.setResult((byte)1);
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.setResult((byte)1);
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.setResult((byte)1);
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());
}
return po ;
}
--
Gitblit v1.8.0