From c40d049233f2706dd23aadf327dbf86ba0008a12 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 01 十二月 2023 15:04:16 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/BusiConstantTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java similarity index 63% rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/BusiConstantTask.java rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java index f710dda..266d88f 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/BusiConstantTask.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java @@ -1,7 +1,7 @@ package com.dy.aceMw.server.tasks; -import com.dy.aceMw.server.busi.AboutRtuNode; -import com.dy.aceMw.server.busi.TcpUpDataCache; +import com.dy.aceMw.server.rtuData.RtuDataNode; +import com.dy.aceMw.server.rtuData.RtuDataCache; import com.dy.common.mw.core.CoreTask; import com.dy.common.queue.Node; import org.apache.logging.log4j.LogManager; @@ -10,8 +10,8 @@ /** * 瀵筊TU涓婅鏁版嵁杩涜涓氬姟澶勭悊 */ -public class BusiConstantTask extends CoreTask { - private static final Logger log = LogManager.getLogger(BusiConstantTask.class.getName()); +public class FromRtuConstantTask extends CoreTask { + private static final Logger log = LogManager.getLogger(FromRtuConstantTask.class.getName()); /** * 鍦ㄥ崟绾跨▼鐜涓繍琛� @@ -19,7 +19,7 @@ @Override public Integer excute() { try{ - return dealRtuUpdata() ; + return dealRtuUpData() ; }catch(Exception e){ log.error(e); } @@ -29,12 +29,12 @@ /** * 澶勭悊涓婅鏁版嵁 */ - public Integer dealRtuUpdata() { - Node first = TcpUpDataCache.getFirstQueueNode() ; + public Integer dealRtuUpData() { + Node first = RtuDataCache.getFirstQueueNode() ; if(first != null){ - Integer count = TcpUpDataCache.size() ; - Node last = TcpUpDataCache.getLastQueueNode() ; - this.doDealRtuUpdata(first, last); + Integer count = RtuDataCache.size() ; + Node last = RtuDataCache.getLastQueueNode() ; + this.doDealRtuUpData(first, last); return count ; } return null ; @@ -45,18 +45,18 @@ * @param first 绗竴涓妭鐐� * @param last 鏈�鍚庝竴涓妭鐐� */ - private void doDealRtuUpdata(Node first, Node last){ + private void doDealRtuUpData(Node first, Node last){ if(last != null){ //鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉� Node pre = last.pre ; dealNode(last) ; if(first != null && first != last){ - doDealRtuUpdata(first, pre) ; + doDealRtuUpData(first, pre) ; }else if(first != null && first == last){ //鍋滄 }else if(first == null){ //杩欑鎯呭喌涓嶄細瀛樺湪 - doDealRtuUpdata(null, pre) ; + doDealRtuUpData(null, pre) ; } } } @@ -66,9 +66,9 @@ * @param node 鑺傜偣 */ private void dealNode(Node node){ - AboutRtuNode obj = (AboutRtuNode)node.obj ; + RtuDataNode obj = (RtuDataNode)node.obj ; obj.dealSelf() ; - TcpUpDataCache.removeNode(node); + RtuDataCache.removeNode(node); } } -- Gitblit v1.8.0