From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealControllerNoTrampV2.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealControllerNoTrampV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealControllerNoTrampV2.java new file mode 100644 index 0000000..942f9e6 --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealControllerNoTrampV2.java @@ -0,0 +1,48 @@ +package com.dy.rtuMw.server.rtuData.p206V2; + +import com.dy.common.mw.protocol.Data; +import com.dy.common.mw.protocol.p206V2.DataV2; +import com.dy.common.mw.protocol.p206V2.upVos.DataCd02Vo; +import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp; +import com.dy.rtuMw.server.rtuData.TaskSurpport; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * @Author liurunyu + * @Date 2024/2/22 16:56 + * @LastEditTime 2024/2/22 16:56 + * @Description + * 澶勭悊闈炴祦娴帶鍒跺櫒,姝や换鍔℃棤鍏蜂綋涓氬姟閫昏緫锛屽彧鏄湪浠诲姟xml閰嶇疆鏂囦欢涓紝妗嗕綇鍏跺瓙浠诲姟鑺傜偣 + */ +public class TkDealControllerNoTrampV2 extends TaskSurpport { + + private static final Logger log = LogManager.getLogger(TkDealControllerNoTrampV2.class.getName()) ; + + //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷� + public static final String taskId = "TkDealControllerNoTrampV2" ; + + /** + * 鎵ц鑺傜偣浠诲姟 + * @param data 闇�瑕佸鐞嗙殑鏁版嵁 + */ + @Override + public void execute(Object data) { + Data d = (Data)data ; + Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId) ; + PrControllerTramp tramp = (PrControllerTramp)objs[2] ; + if(tramp == null){ + boolean toNext = true ; + if(d.getSubData() != null) { + DataV2 dataV2 = (DataV2)d.getSubData() ; + if(dataV2 != null && dataV2.subData != null && dataV2.subData instanceof DataCd02Vo){ + //杩囨护鎺夊績璺虫暟鎹� + toNext = false ; + } + } + if(toNext){ + this.toNextTasks(data); + } + } + } +} -- Gitblit v1.8.0