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/TreeParse.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/TreeParse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/TreeParse.java
index 22017a8..1e0afa7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/TreeParse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/TreeParse.java
@@ -7,7 +7,8 @@
 import org.jdom2.Document;
 import org.jdom2.Element;
 import org.jdom2.input.SAXBuilder;
-
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 
 public class TreeParse {
 	public List<String> ids ;
@@ -26,7 +27,6 @@
 	/**
 	 * 瑙f瀽澶勭悊鍣ㄩ厤缃�
 	 * @return
-	 */
 	protected TreeConfig parseConfig() {
 		try {
 			ClassLoader classLoader = ClassLoader.getSystemClassLoader();
@@ -39,6 +39,24 @@
 			return null;
 		}
 	}
+	 */
+
+	/**
+	 * 瑙f瀽澶勭悊鍣ㄩ厤缃�
+	 * @return
+	 */
+	protected TreeConfig parseConfig(ResourceLoader resourceLoader) {
+		try {
+			Resource resource = resourceLoader.getResource("classpath:RtuDataDealTree.xml");
+			URL configFileURL = resource.getURL() ;
+			return this.parse(this.createDom(configFileURL)) ;
+		} catch (Exception e) {
+			System.out.println("绯荤粺鍚姩鏃讹紝鍒濆涓婅鏁版嵁澶勭悊浠诲姟閰嶇疆鍑洪敊 !");
+			System.out.println(e.getMessage());
+			e.printStackTrace();
+			return null;
+		}
+	}
 	
 	/**
 	 * 

--
Gitblit v1.8.0