From d53c03f383ecd50b62dd1e069c339b57ded8702b Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 01 十二月 2023 14:52:25 +0800 Subject: [PATCH] 1、RTU模拟测试系统开发; 2、RTU模拟测试系统管控系统开发; 3、联合测试中发现的协议bug修改; 4、联合测试中发现通信中间件的bug修改。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TreeParse.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/TreeParse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TreeParse.java similarity index 95% rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/TreeParse.java rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TreeParse.java index fb4e224..c9182f1 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/deal/TreeParse.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TreeParse.java @@ -1,4 +1,4 @@ -package com.dy.aceMw.server.busi.deal; +package com.dy.aceMw.server.rtuData; import java.net.URL; @@ -29,7 +29,8 @@ */ protected TreeConfig parseConfig() { try { - URL configFileURL = TreeParse.class.getResource("Tree.xml"); + ClassLoader classLoader = ClassLoader.getSystemClassLoader(); + URL configFileURL = classLoader.getResource("RtuDataDealTree.xml"); return this.parse(this.createDom(configFileURL)) ; } catch (Exception e) { System.out.println("绯荤粺鍚姩鏃讹紝鍒濆涓婅鏁版嵁澶勭悊浠诲姟閰嶇疆鍑洪敊 !"); @@ -68,7 +69,7 @@ private TreeConfig parse(Document doc) throws Exception { Element root = doc.getRootElement(); if (root == null) { - throw new Exception("鏈緱鍒颁笂琛屾暟鎹鐞嗕换鍔¢厤缃枃浠舵牴鍏冪礌config!"); + throw new Exception("鏈緱鍒颁笂琛屾暟鎹鐞嗕换鍔¢厤缃枃浠舵牴鍏冪礌project!"); } List<Element> rootTasks = root.getChildren("task") ; -- Gitblit v1.8.0