From 61cfa0d30461a8020f4e54330ea049ac6efb07c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:41 +0800
Subject: [PATCH] 1、完善代码； 2、修改上行命令结果匹配命令的bug;
---
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/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202404.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindComResponse.java | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java | 2 -
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 6 +++
5 files changed, 40 insertions(+), 36 deletions(-)
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 4697e4a..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
@@ -65,9 +65,7 @@
*/
private void nextDealRtuComResult(MidResultFromRtu resFromRtu){
try{
- log.info("寮�濮嬫妸鍛戒护缁撴灉鏀惧叆缂撲腑");
RtuComResultCache.cacheRtuComResult(new RtuComResultNode(resFromRtu.data));
- log.info("缁撴潫鎶婂懡浠ょ粨鏋滄斁鍏ョ紦涓�");
}catch(Exception e){
log.error(e.getMessage(), e);
}
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 b01b6c1..e846002 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
@@ -48,6 +48,8 @@
if(po != null){
po = this.updateCommandLogPo(po, dV1_0_1, dV1_0_1.subData) ;
sv.updateCommandLog(po);
+ }else{
+ log.error("鏈緱鍒板懡浠ゆ棩蹇楋紙" + d.getCommandId() + ")");
}
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
@@ -59,18 +61,22 @@
public RmCommandHistory updateCommandLogPo(RmCommandHistory po, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
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((JSONObject) JSON.toJSON(vo));
}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));
}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));
}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));
}
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 鑺傜偣
--
Gitblit v1.8.0