From c4b6e0aab43c440f5b8e8516f2272b7e5b7cf1e9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 14:51:49 +0800
Subject: [PATCH] 默认ym配置
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index 79c42dc..2a3bbf3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/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;
/**
* 娣诲姞鐏屾簤璁″垝
@@ -223,6 +223,11 @@
LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(preOpeningTime);
scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
+
+ // 纭繚涓嬩竴缁勭殑寮�濮嬫椂闂翠笉鏃╀簬璁″垝寮�濮嬫椂闂�
+ if(scheduleStartTime.before(planStartTime)) {
+ scheduleStartTime = planStartTime;
+ }
}
// 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
--
Gitblit v1.8.0