From 6a6d287641a28ad19dfa1c319fe7a9191ef9ad52 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 11:16:18 +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 |   96 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 94 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 2c637aa..9779e1b 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
@@ -7,9 +7,13 @@
 import com.dy.common.util.MD5;
 import com.dy.common.webListener.ConfigListener;
 import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
 import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
+import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper;
 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.util.DistrictLevel;
 import org.jdom2.Document;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +35,8 @@
 
     private BaDistrictMapper distriDao ;
     private BaUserMapper userDao ;
+    private SePaymentMethodMapper paymentMethodDao ;
+    private BaSettingsMapper settingsDao ;
 
     @Autowired
     public void setDistriDao(BaDistrictMapper distriDao){
@@ -40,6 +46,16 @@
     @Autowired
     public void setUserDao(BaUserMapper userDao){
         this.userDao = userDao ;
+    }
+
+    @Autowired
+    public void setPaymentDao(SePaymentMethodMapper paymentMethodDao){
+        this.paymentMethodDao = paymentMethodDao ;
+    }
+
+    @Autowired
+    public void setSettingsDao(BaSettingsMapper settingsDao){
+        this.settingsDao = settingsDao ;
     }
 
 
@@ -92,7 +108,7 @@
                                 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);
+                                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);
@@ -109,6 +125,32 @@
                             String password = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".user","password", null, false, null) ;
                             Integer supperAdmin = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".user","supperAdmin", null, 0, 1,null) ;
                             this.saveUser(orgTag, name, phone, password, supperAdmin);
+                        }
+                    }
+                    if(!this.existPayments()){
+                        if(configXml.existElement(doc, "config.orgs.org" + num + ".payments")){
+                            for(int i = 1 ; i < 10000; i++){
+                                if(configXml.existElement(doc, "config.orgs.org" + num + ".payments.item" + i)){
+                                    String name = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".payments.item" + i,"name", null, false, null) ;
+                                    this.savePayment(orgTag, name);
+                                }else{
+                                    break ;
+                                }
+                            }
+                        }
+                    }
+                    if(!this.existSettings()){
+                        if(configXml.existElement(doc, "config.orgs.org" + num + ".settings")){
+                            for(int i = 1 ; i < 10000; i++){
+                                if(configXml.existElement(doc, "config.orgs.org" + num + ".settings.item" + i)){
+                                    String item_name = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"item_name", null, false, null) ;
+                                    String item_value = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"item_value", null, false, null) ;
+                                    String remarks = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".settings.item" + i,"remarks", null, false, null) ;
+                                    this.saveSettings(orgTag, item_name, item_value, remarks);
+                                }else{
+                                    break ;
+                                }
+                            }
                         }
                     }
                 }else{
@@ -128,11 +170,29 @@
     }
 
     /**
-     * 鏁版嵁搴撲腑鏄惁瀛樺湪琛屾斂鍖哄垝鏁版嵁
+     * 鏁版嵁搴撲腑鏄惁瀛樺湪鐢ㄦ埛鏁版嵁
      * @return 瀛樺湪鍚�
      */
     private boolean existUsers(){
         Long total = this.userDao.selectCount(null) ;
+        return (total != null && total > 0) ;
+    }
+
+    /**
+     * 鏁版嵁搴撲腑鏄惁瀛樺湪鏀粯鏂瑰紡鏁版嵁
+     * @return 瀛樺湪鍚�
+     */
+    private boolean existPayments(){
+        Long total = this.paymentMethodDao.selectCount(null) ;
+        return (total != null && total > 0) ;
+    }
+
+    /**
+     * 鏁版嵁搴撲腑鏄惁瀛樺湪绯荤粺閰嶇疆鏁版嵁
+     * @return 瀛樺湪鍚�
+     */
+    private boolean existSettings(){
+        Long total = this.settingsDao.selectCount(null) ;
         return (total != null && total > 0) ;
     }
 
@@ -185,5 +245,37 @@
             this.userDao.putin(po) ;
         }
     }
+    /**
+     * 淇濆瓨鏀粯鏂瑰紡
+     * @param orgTag 鏈烘瀯鏍囩
+     * @param name 鍚嶇О
+     */
+    private void savePayment(String orgTag, String name) throws Exception{
+        if(name != null && !name.trim().equals("")){
+            SePaymentMethod po = new SePaymentMethod() ;
+            po.setName(name);
+            po.setDeleted(Deleted.NO.code);
+            this.paymentMethodDao.insert(po) ;
+        }
+    }
+
+    /**
+     * 淇濆瓨绯荤粺閰嶇疆
+     * @param item_name 閰嶇疆椤�
+     * @param item_value 閰嶇疆椤瑰��
+     * @param remarks 澶囨敞淇℃伅
+     * @throws Exception
+     */
+    private void saveSettings(String orgTag,String item_name, String item_value,String remarks) throws Exception{
+        if((item_name != null && !item_name.trim().equals("")) &&
+                (item_value != null && !item_value.trim().equals("")) &&
+                (remarks != null && !remarks.trim().equals(""))){
+            BaSettings po = new BaSettings() ;
+            po.setItemName(item_name);
+            po.setItemValue(item_value);
+            po.setRemarks(remarks);
+            this.settingsDao.insert(po) ;
+        }
+    }
 
 }

--
Gitblit v1.8.0