From 5b983ea27aa307a4f1396b09c06312b5c34f5d42 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 15:20:40 +0800
Subject: [PATCH] 修改系统初始化功能部分，增加了省级行政区划
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 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 713f350..2c637aa 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
@@ -23,7 +23,7 @@
/**
* 鐩戝惉鍣紝瀹炵幇鍔熻兘锛氬湪绯荤粺鍚姩鏃跺垵濮嬪寲锛屽悜鏁版嵁搴撲腑鎻掑叆鏁版嵁
* 鏈洃鍚櫒涓嶈兘閲囩敤ServletContextListener鏂瑰紡锛屽洜涓篠ervlet涓婁笅鏂嘋ontext鍒涘缓鍚�
- * Spring瀹瑰櫒骞舵病鏈夊垱寤哄畬锛岃�屾湰绫讳腑鐢ㄧ彁浜哠pring瀹瑰櫒涓殑Bean锛屽嵆distriDao, userDao銆�
+ * Spring瀹瑰櫒骞舵病鏈夊垱寤哄畬锛岃�屾湰绫讳腑鐢ㄤ簡Spring瀹瑰櫒涓殑Bean锛屽嵆distriDao, userDao銆�
* 鎵�浠ラ噰鐢ㄤ簡Spring浜嬩欢鐩戝惉鍣ㄦ潵瀹炵幇
*/
@Component
@@ -86,37 +86,21 @@
if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.province")){
String distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province","name", null, false, null) ;
String distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province","num", null, false, null) ;
- Integer distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province","level", null, 0, 99,null) ;
+ Integer distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province","level", null, 1, 99,null) ;
Long supperId = this.saveDistrict(null, distriName, distriNum, distriLevel);
if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city")){
- if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city")){
- distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","name", null, false, null) ;
- distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","num", null, false, null) ;
- distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city","level", null, 1, 99,null) ;
- supperId = this.saveDistrict(supperId, distriName, distriNum, distriLevel);
- if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city.country")){
- distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country","name", null, false, null) ;
- distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country","num", null, false, null) ;
- distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city.country","level", null, 1, 99,null) ;
- this.saveDistrict(supperId, distriName, distriNum, distriLevel);
- }
+ distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","name", null, false, null) ;
+ distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","num", null, false, null) ;
+ distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city","level", null, 1, 99,null) ;
+ supperId = this.saveDistrict(null, distriName, distriNum, distriLevel);
+ if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city.country")) {
+ distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country", "name", null, false, null);
+ distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country", "num", null, false, null);
+ distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city.country", "level", null, 1, 99, null);
+ this.saveDistrict(supperId, distriName, distriNum, distriLevel);
}
}
}
- /* 2023-11-23 涓嬮潰鏄渶鍒濆疄鐜帮紝鍚庢弧瓒矷C鍗′腑瀛樺湪鐪佺殑瑕佹眰锛屽鍔犵渷绾ц鏀垮尯鍒�
- if(configXml.existElement(doc, "config.orgs.org" + num + ".districts.city")){
- String distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city","name", null, false, null) ;
- String distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city","num", null, false, null) ;
- Integer distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.city","level", null, 1, 99,null) ;
- Long supperId = this.saveDistrict(null, distriName, distriNum, distriLevel);
- if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.city.country")){
- distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city.country","name", null, false, null) ;
- distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.city.country","num", null, false, null) ;
- distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.city.country","level", null, 1, 99,null) ;
- this.saveDistrict(supperId, distriName, distriNum, distriLevel);
- }
- }
- */
}
if(!this.existUsers()){
if(configXml.existElement(doc, "config.orgs.org" + num + ".user")){
@@ -191,7 +175,7 @@
(password != null && !password.trim().equals("")) &&
supperAdmin != null){
BaUser po = new BaUser() ;
- po.name = name ;
+ po.userName = name ;
po.phone = phone ;
po.password = MD5.encrypt(password) ;//杩涜鍔犲瘑鐮� ;
po.orgTag = orgTag ;
--
Gitblit v1.8.0