From 6690d2877666f8c1771e071f08bbb301ee41cc56 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 13:52:07 +0800
Subject: [PATCH] 233服务器上相关民勤系统的部署全部清除，相应配置文件也做调整，民勤系统转移部署到121服务器上。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 cdc76d5..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,10 +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("${wechat.irr.plan.preOpeningTime:10}")
+ private Integer preOpeningTime;
/**
* 娣诲姞鐏屾簤璁″垝
@@ -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;
+ }
}
// 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
--
Gitblit v1.8.0