From 18f9dc6d0f15cad4a74e68fcf87b1a9aa83b5e66 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 18 七月 2024 14:28:28 +0800
Subject: [PATCH] 实现协议中各种命令结果日志数据库永久更新保存功能
---
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-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd36Vo.java | 13 +
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd21Vo.java | 13 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 73 ++++++++--
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-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-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-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 | 6
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 | 6
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd99Vo.java | 13 +
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 | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd92Vo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd3CAnd65Vo.java | 17 ++
/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-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd38And68Vo.java | 17 ++
25 files changed, 337 insertions(+), 54 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 9ab0f95..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
@@ -25,7 +25,7 @@
public String comLog(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 寮哄埗鏃犲崱寮�闃�涓�浣撻榾鍥炲:\n");
+ sb.append("寮哄埗鏃犲崱寮�闃�鍛戒护鍥炲:\n");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
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 81bd5b2..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
@@ -23,7 +23,7 @@
}
public String comLog(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" 寮哄埗鏃犲崱鍏抽榾涓�浣撻榾鍥炲:\n");
+ sb.append("寮哄埗鏃犲崱鍏抽榾鍛戒护鍥炲:\n");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
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 a428056..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
@@ -27,11 +27,11 @@
}
public String comLog(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" APP杩滅▼寮�闃�涓�浣撻榾鍥炲:\n");
- sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append("APP杩滅▼寮�闃�鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
sb.append("\n");
- sb.append(" 缁撴灉锛�");
+ sb.append(" 缁撴灉锛�");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
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 c011269..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
@@ -29,11 +29,11 @@
public String comLog(){
StringBuilder sb = new StringBuilder() ;
- sb.append(" APP杩滅▼鍏抽榾涓�浣撻榾鍥炲:\n");
- sb.append(" 铏氭嫙鍗″彿锛�");
+ sb.append("APP杩滅▼鍏抽榾鍛戒护鍥炲:\n");
+ sb.append(" 铏氭嫙鍗″彿锛�");
sb.append(cardNo);
sb.append("\n");
- sb.append(" 缁撴灉锛�");
+ sb.append(" 缁撴灉锛�");
sb.append(success?"鎵ц":"澶辫触");
sb.append("\n");
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/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 9e80709..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,7 +40,7 @@
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() + ")");
@@ -55,26 +52,74 @@
}
}
- 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.setResult((byte)1);
- po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
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(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(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(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 ;
--
Gitblit v1.8.0