From 040d2e6579bceff1b7cb54b2d06a9e9c958618d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 十二月 2024 15:46:45 +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 | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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..c535adf 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,12 +6,14 @@
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;
@@ -47,6 +49,7 @@
private BaDictMapper baDictDao;
private BaDictItemMapper baDictItemDao;
private SeRechargeProfileMapper seRechargeProfileDao;
+ private OpeTaskTypeMapper taskTypeDao;
@Autowired
public void setResourceLoader(ResourceLoader resourceLoader){
@@ -101,6 +104,11 @@
@Autowired
public void setSeRechargeProfileDao(SeRechargeProfileMapper seRechargeProfileDao) {
this.seRechargeProfileDao = seRechargeProfileDao;
+ }
+
+ @Autowired
+ public void setOpeTaskTypeDao(OpeTaskTypeMapper taskTypeDao) {
+ this.taskTypeDao = taskTypeDao;
}
/**
@@ -268,6 +276,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 +377,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 +583,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