From 0117e7db3431453a7d3c596e600b72b0da1c371a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 15:16:19 +0800
Subject: [PATCH] 增加了省级行政区
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 22 ++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java | 5 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 9 ++++++---
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
index edc4a10..6cd780d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/DistrictLevel.java
@@ -9,6 +9,7 @@
*/
public enum DistrictLevel implements IEnum {
+ Province((byte)0, "鐪�"),
City((byte)1, "甯�"),
County((byte)2, "鍘�"),
Town((byte)3, "闀�"),
@@ -34,7 +35,9 @@
}
public static DistrictLevel get(Byte code){
- if(code.byteValue() == City.code.byteValue()){
+ if(code.byteValue() == Province.code.byteValue()){
+ return Province ;
+ }if(code.byteValue() == City.code.byteValue()){
return City ;
}else if(code.byteValue() == County.code.byteValue()){
return County ;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 6259b52..0eaec32 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -4,9 +4,12 @@
<!-- 澶氫釜缁勭粐锛岀敤缂栧彿鍖哄垎锛岀紪鍙蜂粠1寮�濮� -->
<org1 name="ym">
<districts>
- <city name="妤氶泟褰濇棌鑷不宸�" num="23" level="1">
- <country name="鍏冭皨鍘�" num="28" level="2" />
- </city>
+ <!-- 鐪佺骇琛屾斂鍖哄湪涓氬姟闇�姹備腑娌℃湁浣撶幇锛屽彧鍦ㄧ帇姹熸捣IC鍗¤璁′腑鐢ㄥ埌锛屾墍浠ヨ繖閲屾妸鍏秎evel璁剧疆涓�0 -->
+ <province name="浜戝崡鐪�" num="53" level="0">
+ <city name="妤氶泟褰濇棌鑷不宸�" num="23" level="1">
+ <country name="鍏冭皨鍘�" num="28" level="2" />
+ </city>
+ </province>
</districts>
<user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
</org1>
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 aa77c42..d61e5f6 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
@@ -83,6 +83,27 @@
//璁剧疆鏁版嵁婧�
DataSourceContext.set(orgTag);
if(!this.existDistricts()){
+ 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) ;
+ 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);
+ }
+ }
+ }
+ }
+ /* 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) ;
@@ -95,6 +116,7 @@
this.saveDistrict(supperId, distriName, distriNum, distriLevel);
}
}
+ */
}
if(!this.existUsers()){
if(configXml.existElement(doc, "config.orgs.org" + num + ".user")){
--
Gitblit v1.8.0