From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index 095b9fa..6a4d699 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -6,18 +6,21 @@
import com.dy.common.util.ConfigXml4Springboot;
import com.dy.common.util.MD5;
import com.dy.pipIrrGlobal.daoBa.*;
+import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoRm.RmIrrigateProfileMapper;
import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper;
import com.dy.pipIrrGlobal.daoSe.SeRechargeProfileMapper;
import com.dy.pipIrrGlobal.daoSe.SeWaterTypeMapper;
import com.dy.pipIrrGlobal.pojoBa.*;
+import com.dy.pipIrrGlobal.pojoOp.OpeTaskType;
import com.dy.pipIrrGlobal.pojoPr.PrWaterPrice;
import com.dy.pipIrrGlobal.pojoRm.RmIrrigateProfile;
import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
import com.dy.pipIrrGlobal.pojoSe.SeRechargeProfile;
import com.dy.pipIrrGlobal.pojoSe.SeWaterType;
import com.dy.pipIrrGlobal.util.DistrictLevel;
+import lombok.extern.slf4j.Slf4j;
import org.jdom2.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -32,6 +35,7 @@
* Spring瀹瑰櫒骞舵病鏈夊垱寤哄畬锛岃�屾湰绫讳腑鐢ㄤ簡Spring瀹瑰櫒涓殑Bean锛屽嵆distriDao, userDao銆�
* 鎵�浠ラ噰鐢ㄤ簡Spring浜嬩欢鐩戝惉鍣ㄦ潵瀹炵幇
*/
+@Slf4j
@Component
public class InitListener implements ApplicationListener<ApplicationReadyEvent> {
@@ -47,6 +51,7 @@
private BaDictMapper baDictDao;
private BaDictItemMapper baDictItemDao;
private SeRechargeProfileMapper seRechargeProfileDao;
+ private OpeTaskTypeMapper taskTypeDao;
@Autowired
public void setResourceLoader(ResourceLoader resourceLoader){
@@ -103,6 +108,11 @@
this.seRechargeProfileDao = seRechargeProfileDao;
}
+ @Autowired
+ public void setOpeTaskTypeDao(OpeTaskTypeMapper taskTypeDao) {
+ this.taskTypeDao = taskTypeDao;
+ }
+
/**
* SpringBoot瀹瑰櫒宸茬粡鍑嗗濂戒簡
* @param event 浜嬩欢
@@ -129,17 +139,22 @@
Document doc = configXml.createDom(this.resourceLoader, "init-config.xml") ;
this.doInit(configXml, doc);
} catch (Exception e) {
- System.out.println("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
- System.out.println(e.getMessage());
+ log.error("绯荤粺鍚姩鏃讹紝鍒濆鍖栭厤缃嚭閿� !");
+ log.error(e.getMessage());
e.printStackTrace();
}
}
private void doInit(ConfigXml4Springboot configXml, Document doc) throws Exception{
+ //Check if configXml and doc are not null
if(configXml != null && doc != null){
+ //Loop through 10000 orgs
for(int num = 1; num <= 10000; num++){
+ //Check if the org exists
if(configXml.existElement(doc, "config.orgs.org" + num)){
+ //Get the tag and enable value of the org
String orgTag = configXml.getSetAttrTxt(doc, "config.orgs.org" + num,"tag", null, false, null) ;
Boolean enable = configXml.getSetAttrBoolean(doc, "config.orgs.org" + num, "enable", null, null);
+ //If the org is enabled
if(enable != null && enable.booleanValue()){
//璁剧疆鏁版嵁婧�
DataSourceContext.set(orgTag);
@@ -268,6 +283,20 @@
}
}
}
+
+ if(!this.existTaskType()){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".taskType")){
+ for(int i = 1 ; i < 10000; i++){
+ if(configXml.existElement(doc, "config.orgs.org" + num + ".taskType.item" + i)){
+ String taskType = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".taskType.item" + i,"typeName", null, false, null) ;
+ this.saveTaskType(orgTag, taskType);
+ }else{
+ break ;
+ }
+ }
+ }
+ }
+
}
}else{
break ;
@@ -355,6 +384,15 @@
private boolean existDict() {
Long total = this.baDictDao.selectCount(null);
return (total != null && total > 0) ;
+ }
+
+ /**
+ * 鏁版嵁搴撲腑鏄惁瀛樺湪宸ュ崟浠诲姟绫诲瀷
+ * @return
+ */
+ private boolean existTaskType() {
+ Long total = this.taskTypeDao.selectCount(null);
+ return (total != null && total > 0);
}
/**
@@ -552,9 +590,20 @@
po.setDeleted(0L);
this.baDictItemDao.insert(po);
}
-
}
-
+ /**
+ * 淇濆瓨宸ュ崟浠诲姟绫诲瀷
+ * @param orgTag
+ * @param task_type
+ */
+ private void saveTaskType(String orgTag, String task_type) {
+ if(task_type != null && !task_type.trim().equals("")) {
+ OpeTaskType po = new OpeTaskType();
+ po.setTaskType(task_type);
+ po.setDeleted(0L);
+ this.taskTypeDao.insert(po);
+ }
+ }
}
--
Gitblit v1.8.0