diff --git a/measurement/src/main/java/com/ruoyi/operation/controller/OutInPoundController.java b/measurement/src/main/java/com/ruoyi/operation/controller/OutInPoundController.java index d978f6e..3dbabed 100644 --- a/measurement/src/main/java/com/ruoyi/operation/controller/OutInPoundController.java +++ b/measurement/src/main/java/com/ruoyi/operation/controller/OutInPoundController.java @@ -6,6 +6,11 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.bill.service.IPoundBillService; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.service.ISysJobService; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.util.Util; +import org.quartz.SchedulerException; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -37,6 +42,15 @@ public class OutInPoundController extends BaseController @Autowired private IPoundBillService poundBillService; + @Autowired + private ISysJobService jobService; + + @Autowired + private ISysConfigService sysConfigService; + + @Autowired + private Util util; + /** * 查询磅单信息列表 */ @@ -105,4 +119,15 @@ public class OutInPoundController extends BaseController List list = Arrays.asList(ids); return toAjax(poundBillService.removeByIds(list)); } + + /** + * 定时任务同步 + */ + @PostMapping("/synchronizeData") + public AjaxResult synchronizeData() throws SchedulerException + { + String s = sysConfigService.selectConfigByKey("synchronizeData"); + boolean b = util.synchronizeData(s); + return b?success():error("任务不存在或已过期"); + } } diff --git a/measurement/src/main/java/com/ruoyi/util/Util.java b/measurement/src/main/java/com/ruoyi/util/Util.java index f8aadca..388d128 100644 --- a/measurement/src/main/java/com/ruoyi/util/Util.java +++ b/measurement/src/main/java/com/ruoyi/util/Util.java @@ -3,7 +3,10 @@ package com.ruoyi.util; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.quartz.domain.SysJob; +import com.ruoyi.quartz.service.ISysJobService; import com.ruoyi.system.service.ISysDictTypeService; +import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -13,6 +16,8 @@ import java.util.List; public class Util { @Autowired private ISysDictTypeService dictTypeService; + @Autowired + private ISysJobService jobService; /** * 根据字典类型获取字典所有标签 @@ -57,4 +62,17 @@ public class Util { String dictValue = DictUtils.getDictValue(dictType, label); return dictValue; } + + public boolean synchronizeData(String param) throws SchedulerException { + SysJob sysJob = new SysJob(); + sysJob.setInvokeTarget(param); + sysJob.setMisfirePolicy("0"); + List list = jobService.selectJobList(sysJob); + if (list.size()!=0) { + sysJob.setJobId(list.get(0).getJobId()); + sysJob.setJobGroup(list.get(0).getJobGroup()); + return jobService.run(sysJob); + } + return false; + } } diff --git a/ruoyi-ui/src/api/measurement/operation/outinpound.js b/ruoyi-ui/src/api/measurement/operation/outinpound.js index 1039f43..f7d9c17 100644 --- a/ruoyi-ui/src/api/measurement/operation/outinpound.js +++ b/ruoyi-ui/src/api/measurement/operation/outinpound.js @@ -42,3 +42,11 @@ export function delOutinpound(id) { method: 'delete' }) } + +// 查询定时任务调度列表 +export function synchronizeData() { + return request({ + url: '/measurement/operation/outinpound/synchronizeData', + method: 'post' + }) +} diff --git a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue index bf189b0..f7691d3 100644 --- a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue @@ -481,7 +481,7 @@