From 3d45d7d912b437bc1e281acc32fb313bee5dae1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 17:13:11 +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/rtuData/TaskSurpport.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
index f1e5b28..2b0a8c7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
@@ -3,6 +3,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.text.ParseException;
+
/**
* 閮ㄥ垎瀹炵幇Task
*/
@@ -11,7 +13,7 @@
private static final Logger log = LogManager.getLogger(TaskSurpport.class.getName()) ;
//褰撳墠鎵�澶勭悊鐨勪笂琛屾暟鎹墍灞濺TU鐨勫湴鍧�
- public String rtuAddr_inRootTk ;//鍙湪鏍箁oot浠诲姟瀵硅薄涓婁細浠樻鍊�
+ //public String rtuAddr_inRootTk ;//鍙湪鏍箁oot浠诲姟瀵硅薄涓婁細浠樻鍊�
//鏈妭鐐归厤缃�
protected TaskConfig conf ;
//鏍逛换鍔�
@@ -26,7 +28,7 @@
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
- public abstract void execute(Object data) ;
+ public abstract void execute(Object data) throws ParseException;
/**
* 浠诲姟閲囩敤瀵硅薄姹狅紝浠ヤ究閲嶇敤浠诲姟瀵硅薄锛�
@@ -35,7 +37,7 @@
*/
@Override
public void cleanMeAndSubs() {
- rtuAddr_inRootTk = null ;
+ //rtuAddr_inRootTk = null ;
taskResult = null ;
if(this.subTasks != null && this.subTasks.length > 0){
for(int i = 0 ; i < this.subTasks.length; i++){
--
Gitblit v1.8.0