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-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
index d4c1c14..233e6f8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java
@@ -1,11 +1,11 @@
package com.dy.pipIrrGlobal.util;
-import com.dy.common.util.ConfigXml;
-import com.dy.common.webListener.ConfigListener;
+import com.dy.common.util.ConfigXml4Springboot;
import org.jdom2.Document;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.core.io.ResourceLoader;
-import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
/**
* @Author: liurunyu
@@ -18,18 +18,17 @@
* 瀹炲鍖�
*/
@SuppressWarnings("unused ")
- protected void init() {
- this.init(null);
+ protected void init(ResourceLoader resourceLoader) {
+ this.doInit(resourceLoader);
}
/**
* 瀹炲鍖�
*/
@SuppressWarnings("unused ")
- protected void init(ApplicationReadyEvent event) {
+ protected void doInit(ResourceLoader resourceLoader) {
try {
- URL configFileURL = ConfigListener.class.getResource("/init-config.xml");
- ConfigXml configXml = new ConfigXml();
- Document doc = configXml.createDom(configFileURL);
+ ConfigXml4Springboot configXml = new ConfigXml4Springboot() ;
+ Document doc = configXml.createDom(resourceLoader, "init-config.xml") ;
this.doInit(configXml, doc);
} catch (Exception e) {
System.out.println("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
@@ -37,20 +36,74 @@
e.printStackTrace();
}
}
- private void doInit(ConfigXml configXml, Document doc) throws Exception {
+ private void doInit(ConfigXml4Springboot configXml, Document doc) throws Exception {
if (configXml != null && doc != null) {
for (int num = 1; num <= 10000; num++) {
if (configXml.existElement(doc, "config.orgs.org" + num)) {
String orgTag = configXml.getSetAttrTxt(doc, "config.orgs.org" + num, "tag", null, false, null);
String orgName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num, "name", null, false, null);
- Org.OrgVo vo = new Org().new OrgVo() ;
- vo.tag = orgTag ;
- vo.name = orgName ;
- Org.OrgList.add(vo) ;
+ Boolean enable = configXml.getSetAttrBoolean(doc, "config.orgs.org" + num, "enable", null, null);
+ if(enable != null && enable.booleanValue()){
+ Org.OrgVo vo = new Org().new OrgVo() ;
+ vo.tag = orgTag ;
+ vo.name = orgName ;
+ Org.OrgList.add(vo) ;
+ }
}else{
break ;
}
}
}
}
+
+
+ /////////////////////////////////
+ // 寰楀埌
+ ////////////////////////////////
+ /**
+ * 瀹炲鍖�
+ */
+ @SuppressWarnings("unused ")
+ protected List<Org.OrgVo> get(ResourceLoader resourceLoader) {
+ return this.doGet(resourceLoader);
+ }
+
+ /**
+ * 瀹炲鍖�
+ */
+ @SuppressWarnings("unused ")
+ protected List<Org.OrgVo> doGet(ResourceLoader resourceLoader) {
+ List<Org.OrgVo> list = null ;
+ try {
+ ConfigXml4Springboot configXml = new ConfigXml4Springboot() ;
+ Document doc = configXml.createDom(resourceLoader, "init-config.xml") ;
+ list = this.doGet(configXml, doc);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return list ;
+ }
+
+ private List<Org.OrgVo> doGet(ConfigXml4Springboot configXml, Document doc) throws Exception {
+ List<Org.OrgVo> list = null ;
+ if (configXml != null && doc != null) {
+ list = new ArrayList<>();
+ for (int num = 1; num <= 10000; num++) {
+ if (configXml.existElement(doc, "config.orgs.org" + num)) {
+ String orgTag = configXml.getSetAttrTxt(doc, "config.orgs.org" + num, "tag", null, false, null);
+ String orgName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num, "name", null, false, null);
+ Boolean enable = configXml.getSetAttrBoolean(doc, "config.orgs.org" + num, "enable", null, null);
+ if(enable != null && enable.booleanValue()){
+ Org.OrgVo vo = new Org().new OrgVo() ;
+ vo.tag = orgTag ;
+ vo.name = orgName ;
+ list.add(vo) ;
+ }
+ }else{
+ break ;
+ }
+ }
+ }
+ return list ;
+ }
}
--
Gitblit v1.8.0