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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/FromRtuComResultConstantTask.java | 64 ++++++++++++++++---------------- 1 files changed, 32 insertions(+), 32 deletions(-) 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