1、端口、IP、标签配置.docx文档修改：民勤配置项变化； 2、农户取水年度统计逻辑变化； 3、灌溉计划迟延时间可配置。

liurunyu

2025-04-28 9aafec73f2a5df0ccee2712505c63d44d91336c6

1、端口、IP、标签配置.docx文档修改：民勤配置项变化；
2、农户取水年度统计逻辑变化；
3、灌溉计划迟延时间可配置。

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -478,8 +478,3 @@
vc:
    #虚拟卡最低余额报警值
    alarmValue: 10

#轮灌配置
rotation:
    #轮灌组提前开阀时间
    preOpeningTime: 10

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java

@@ -84,16 +84,22 @@
        List<Integer> yearGrp = new ArrayList<Integer>();
        int nowYear = Integer.parseInt(DateTime.yyyy()) ;
        if(qo.year == null) {
            for(int i = startYear4YearStatistics; i <= nowYear; i++) {
            int startYear = nowYear - 4 ;//查5年的
            if(startYear < startYear4YearStatistics){
                startYear = startYear4YearStatistics ;
            }
            for(int i = startYear; i <= nowYear; i++) {
                yearGrp.add(i) ;
            }
        }else{
            /*
            if(qo.year > nowYear){
                qo.year = nowYear;
            }
            if(qo.year < startYear4YearStatistics){
                qo.year = startYear4YearStatistics;
            }
             */
            yearGrp.add(qo.year) ;
        }
        return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp));

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java

@@ -69,13 +69,13 @@
    @Autowired
    private CommandSv commandSv;

    @Value("${webchat.irr.plan.delay}")
    @Value("${wechat.irr.plan.delay:5}")
    private Integer irrPlanDelay ;//轮灌中计划开阀的延迟时长

    private static final Integer irrPlanDelayDefault = 5 ;//轮灌中计划开阀的默认延迟时长

    @Value("${rotation.preOpeningTime}")
    private Long preOpeningTime;
    @Value("${wechat.irr.plan.preOpeningTime:10}")
    private Integer preOpeningTime;

    /**
     * æ·»åŠ çŒæº‰è®¡åˆ’

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml

@@ -12,12 +12,11 @@
        context-parameters:
            #GenerateIdSetSuffixListener中应用，取值范围是0-99
            idSuffix: ${pipIrr.wechat.idSuffix}
webchat:
wechat:
    irr:
        plan:
            delay: 5 #轮灌中计划开阀的延迟时长


            delay: 5 #轮灌中计划开阀的延迟时长(分钟)
            preOpeningTime: 10 #提前时间(分钟)
#阿里短信服务
aliyun:
    sms:

 pipIrr-platform/Îĵµ/SaaS/¶Ë¿Ú¡¢IP¡¢±êÇ©ÅäÖÃ.docx

Binary files differ