回传任务表 定时回传

This commit is contained in:
liuhanqing
2025-09-25 15:57:49 +08:00
parent 535ef2fd6b
commit 91394ef32e
5 changed files with 61 additions and 22 deletions

View File

@@ -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();
}
}

View File

@@ -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<JobCallBack> selectJobCallBackListNoSuccess();
}

View File

@@ -58,4 +58,6 @@ public interface IJobCallBackService
* @return 结果
*/
public int deleteJobCallBackById(Long id);
void jobCallBack();
}

View File

@@ -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<JobCallBack> jobCallBackList = jobCallBackMapper.selectJobCallBackListNoSuccess();
for (JobCallBack jobCallBack : jobCallBackList) {
Map<String, Object> 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);
}
}
}
}

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.job.mapper.JobCallBackMapper">
<resultMap type="JobCallBack" id="JobCallBackResult">
<result property="id" column="id" />
<result property="type" column="type" />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectJobCallBackList" parameterType="JobCallBack" resultMap="JobCallBackResult">
<include refid="selectJobCallBackVo"/>
<where>
<where>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="taskNo != null "> and task_no = #{taskNo}</if>
<if test="mydojobId != null and mydojobId != ''"> and mydojob_id = #{mydojobId}</if>
@@ -32,11 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
</where>
</select>
<select id="selectJobCallBackById" parameterType="Long" resultMap="JobCallBackResult">
<include refid="selectJobCallBackVo"/>
where id = #{id}
</select>
<select id="selectJobCallBackListNoSuccess" resultMap="JobCallBackResult">
<include refid="selectJobCallBackVo"/>
where status != '1'
</select>
<insert id="insertJobCallBack" parameterType="JobCallBack" useGeneratedKeys="true" keyProperty="id">
insert into job_call_back
@@ -82,9 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteJobCallBackByIds" parameterType="String">
delete from job_call_back where id in
delete from job_call_back where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
</mapper>