From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
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 @@
/**
* 瑙ｆ瀽澶勭悊鍣ㄩ厤缃�
* @return
- */
protected TreeConfig parseConfig() {
try {
ClassLoader classLoader = ClassLoader.getSystemClassLoader();
@@ -39,6 +39,24 @@
return null;
}
}
+ */
+
+ /**
+ * 瑙ｆ瀽澶勭悊鍣ㄩ厤缃�
+ * @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