From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
index 084cadf..6780e8b 100644
--- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java
@@ -1,14 +1,5 @@
package com.ruoyi.project.monitor.service.impl;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.quartz.JobDataMap;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.job.CronUtils;
@@ -16,6 +7,16 @@
import com.ruoyi.project.monitor.domain.SysJob;
import com.ruoyi.project.monitor.mapper.SysJobMapper;
import com.ruoyi.project.monitor.service.ISysJobService;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞�
@@ -23,13 +24,12 @@
* @author ruoyi
*/
@Service
+@RequiredArgsConstructor
public class SysJobServiceImpl implements ISysJobService
{
- @Autowired
- private Scheduler scheduler;
+ private final Scheduler scheduler;
- @Autowired
- private SysJobMapper jobMapper;
+ private final SysJobMapper jobMapper;
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛�
@@ -37,7 +37,7 @@
@PostConstruct
public void init() throws SchedulerException, TaskException
{
- scheduler.clear();
+// scheduler.clear();
List<SysJob> jobList = jobMapper.selectJobAll();
for (SysJob job : jobList)
{
@@ -75,7 +75,7 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int pauseJob(SysJob job) throws SchedulerException
{
Long jobId = job.getJobId();
@@ -95,7 +95,7 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int resumeJob(SysJob job) throws SchedulerException
{
Long jobId = job.getJobId();
@@ -115,7 +115,7 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteJob(SysJob job) throws SchedulerException
{
Long jobId = job.getJobId();
@@ -135,7 +135,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void deleteJobByIds(Long[] jobIds) throws SchedulerException
{
for (Long jobId : jobIds)
@@ -151,7 +151,7 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int changeStatus(SysJob job) throws SchedulerException
{
int rows = 0;
@@ -173,16 +173,23 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
- public void run(SysJob job) throws SchedulerException
+ @Transactional(rollbackFor = Exception.class)
+ public boolean run(SysJob job) throws SchedulerException
{
+ boolean result = false;
Long jobId = job.getJobId();
String jobGroup = job.getJobGroup();
SysJob properties = selectJobById(job.getJobId());
// 鍙傛暟
JobDataMap dataMap = new JobDataMap();
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
- scheduler.triggerJob(ScheduleUtils.getJobKey(jobId, jobGroup), dataMap);
+ JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
+ if (scheduler.checkExists(jobKey))
+ {
+ result = true;
+ scheduler.triggerJob(jobKey, dataMap);
+ }
+ return result;
}
/**
@@ -191,7 +198,7 @@
* @param job 璋冨害淇℃伅 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int insertJob(SysJob job) throws SchedulerException, TaskException
{
job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
@@ -209,7 +216,7 @@
* @param job 璋冨害淇℃伅
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int updateJob(SysJob job) throws SchedulerException, TaskException
{
SysJob properties = selectJobById(job.getJobId());
--
Gitblit v1.9.3