From d0b51c6d6f2b7a530c0557b6279cc6dfced223cf Mon Sep 17 00:00:00 2001
From: zhubaomin <470473919@qq.com>
Date: 星期日, 27 四月 2025 19:01:04 +0800
Subject: [PATCH] 各轮灌组开阀时间提前10分钟，第一组除外，改为配置文件设置

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/OrgListenerSupport.java |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 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 2e1fdfc..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,10 +1,11 @@
 package com.dy.pipIrrGlobal.util;
 
-import com.dy.common.util.ConfigXml;
+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
@@ -17,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 = OrgListenerSupport.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("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
@@ -36,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