增加了省级行政区

liurunyu

2023-11-23 0117e7db3431453a7d3c596e600b72b0da1c371a

增加了省级行政区

 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 ;

 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卡设计中用到，所以这里把其level设置为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>

 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 下面是最初实现，后满足IC卡中存在省的要求，增加省级行政区划
                        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")){