From 8125cd67aedd983ce683f63d9d1bf6ff77c0f6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Tue, 25 Aug 2026 16:21:59 +0800 Subject: [PATCH] 1 --- .../com/letian/modules/job/config/ScheduleConfig.java | 8 ++++++-- .../modules/job/service/impl/ScheduleJobServiceImpl.java | 7 +++++++ .../production/service/impl/DailyPlanServiceImpl.java | 4 ++-- src/main/resources/application-prod.yml | 6 +++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/letian/modules/job/config/ScheduleConfig.java b/src/main/java/com/letian/modules/job/config/ScheduleConfig.java index c9d5593..d134e8e 100644 --- a/src/main/java/com/letian/modules/job/config/ScheduleConfig.java +++ b/src/main/java/com/letian/modules/job/config/ScheduleConfig.java @@ -2,6 +2,7 @@ package com.letian.modules.job.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.quartz.SchedulerFactoryBean; @@ -17,6 +18,9 @@ import java.util.Properties; @Configuration public class ScheduleConfig { + @Value("${letian.quartz.enabled:true}") + private boolean quartzEnabled; + @Bean public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) { SchedulerFactoryBean factory = new SchedulerFactoryBean(); @@ -52,8 +56,8 @@ public class ScheduleConfig { factory.setApplicationContextSchedulerContextKey("applicationContextKey"); //可选,QuartzScheduler 启动时更新己存在的Job,这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了 factory.setOverwriteExistingJobs(true); - //设置自动启动,默认为true - factory.setAutoStartup(true); + //设置自动启动,可通过 letian.quartz.enabled 开关控制 + factory.setAutoStartup(quartzEnabled); return factory; } diff --git a/src/main/java/com/letian/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/letian/modules/job/service/impl/ScheduleJobServiceImpl.java index 6d9d485..3f44151 100644 --- a/src/main/java/com/letian/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/letian/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils; import org.quartz.CronTrigger; import org.quartz.Scheduler; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,12 +28,18 @@ import java.util.stream.Collectors; public class ScheduleJobServiceImpl extends ServiceImpl implements ScheduleJobService { @Autowired private Scheduler scheduler; + + @Value("${letian.quartz.enabled:true}") + private boolean quartzEnabled; /** * 项目启动时,初始化定时器 */ @PostConstruct public void init(){ + if(!quartzEnabled){ + return; + } List scheduleJobList = this.list(); for(ScheduleJobEntity scheduleJob : scheduleJobList){ CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getJobId()); diff --git a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java index d31b433..c1ddcd7 100644 --- a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java @@ -471,7 +471,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { move.setScheduleQty(moveQty); move.setFromWarehouseID(fromWh); move.setToWarehouseID(toWh); - move.setTransDate(ctx.getScheduleDate() != null ? ctx.getScheduleDate() : new Date()); + move.setTransDate(new Date()); move.setUserID(username); move.setReceiver(username); move.setPartnerID(RM_PARTNER_FIXED); @@ -724,7 +724,7 @@ public class DailyPlanServiceImpl implements DailyPlanService { params.add(inData.getScheduleQty()); params.add(inData.getFromWarehouseID()); params.add(inData.getToWarehouseID()); - params.add(inData.getTransDate()); + params.add(DateUtil.getStringDate(inData.getTransDate())); params.add(inData.getUserID()); params.add(StringUtils.hasText(inData.getReceiver()) ? inData.getReceiver() : ""); params.add(StringUtils.hasText(inData.getPartnerID()) ? inData.getPartnerID() : "*"); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 26d3971..649a955 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -58,4 +58,8 @@ bartender: printerName: HP LaserJet Professional M1213nf MFP dataView: View_Special_order dataViewColumn: OrderNo - columnMapBartender: ReportID \ No newline at end of file + columnMapBartender: ReportID + +letian: + quartz: + enabled: false \ No newline at end of file