From dd9e34d4379ea31b44b5ac2f5a60ae5ab4b13030 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 05 七月 2024 16:36:48 +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 | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 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 9779e1b..fd569a6 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 @@ -10,10 +10,12 @@ import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper; import com.dy.pipIrrGlobal.daoBa.BaUserMapper; import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper; +import com.dy.pipIrrGlobal.daoSe.SeWaterTypeMapper; import com.dy.pipIrrGlobal.pojoBa.BaDistrict; import com.dy.pipIrrGlobal.pojoBa.BaSettings; import com.dy.pipIrrGlobal.pojoBa.BaUser; import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod; +import com.dy.pipIrrGlobal.pojoSe.SeWaterType; import com.dy.pipIrrGlobal.util.DistrictLevel; import org.jdom2.Document; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +39,7 @@ private BaUserMapper userDao ; private SePaymentMethodMapper paymentMethodDao ; private BaSettingsMapper settingsDao ; + private SeWaterTypeMapper waterTypeDao ; @Autowired public void setDistriDao(BaDistrictMapper distriDao){ @@ -56,6 +59,11 @@ @Autowired public void setSettingsDao(BaSettingsMapper settingsDao){ this.settingsDao = settingsDao ; + } + + @Autowired + public void setWaterTypeDao(SeWaterTypeMapper waterTypeDao){ + this.waterTypeDao = waterTypeDao ; } @@ -153,6 +161,18 @@ } } } + if(!this.existWaterTypes()){ + if(configXml.existElement(doc, "config.orgs.org" + num + ".waterTypes")){ + for(int i = 1 ; i < 10000; i++){ + if(configXml.existElement(doc, "config.orgs.org" + num + ".waterTypes.item" + i)){ + String typeName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".waterTypes.item" + i,"typeName", null, false, null) ; + this.saveWaterType(orgTag, typeName); + }else{ + break ; + } + } + } + } }else{ break ; } @@ -193,6 +213,15 @@ */ private boolean existSettings(){ Long total = this.settingsDao.selectCount(null) ; + return (total != null && total > 0) ; + } + + /** + * 鏁版嵁搴撲腑鏄惁瀛樺湪鐢ㄦ按绫诲瀷鏁版嵁 + * @return 瀛樺湪鍚� + */ + private boolean existWaterTypes(){ + Long total = this.waterTypeDao.selectCount(null) ; return (total != null && total > 0) ; } @@ -278,4 +307,18 @@ } } + + /** + * 淇濆瓨鐢ㄦ按绫诲瀷 + * @param orgTag 鏈烘瀯鏍囩 + * @param typeName 鍚嶇О + */ + private void saveWaterType(String orgTag, String typeName) throws Exception{ + if(typeName != null && !typeName.trim().equals("")){ + SeWaterType po = new SeWaterType() ; + po.setTypename(typeName); + this.waterTypeDao.insert(po) ; + } + } + } -- Gitblit v1.8.0