zuoxiao
2025-04-27 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -74,6 +74,9 @@
    private static final Integer irrPlanDelayDefault = 5 ;//轮灌中计划开阀的默认延迟时长
    @Value("${rotation.preOpeningTime}")
    private Long preOpeningTime;
    /**
     * 添加灌溉计划
     * @param po
@@ -218,8 +221,13 @@
            // 计算下一组的开始时间
            LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
            LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
            LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(2);
            LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(preOpeningTime);
            scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
            // 确保下一组的开始时间不早于计划开始时间
            if(scheduleStartTime.before(planStartTime)) {
                scheduleStartTime = planStartTime;
            }
        }
        // 添加灌溉计划操作记录