From f1407edab8c340af83e6d5008b4b826a3922e989 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:33:55 +0800
Subject: [PATCH] 完善协议(20240510)数据处理任务树。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReportV202405.java             |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202405.java  |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml                                                     |   14 +++---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202405.java |    7 +--
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202405.java             |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java        |   54 ++++++++++++++++----------
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202405.java        |    6 +-
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java    |    6 +-
 8 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
similarity index 75%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
index f968801..03be447 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
@@ -2,12 +2,8 @@
 
 import com.dy.common.mw.protocol.Data;
 import com.dy.common.mw.protocol.p206V202404.DataV202404 ;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80_5BVo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd81Vo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_A3_85Vo;
-import com.dy.common.util.DateTime;
+import com.dy.common.mw.protocol.p206V202404.upVos.*;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
 import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
@@ -18,12 +14,12 @@
  * @Author liurunyu
  * @Date 2024/5/8 14:18
  */
-public class TkDealAlarmStatus extends TaskSurpport {
+public class TkDealAlarmStatusV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkDealAlarmStatus.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkDealAlarmStatus" ;
+    public static final String taskId = "TkDealAlarmStatusV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -39,24 +35,34 @@
                 Object cdObj = dV202404.subData ;
                 if(cdObj != null){
                     try{
-                        Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+                        Object[] objs = this.getTaskResults(TkPreGenObjsV202405.taskId) ;
                         DbSv sv = (DbSv)objs[0] ;
                         PrController controller = (PrController)objs[1] ;
-                        if(cdObj instanceof DataCd80_5BVo){
+                        if(cdObj instanceof DataCd81Vo){
+                            //璁惧缁堢闅忔満鑷姤
+                            DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
+                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ;
+                            this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ;
+                        }else if(cdObj instanceof DataCd80_5BVo){
                             //璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
                             DataCd80_5BVo cdData = (DataCd80_5BVo)(cdObj) ;
-                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ;
-                            this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ;
+                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
+                            this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
                         }else if(cdObj instanceof DataCd93_A3_85Vo){
                             //骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂�   +  鍒峰崱鍏虫车/闃�涓婃姤
                             DataCd93_A3_85Vo cdData = (DataCd93_A3_85Vo)(cdObj) ;
-                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ;
-                            this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ;
-                        }else if(cdObj instanceof DataCd81Vo){
+                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
+                            this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
+                        }else if(cdObj instanceof DataCd84Vo){
                             //璁惧缁堢闅忔満鑷姤
-                            DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
-                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData) ;
-                            this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData) ;
+                            DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
+                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ;
+                            this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ;
+                        }else if(cdObj instanceof DataCdC2Vo){
+                            //璁惧缁堢闅忔満鑷姤
+                            DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ;
+                            this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ;
+                            this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ;
                         }
                     }catch (Exception e){
                         log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
@@ -81,7 +87,9 @@
                                   String rtuDt,
                                   DataCd80_5BVo vo80_5B,
                                   DataCd93_A3_85Vo vo93_A3_85,
-                                  DataCd81Vo vo81) throws Exception {
+                                  DataCd81Vo vo81,
+                                  DataCd84Vo vo84,
+                                  DataCdC2Vo voC2) throws Exception {
 //        RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
 //        if(po == null){
 //            po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
@@ -113,7 +121,9 @@
                              String rtuDt,
                              DataCd80_5BVo vo80_5B,
                              DataCd93_A3_85Vo vo93_A3_85,
-                             DataCd81Vo vo81) throws Exception {
+                             DataCd81Vo vo81,
+                             DataCd84Vo vo84,
+                             DataCdC2Vo voC2) throws Exception {
 //        RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
 //                rtuAddr,
 //                DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
@@ -129,7 +139,9 @@
                                     String rtuDt,
                                     DataCd80_5BVo vo80_5B,
                                     DataCd93_A3_85Vo vo93_A3_85,
-                                    DataCd81Vo vo81) throws Exception {
+                                    DataCd81Vo vo81,
+                                    DataCd84Vo vo84,
+                                    DataCdC2Vo voC2) throws Exception {
 //        po.controllerid = controller==null?null:controller.getId() ;
 //        po.intakeid = controller==null?null:controller.getIntakeId() ;
 //
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTramp.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202405.java
similarity index 86%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTramp.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202405.java
index 1743348..c371148 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTramp.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202405.java
@@ -9,12 +9,12 @@
  * @Date 2024/5/8 14:18
  * 澶勭悊闈炴祦娴帶鍒跺櫒,姝や换鍔℃棤鍏蜂綋涓氬姟閫昏緫锛屽彧鏄湪浠诲姟xml閰嶇疆鏂囦欢涓紝妗嗕綇鍏跺瓙浠诲姟鑺傜偣
  */
-public class TkDealControllerNoTramp extends TaskSurpport {
+public class TkDealControllerNoTrampV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkDealControllerNoTramp.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkDealControllerNoTrampV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkDealControllerNoTramp" ;
+    public static final String taskId = "TkDealControllerNoTrampV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTramp.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
similarity index 83%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTramp.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
index 2604268..4621eea 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTramp.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
@@ -10,12 +10,12 @@
  * @Author liurunyu
  * @Date 2024/5/8 14:18
  */
-public class TkDealControllerTramp extends TaskSurpport {
+public class TkDealControllerTrampV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkDealControllerTramp.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkDealControllerTrampV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkDealControllerTramp" ;
+    public static final String taskId = "TkDealControllerTrampV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202405.java
similarity index 81%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponse.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202405.java
index 1e6222b..f851564 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202405.java
@@ -10,12 +10,12 @@
  * @Date 2024/5/8 14:18
  * @Description  璇嗗埆鍛戒护鍝嶅簲涓婃姤
  */
-public class TkFindComResponse extends TaskSurpport {
+public class TkFindComResponseV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkFindComResponse.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkFindComResponseV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkFindComResponse" ;
+    public static final String taskId = "TkFindComResponseV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReportV202405.java
similarity index 82%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReport.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReportV202405.java
index 0d6d75f..959c953 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReportV202405.java
@@ -12,12 +12,12 @@
 /**
  * 璇嗗埆闈炲懡浠ゅ簲绛�
  */
-public class TkFindReport extends TaskSurpport {
+public class TkFindReportV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkFindReport.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkFindReportV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkFindReport" ;
+    public static final String taskId = "TkFindReportV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202405.java
similarity index 92%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjs.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202405.java
index 6c6bcc6..7663252 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202405.java
@@ -15,12 +15,12 @@
  * @Author liurunyu
  * @Date 2024/5/8 14:18
  */
-public class TkPreGenObjs extends TaskSurpport {
+public class TkPreGenObjsV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkPreGenObjs.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkPreGenObjsV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkPreGenObjs" ;
+    public static final String taskId = "TkPreGenObjsV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202405.java
similarity index 90%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponse.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202405.java
index 77428d9..1b046e1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202405.java
@@ -1,7 +1,6 @@
 package com.dy.rtuMw.server.rtuData.p206V202404;
 
 import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
 import com.dy.common.mw.protocol.p206V202404.DataV202404;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import org.apache.logging.log4j.LogManager;
@@ -12,12 +11,12 @@
  * @Date 2024/5/8 14:18
  * @Description 澶勭悊鍛戒护鍝嶅簲涓婃姤
  */
-public class TkRtuDealCommandResponse extends TaskSurpport {
+public class TkRtuDealCommandResponseV202405 extends TaskSurpport {
 
-    private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponse.class.getName()) ;
+    private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponseV202405.class.getName()) ;
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
-    public static final String taskId = "TkRtuDealCommandResponse" ;
+    public static final String taskId = "TkRtuDealCommandResponseV202405" ;
 
     /**
      * 鎵ц鑺傜偣浠诲姟锛氬鐞嗗懡浠ゅ搷搴斾笂鎶�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index e395dc9..0dbdad2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -31,18 +31,18 @@
 				</task>
 			</task>
 			<task id="TkFindP206V202404" name="璇嗗埆P206V202404鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindP206V202404">
-				<task id="TkPreGenObjs" name="棰勫厛鍑嗗鍚勫璞″苟璇嗗埆娴佹氮鎺у埗鍣�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkPreGenObjs">
+				<task id="TkPreGenObjsV202405" name="棰勫厛鍑嗗鍚勫璞″苟璇嗗埆娴佹氮鎺у埗鍣�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkPreGenObjsV202405">
 					<!-- 澶勭悊娴佹氮鎺у埗鍣� -->
-					<task id="TkDealControllerTramp" name="澶勭悊娴佹氮鎺у埗鍣�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerTramp" />
+					<task id="TkDealControllerTrampV202405" name="澶勭悊娴佹氮鎺у埗鍣�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerTrampV202405" />
 					<!-- 闈炴祦娴�匯TU锛屽繀椤绘斁鍦═kDealControllerTramp鍚庨潰 -->
-					<task id="TkDealControllerNoTramp" name="闈炴祦娴�匯TU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerNoTramp">
+					<task id="TkDealControllerNoTrampV202405" name="闈炴祦娴�匯TU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerNoTrampV202405">
 						<!-- 璇嗗埆闈炲懡浠ゅ簲绛斾笂琛屾暟鎹� -->
-						<task id="TkFindReport" name="璇嗗埆闈炲懡浠ゅ簲绛斾笂琛屾暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReport">
-							<task id="TkDealAlarmStatus" name="鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatus" />
+						<task id="TkFindReportV202405" name="璇嗗埆闈炲懡浠ゅ簲绛斾笂琛屾暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReportV202405">
+							<task id="TkDealAlarmStatusV202405" name="鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹暟鎹�" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202405" />
 						</task>
 						<!-- 璇嗗埆鍛戒护鍝嶅簲鏁版嵁 -->
-						<task id="TkFindComResponse" name="璇嗗埆鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponse">
-							<task id="TkRtuDealCommandResponse" name="RTU鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkRtuDealCommandResponse" >
+						<task id="TkFindComResponseV202405" name="璇嗗埆鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponseV202405">
+							<task id="TkRtuDealCommandResponseV202405" name="RTU鍝嶅簲鍛戒护鏁版嵁" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkRtuDealCommandResponseV202405" >
 							</task>
 						</task>
 					</task>

--
Gitblit v1.8.0