From 91394ef32e8d25154aaa546a9d19af66f8e87cf5 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 25 Sep 2025 15:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E4=BB=BB=E5=8A=A1=E8=A1=A8?= =?UTF-8?q?=20=E5=AE=9A=E6=97=B6=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/controller/JobCallBackController.java | 9 ++++- .../ruoyi/job/mapper/JobCallBackMapper.java | 18 +++++---- .../job/service/IJobCallBackService.java | 2 + .../service/impl/JobCallBackServiceImpl.java | 40 +++++++++++++++---- .../mapper/job/JobCallBackMapper.xml | 14 ++++--- 5 files changed, 61 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java index 49c3cfa..2a8e464 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/JobCallBackController.java @@ -2,6 +2,8 @@ package com.ruoyi.job.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 任务完成回传Controller - * + * * @author ruoyi * @date 2025-09-25 */ @@ -101,4 +103,9 @@ public class JobCallBackController extends BaseController { return toAjax(jobCallBackService.deleteJobCallBackByIds(ids)); } + + @Scheduled(fixedDelay=1500) + public void jobCallBack() { + jobCallBackService.jobCallBack(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/JobCallBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/JobCallBackMapper.java index c51d806..163c6f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/JobCallBackMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/JobCallBackMapper.java @@ -5,15 +5,15 @@ import com.ruoyi.job.domain.JobCallBack; /** * 任务完成回传Mapper接口 - * + * * @author ruoyi * @date 2025-09-25 */ -public interface JobCallBackMapper +public interface JobCallBackMapper { /** * 查询任务完成回传 - * + * * @param id 任务完成回传主键 * @return 任务完成回传 */ @@ -21,7 +21,7 @@ public interface JobCallBackMapper /** * 查询任务完成回传列表 - * + * * @param jobCallBack 任务完成回传 * @return 任务完成回传集合 */ @@ -29,7 +29,7 @@ public interface JobCallBackMapper /** * 新增任务完成回传 - * + * * @param jobCallBack 任务完成回传 * @return 结果 */ @@ -37,7 +37,7 @@ public interface JobCallBackMapper /** * 修改任务完成回传 - * + * * @param jobCallBack 任务完成回传 * @return 结果 */ @@ -45,7 +45,7 @@ public interface JobCallBackMapper /** * 删除任务完成回传 - * + * * @param id 任务完成回传主键 * @return 结果 */ @@ -53,9 +53,11 @@ public interface JobCallBackMapper /** * 批量删除任务完成回传 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ public int deleteJobCallBackByIds(Long[] ids); + + List selectJobCallBackListNoSuccess(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IJobCallBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IJobCallBackService.java index d303fe0..388beb3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IJobCallBackService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IJobCallBackService.java @@ -58,4 +58,6 @@ public interface IJobCallBackService * @return 结果 */ public int deleteJobCallBackById(Long id); + + void jobCallBack(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java index de3fca7..52c14fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/JobCallBackServiceImpl.java @@ -1,7 +1,13 @@ package com.ruoyi.job.service.impl; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import com.ruoyi.api.domain.RequestLog; +import com.ruoyi.api.service.IApiService; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.job.domain.MydoJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.job.mapper.JobCallBackMapper; @@ -10,19 +16,21 @@ import com.ruoyi.job.service.IJobCallBackService; /** * 任务完成回传Service业务层处理 - * + * * @author ruoyi * @date 2025-09-25 */ @Service -public class JobCallBackServiceImpl implements IJobCallBackService +public class JobCallBackServiceImpl implements IJobCallBackService { @Autowired private JobCallBackMapper jobCallBackMapper; + @Autowired + private IApiService apiService; /** * 查询任务完成回传 - * + * * @param id 任务完成回传主键 * @return 任务完成回传 */ @@ -34,7 +42,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService /** * 查询任务完成回传列表 - * + * * @param jobCallBack 任务完成回传 * @return 任务完成回传 */ @@ -46,7 +54,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService /** * 新增任务完成回传 - * + * * @param jobCallBack 任务完成回传 * @return 结果 */ @@ -59,7 +67,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService /** * 修改任务完成回传 - * + * * @param jobCallBack 任务完成回传 * @return 结果 */ @@ -71,7 +79,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService /** * 批量删除任务完成回传 - * + * * @param ids 需要删除的任务完成回传主键 * @return 结果 */ @@ -83,7 +91,7 @@ public class JobCallBackServiceImpl implements IJobCallBackService /** * 删除任务完成回传信息 - * + * * @param id 任务完成回传主键 * @return 结果 */ @@ -92,4 +100,20 @@ public class JobCallBackServiceImpl implements IJobCallBackService { return jobCallBackMapper.deleteJobCallBackById(id); } + + @Override + public void jobCallBack() { + List jobCallBackList = jobCallBackMapper.selectJobCallBackListNoSuccess(); + for (JobCallBack jobCallBack : jobCallBackList) { + Map param = new HashMap<>(); + param.put("jobId", jobCallBack.getMydojobId()); + param.put("taskNo", jobCallBack.getTaskNo()); + param.put("type", jobCallBack.getType()); + RequestLog requestLog = apiService.finishMydoJob(param); + if ("1".equals(requestLog.getIsSuccessful())){ + jobCallBack.setStatus("1"); + jobCallBackMapper.updateJobCallBack(jobCallBack); + } + } + } } diff --git a/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml index 68b5285..4023f7d 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/JobCallBackMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into job_call_back @@ -82,9 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from job_call_back where id in + delete from job_call_back where id in #{id} - \ No newline at end of file +