Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-12-26 040d2e6579bceff1b7cb54b2d06a9e9c958618d8

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java

@@ -6,12 +6,14 @@
import com.dy.common.util.ConfigXml4Springboot;
import com.dy.common.util.MD5;
import com.dy.pipIrrGlobal.daoBa.*;
import com.dy.pipIrrGlobal.daoOp.OpeTaskTypeMapper;
import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
import com.dy.pipIrrGlobal.daoRm.RmIrrigateProfileMapper;
import com.dy.pipIrrGlobal.daoSe.SePaymentMethodMapper;
import com.dy.pipIrrGlobal.daoSe.SeRechargeProfileMapper;
import com.dy.pipIrrGlobal.daoSe.SeWaterTypeMapper;
import com.dy.pipIrrGlobal.pojoBa.*;
import com.dy.pipIrrGlobal.pojoOp.OpeTaskType;
import com.dy.pipIrrGlobal.pojoPr.PrWaterPrice;
import com.dy.pipIrrGlobal.pojoRm.RmIrrigateProfile;
import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod;
@@ -47,6 +49,7 @@
    private BaDictMapper baDictDao;
    private BaDictItemMapper baDictItemDao;
    private SeRechargeProfileMapper seRechargeProfileDao;
    private OpeTaskTypeMapper taskTypeDao;

    @Autowired
    public void setResourceLoader(ResourceLoader resourceLoader){
@@ -101,6 +104,11 @@
    @Autowired
    public void setSeRechargeProfileDao(SeRechargeProfileMapper seRechargeProfileDao) {
        this.seRechargeProfileDao = seRechargeProfileDao;
    }

    @Autowired
    public void setOpeTaskTypeDao(OpeTaskTypeMapper taskTypeDao) {
        this.taskTypeDao = taskTypeDao;
    }

    /**
@@ -268,6 +276,20 @@
                                }
                            }
                        }

                        if(!this.existTaskType()){
                            if(configXml.existElement(doc, "config.orgs.org" + num + ".taskType")){
                                for(int i = 1 ; i < 10000; i++){
                                    if(configXml.existElement(doc, "config.orgs.org" + num + ".taskType.item" + i)){
                                        String taskType = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".taskType.item" + i,"typeName", null, false, null) ;
                                        this.saveTaskType(orgTag, taskType);
                                    }else{
                                        break ;
                                    }
                                }
                            }
                        }

                    }
                }else{
                    break ;
@@ -355,6 +377,15 @@
    private boolean existDict() {
        Long total = this.baDictDao.selectCount(null);
        return (total != null && total > 0) ;
    }

    /**
     * 数据库中是否存在工单任务类型
     * @return
     */
    private boolean existTaskType() {
        Long total = this.taskTypeDao.selectCount(null);
        return (total != null && total > 0);
    }

    /**
@@ -552,9 +583,20 @@
            po.setDeleted(0L);
            this.baDictItemDao.insert(po);
        }

    }


    /**
     * 保存工单任务类型
     * @param orgTag
     * @param task_type
     */
    private void saveTaskType(String orgTag, String task_type) {
        if(task_type != null && !task_type.trim().equals("")) {
            OpeTaskType po = new OpeTaskType();
            po.setTaskType(task_type);
            po.setDeleted(0L);
            this.taskTypeDao.insert(po);
        }
    }

}