master：每日销售额统计功能；每日档口客户、商品销售额统计功能完善；
liujiang
parent
eaa3d2464c
commit
56f22d1e5d
|
|
@ -35,6 +35,14 @@
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>ruoyi-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 鞋库通 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.ruoyi</groupId>
|
||||||
|
<artifactId>xkt</artifactId>
|
||||||
|
<version>${ruoyi.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
package com.ruoyi.quartz.controller;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.domain.R;
|
||||||
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
import com.ruoyi.quartz.task.XktTask;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调度任务信息操作处理
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/rest/v1/daily-sale")
|
||||||
|
public class DailySaleController extends BaseController {
|
||||||
|
|
||||||
|
final XktTask task;
|
||||||
|
|
||||||
|
@PostMapping("")
|
||||||
|
public R dailySale(SysJob sysJob) {
|
||||||
|
task.dailySale();
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/prod")
|
||||||
|
public R dailySaleProd(SysJob sysJob) {
|
||||||
|
task.dailySaleProduct();
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/cus")
|
||||||
|
public R dailySaleCus(SysJob sysJob) {
|
||||||
|
task.dailySaleCustomer();
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,18 +1,5 @@
|
||||||
package com.ruoyi.quartz.controller;
|
package com.ruoyi.quartz.controller;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import org.quartz.SchedulerException;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.constant.Constants;
|
import com.ruoyi.common.constant.Constants;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
|
|
@ -26,16 +13,22 @@ import com.ruoyi.quartz.domain.SysJob;
|
||||||
import com.ruoyi.quartz.service.ISysJobService;
|
import com.ruoyi.quartz.service.ISysJobService;
|
||||||
import com.ruoyi.quartz.util.CronUtils;
|
import com.ruoyi.quartz.util.CronUtils;
|
||||||
import com.ruoyi.quartz.util.ScheduleUtils;
|
import com.ruoyi.quartz.util.ScheduleUtils;
|
||||||
|
import org.quartz.SchedulerException;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调度任务信息操作处理
|
* 调度任务信息操作处理
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/monitor/job")
|
@RequestMapping("/monitor/job")
|
||||||
public class SysJobController extends BaseController
|
public class SysJobController extends BaseController {
|
||||||
{
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysJobService jobService;
|
private ISysJobService jobService;
|
||||||
|
|
||||||
|
|
@ -44,8 +37,7 @@ public class SysJobController extends BaseController
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(SysJob sysJob)
|
public TableDataInfo list(SysJob sysJob) {
|
||||||
{
|
|
||||||
startPage();
|
startPage();
|
||||||
List<SysJob> list = jobService.selectJobList(sysJob);
|
List<SysJob> list = jobService.selectJobList(sysJob);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
|
|
@ -57,8 +49,7 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:export')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:export')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.EXPORT)
|
@Log(title = "定时任务", businessType = BusinessType.EXPORT)
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(HttpServletResponse response, SysJob sysJob)
|
public void export(HttpServletResponse response, SysJob sysJob) {
|
||||||
{
|
|
||||||
List<SysJob> list = jobService.selectJobList(sysJob);
|
List<SysJob> list = jobService.selectJobList(sysJob);
|
||||||
ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
|
ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
|
||||||
util.exportExcel(response, list, "定时任务");
|
util.exportExcel(response, list, "定时任务");
|
||||||
|
|
@ -69,8 +60,7 @@ public class SysJobController extends BaseController
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
|
||||||
@GetMapping(value = "/{jobId}")
|
@GetMapping(value = "/{jobId}")
|
||||||
public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
|
public AjaxResult getInfo(@PathVariable("jobId") Long jobId) {
|
||||||
{
|
|
||||||
return success(jobService.selectJobById(jobId));
|
return success(jobService.selectJobById(jobId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -80,30 +70,18 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:add')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:add')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.INSERT)
|
@Log(title = "定时任务", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
|
public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
|
||||||
{
|
if (!CronUtils.isValid(job.getCronExpression())) {
|
||||||
if (!CronUtils.isValid(job.getCronExpression()))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
|
return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
|
||||||
}
|
} else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
|
||||||
else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
|
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
|
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
|
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
|
return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
|
||||||
}
|
} else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
|
||||||
else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
|
|
||||||
{
|
|
||||||
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
|
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
|
||||||
}
|
}
|
||||||
job.setCreateBy(getUsername());
|
job.setCreateBy(getUsername());
|
||||||
|
|
@ -116,30 +94,18 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
|
public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
|
||||||
{
|
if (!CronUtils.isValid(job.getCronExpression())) {
|
||||||
if (!CronUtils.isValid(job.getCronExpression()))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
|
return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
|
||||||
}
|
} else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
|
||||||
else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
|
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
|
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
|
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
|
||||||
}
|
} else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
|
||||||
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
|
return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
|
||||||
}
|
} else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
|
||||||
else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
|
|
||||||
{
|
|
||||||
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
|
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
|
||||||
}
|
}
|
||||||
job.setUpdateBy(getUsername());
|
job.setUpdateBy(getUsername());
|
||||||
|
|
@ -152,8 +118,7 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/changeStatus")
|
@PutMapping("/changeStatus")
|
||||||
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
|
public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
SysJob newJob = jobService.selectJobById(job.getJobId());
|
SysJob newJob = jobService.selectJobById(job.getJobId());
|
||||||
newJob.setStatus(job.getStatus());
|
newJob.setStatus(job.getStatus());
|
||||||
return toAjax(jobService.changeStatus(newJob));
|
return toAjax(jobService.changeStatus(newJob));
|
||||||
|
|
@ -165,8 +130,7 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
@Log(title = "定时任务", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/run")
|
@PutMapping("/run")
|
||||||
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
|
public AjaxResult run(@RequestBody SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
boolean result = jobService.run(job);
|
boolean result = jobService.run(job);
|
||||||
return result ? success() : error("任务不存在或已过期！");
|
return result ? success() : error("任务不存在或已过期！");
|
||||||
}
|
}
|
||||||
|
|
@ -177,8 +141,7 @@ public class SysJobController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
||||||
@Log(title = "定时任务", businessType = BusinessType.DELETE)
|
@Log(title = "定时任务", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/{jobIds}")
|
@DeleteMapping("/{jobIds}")
|
||||||
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
|
public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
jobService.deleteJobByIds(jobIds);
|
jobService.deleteJobByIds(jobIds);
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,5 @@
|
||||||
package com.ruoyi.quartz.controller;
|
package com.ruoyi.quartz.controller;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
|
@ -18,16 +8,21 @@ import com.ruoyi.common.enums.BusinessType;
|
||||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||||
import com.ruoyi.quartz.domain.SysJobLog;
|
import com.ruoyi.quartz.domain.SysJobLog;
|
||||||
import com.ruoyi.quartz.service.ISysJobLogService;
|
import com.ruoyi.quartz.service.ISysJobLogService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调度日志操作处理
|
* 调度日志操作处理
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/monitor/jobLog")
|
@RequestMapping("/monitor/jobLog")
|
||||||
public class SysJobLogController extends BaseController
|
public class SysJobLogController extends BaseController {
|
||||||
{
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysJobLogService jobLogService;
|
private ISysJobLogService jobLogService;
|
||||||
|
|
||||||
|
|
@ -36,8 +31,7 @@ public class SysJobLogController extends BaseController
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(SysJobLog sysJobLog)
|
public TableDataInfo list(SysJobLog sysJobLog) {
|
||||||
{
|
|
||||||
startPage();
|
startPage();
|
||||||
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
|
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
|
|
@ -49,20 +43,18 @@ public class SysJobLogController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:export')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:export')")
|
||||||
@Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
|
@Log(title = "任务调度日志", businessType = BusinessType.EXPORT)
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(HttpServletResponse response, SysJobLog sysJobLog)
|
public void export(HttpServletResponse response, SysJobLog sysJobLog) {
|
||||||
{
|
|
||||||
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
|
List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
|
||||||
ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
|
ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
|
||||||
util.exportExcel(response, list, "调度日志");
|
util.exportExcel(response, list, "调度日志");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据调度编号获取详细信息
|
* 根据调度编号获取详细信息
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
|
||||||
@GetMapping(value = "/{jobLogId}")
|
@GetMapping(value = "/{jobLogId}")
|
||||||
public AjaxResult getInfo(@PathVariable Long jobLogId)
|
public AjaxResult getInfo(@PathVariable Long jobLogId) {
|
||||||
{
|
|
||||||
return success(jobLogService.selectJobLogById(jobLogId));
|
return success(jobLogService.selectJobLogById(jobLogId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -73,8 +65,7 @@ public class SysJobLogController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
||||||
@Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
|
@Log(title = "定时任务调度日志", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/{jobLogIds}")
|
@DeleteMapping("/{jobLogIds}")
|
||||||
public AjaxResult remove(@PathVariable Long[] jobLogIds)
|
public AjaxResult remove(@PathVariable Long[] jobLogIds) {
|
||||||
{
|
|
||||||
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
|
return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,8 +75,7 @@ public class SysJobLogController extends BaseController
|
||||||
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
|
||||||
@Log(title = "调度日志", businessType = BusinessType.CLEAN)
|
@Log(title = "调度日志", businessType = BusinessType.CLEAN)
|
||||||
@DeleteMapping("/clean")
|
@DeleteMapping("/clean")
|
||||||
public AjaxResult clean()
|
public AjaxResult clean() {
|
||||||
{
|
|
||||||
jobLogService.cleanJobLog();
|
jobLogService.cleanJobLog();
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
package com.ruoyi.quartz.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.ruoyi.common.annotation.Excel;
|
||||||
|
import com.ruoyi.common.core.domain.XktBaseEntity;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口每天销售数据统计 daily_sale
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
* @date 2025-03-26
|
||||||
|
*/
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public class DailySale extends XktBaseEntity {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每日销售统计ID
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
private Long storeId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
/**
|
||||||
|
* 拿货客户数量（人次）
|
||||||
|
*/
|
||||||
|
private Integer customerNum;
|
||||||
|
/**
|
||||||
|
* 入库数量
|
||||||
|
*/
|
||||||
|
private Integer storageNum;
|
||||||
|
/**
|
||||||
|
* 统计时间
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private Date voucherDate;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
package com.ruoyi.quartz.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.ruoyi.common.core.domain.XktBaseEntity;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口客户每天销售数据统计 daily_sale_customer
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
* @date 2025-03-26
|
||||||
|
*/
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public class DailySaleCustomer extends XktBaseEntity {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每日销售统计ID
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
private Long storeId;
|
||||||
|
/**
|
||||||
|
* 档口客户ID
|
||||||
|
*/
|
||||||
|
private Long storeCusId;
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
/**
|
||||||
|
* 统计时间
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private Date voucherDate;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
package com.ruoyi.quartz.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.ruoyi.common.annotation.Excel;
|
||||||
|
import com.ruoyi.common.core.domain.XktBaseEntity;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口客户每天销售数据统计 daily_sale_customer
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
* @date 2025-03-26
|
||||||
|
*/
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@Data
|
||||||
|
@Accessors(chain = true)
|
||||||
|
public class DailySaleProduct extends XktBaseEntity {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
/**
|
||||||
|
* 档口销售出库ID
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
@Excel(name = "档口ID")
|
||||||
|
private Long storeId;
|
||||||
|
/**
|
||||||
|
* 档口商品ID
|
||||||
|
*/
|
||||||
|
private Long storeProdId;
|
||||||
|
/**
|
||||||
|
* 档口商品货号
|
||||||
|
*/
|
||||||
|
private String prodArtNum;
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
/**
|
||||||
|
* 统计时间
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private Date voucherDate;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,5 @@
|
||||||
package com.ruoyi.quartz.domain;
|
package com.ruoyi.quartz.domain;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import javax.validation.constraints.NotBlank;
|
|
||||||
import javax.validation.constraints.Size;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.annotation.Excel.ColumnType;
|
import com.ruoyi.common.annotation.Excel.ColumnType;
|
||||||
|
|
@ -12,160 +7,163 @@ import com.ruoyi.common.constant.ScheduleConstants;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.quartz.util.CronUtils;
|
import com.ruoyi.quartz.util.CronUtils;
|
||||||
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
import javax.validation.constraints.Size;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度表 sys_job
|
* 定时任务调度表 sys_job
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class SysJob extends BaseEntity
|
public class SysJob extends BaseEntity {
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 任务ID */
|
/**
|
||||||
|
* 任务ID
|
||||||
|
*/
|
||||||
@Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
|
@Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
|
||||||
private Long jobId;
|
private Long jobId;
|
||||||
|
|
||||||
/** 任务名称 */
|
/**
|
||||||
|
* 任务名称
|
||||||
|
*/
|
||||||
@Excel(name = "任务名称")
|
@Excel(name = "任务名称")
|
||||||
private String jobName;
|
private String jobName;
|
||||||
|
|
||||||
/** 任务组名 */
|
/**
|
||||||
|
* 任务组名
|
||||||
|
*/
|
||||||
@Excel(name = "任务组名")
|
@Excel(name = "任务组名")
|
||||||
private String jobGroup;
|
private String jobGroup;
|
||||||
|
|
||||||
/** 调用目标字符串 */
|
/**
|
||||||
|
* 调用目标字符串
|
||||||
|
*/
|
||||||
@Excel(name = "调用目标字符串")
|
@Excel(name = "调用目标字符串")
|
||||||
private String invokeTarget;
|
private String invokeTarget;
|
||||||
|
|
||||||
/** cron执行表达式 */
|
/**
|
||||||
|
* cron执行表达式
|
||||||
|
*/
|
||||||
@Excel(name = "执行表达式 ")
|
@Excel(name = "执行表达式 ")
|
||||||
private String cronExpression;
|
private String cronExpression;
|
||||||
|
|
||||||
/** cron计划策略 */
|
/**
|
||||||
|
* cron计划策略
|
||||||
|
*/
|
||||||
@Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
|
@Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行")
|
||||||
private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
|
private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
|
||||||
|
|
||||||
/** 是否并发执行（0允许 1禁止） */
|
/**
|
||||||
|
* 是否并发执行（0允许 1禁止）
|
||||||
|
*/
|
||||||
@Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
|
@Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止")
|
||||||
private String concurrent;
|
private String concurrent;
|
||||||
|
|
||||||
/** 任务状态（0正常 1暂停） */
|
/**
|
||||||
|
* 任务状态（0正常 1暂停）
|
||||||
|
*/
|
||||||
@Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
|
@Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
public Long getJobId()
|
public Long getJobId() {
|
||||||
{
|
|
||||||
return jobId;
|
return jobId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobId(Long jobId)
|
public void setJobId(Long jobId) {
|
||||||
{
|
|
||||||
this.jobId = jobId;
|
this.jobId = jobId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotBlank(message = "任务名称不能为空")
|
@NotBlank(message = "任务名称不能为空")
|
||||||
@Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
|
@Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
|
||||||
public String getJobName()
|
public String getJobName() {
|
||||||
{
|
|
||||||
return jobName;
|
return jobName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobName(String jobName)
|
public void setJobName(String jobName) {
|
||||||
{
|
|
||||||
this.jobName = jobName;
|
this.jobName = jobName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getJobGroup()
|
public String getJobGroup() {
|
||||||
{
|
|
||||||
return jobGroup;
|
return jobGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobGroup(String jobGroup)
|
public void setJobGroup(String jobGroup) {
|
||||||
{
|
|
||||||
this.jobGroup = jobGroup;
|
this.jobGroup = jobGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotBlank(message = "调用目标字符串不能为空")
|
@NotBlank(message = "调用目标字符串不能为空")
|
||||||
@Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
|
@Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
|
||||||
public String getInvokeTarget()
|
public String getInvokeTarget() {
|
||||||
{
|
|
||||||
return invokeTarget;
|
return invokeTarget;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInvokeTarget(String invokeTarget)
|
public void setInvokeTarget(String invokeTarget) {
|
||||||
{
|
|
||||||
this.invokeTarget = invokeTarget;
|
this.invokeTarget = invokeTarget;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotBlank(message = "Cron执行表达式不能为空")
|
@NotBlank(message = "Cron执行表达式不能为空")
|
||||||
@Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
|
@Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
|
||||||
public String getCronExpression()
|
public String getCronExpression() {
|
||||||
{
|
|
||||||
return cronExpression;
|
return cronExpression;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCronExpression(String cronExpression)
|
public void setCronExpression(String cronExpression) {
|
||||||
{
|
|
||||||
this.cronExpression = cronExpression;
|
this.cronExpression = cronExpression;
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
public Date getNextValidTime()
|
public Date getNextValidTime() {
|
||||||
{
|
if (StringUtils.isNotEmpty(cronExpression)) {
|
||||||
if (StringUtils.isNotEmpty(cronExpression))
|
|
||||||
{
|
|
||||||
return CronUtils.getNextExecution(cronExpression);
|
return CronUtils.getNextExecution(cronExpression);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMisfirePolicy()
|
public String getMisfirePolicy() {
|
||||||
{
|
|
||||||
return misfirePolicy;
|
return misfirePolicy;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setMisfirePolicy(String misfirePolicy)
|
public void setMisfirePolicy(String misfirePolicy) {
|
||||||
{
|
|
||||||
this.misfirePolicy = misfirePolicy;
|
this.misfirePolicy = misfirePolicy;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getConcurrent()
|
public String getConcurrent() {
|
||||||
{
|
|
||||||
return concurrent;
|
return concurrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setConcurrent(String concurrent)
|
public void setConcurrent(String concurrent) {
|
||||||
{
|
|
||||||
this.concurrent = concurrent;
|
this.concurrent = concurrent;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStatus()
|
public String getStatus() {
|
||||||
{
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(String status)
|
public void setStatus(String status) {
|
||||||
{
|
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||||
.append("jobId", getJobId())
|
.append("jobId", getJobId())
|
||||||
.append("jobName", getJobName())
|
.append("jobName", getJobName())
|
||||||
.append("jobGroup", getJobGroup())
|
.append("jobGroup", getJobGroup())
|
||||||
.append("cronExpression", getCronExpression())
|
.append("cronExpression", getCronExpression())
|
||||||
.append("nextValidTime", getNextValidTime())
|
.append("nextValidTime", getNextValidTime())
|
||||||
.append("misfirePolicy", getMisfirePolicy())
|
.append("misfirePolicy", getMisfirePolicy())
|
||||||
.append("concurrent", getConcurrent())
|
.append("concurrent", getConcurrent())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("createBy", getCreateBy())
|
.append("createBy", getCreateBy())
|
||||||
.append("createTime", getCreateTime())
|
.append("createTime", getCreateTime())
|
||||||
.append("updateBy", getUpdateBy())
|
.append("updateBy", getUpdateBy())
|
||||||
.append("updateTime", getUpdateTime())
|
.append("updateTime", getUpdateTime())
|
||||||
.append("remark", getRemark())
|
.append("remark", getRemark())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,155 +1,155 @@
|
||||||
package com.ruoyi.quartz.domain;
|
package com.ruoyi.quartz.domain;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度日志表 sys_job_log
|
* 定时任务调度日志表 sys_job_log
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class SysJobLog extends BaseEntity
|
public class SysJobLog extends BaseEntity {
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** ID */
|
/**
|
||||||
|
* ID
|
||||||
|
*/
|
||||||
@Excel(name = "日志序号")
|
@Excel(name = "日志序号")
|
||||||
private Long jobLogId;
|
private Long jobLogId;
|
||||||
|
|
||||||
/** 任务名称 */
|
/**
|
||||||
|
* 任务名称
|
||||||
|
*/
|
||||||
@Excel(name = "任务名称")
|
@Excel(name = "任务名称")
|
||||||
private String jobName;
|
private String jobName;
|
||||||
|
|
||||||
/** 任务组名 */
|
/**
|
||||||
|
* 任务组名
|
||||||
|
*/
|
||||||
@Excel(name = "任务组名")
|
@Excel(name = "任务组名")
|
||||||
private String jobGroup;
|
private String jobGroup;
|
||||||
|
|
||||||
/** 调用目标字符串 */
|
/**
|
||||||
|
* 调用目标字符串
|
||||||
|
*/
|
||||||
@Excel(name = "调用目标字符串")
|
@Excel(name = "调用目标字符串")
|
||||||
private String invokeTarget;
|
private String invokeTarget;
|
||||||
|
|
||||||
/** 日志信息 */
|
/**
|
||||||
|
* 日志信息
|
||||||
|
*/
|
||||||
@Excel(name = "日志信息")
|
@Excel(name = "日志信息")
|
||||||
private String jobMessage;
|
private String jobMessage;
|
||||||
|
|
||||||
/** 执行状态（0正常 1失败） */
|
/**
|
||||||
|
* 执行状态（0正常 1失败）
|
||||||
|
*/
|
||||||
@Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
|
@Excel(name = "执行状态", readConverterExp = "0=正常,1=失败")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
/** 异常信息 */
|
/**
|
||||||
|
* 异常信息
|
||||||
|
*/
|
||||||
@Excel(name = "异常信息")
|
@Excel(name = "异常信息")
|
||||||
private String exceptionInfo;
|
private String exceptionInfo;
|
||||||
|
|
||||||
/** 开始时间 */
|
/**
|
||||||
|
* 开始时间
|
||||||
|
*/
|
||||||
private Date startTime;
|
private Date startTime;
|
||||||
|
|
||||||
/** 停止时间 */
|
/**
|
||||||
|
* 停止时间
|
||||||
|
*/
|
||||||
private Date stopTime;
|
private Date stopTime;
|
||||||
|
|
||||||
public Long getJobLogId()
|
public Long getJobLogId() {
|
||||||
{
|
|
||||||
return jobLogId;
|
return jobLogId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobLogId(Long jobLogId)
|
public void setJobLogId(Long jobLogId) {
|
||||||
{
|
|
||||||
this.jobLogId = jobLogId;
|
this.jobLogId = jobLogId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getJobName()
|
public String getJobName() {
|
||||||
{
|
|
||||||
return jobName;
|
return jobName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobName(String jobName)
|
public void setJobName(String jobName) {
|
||||||
{
|
|
||||||
this.jobName = jobName;
|
this.jobName = jobName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getJobGroup()
|
public String getJobGroup() {
|
||||||
{
|
|
||||||
return jobGroup;
|
return jobGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobGroup(String jobGroup)
|
public void setJobGroup(String jobGroup) {
|
||||||
{
|
|
||||||
this.jobGroup = jobGroup;
|
this.jobGroup = jobGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getInvokeTarget()
|
public String getInvokeTarget() {
|
||||||
{
|
|
||||||
return invokeTarget;
|
return invokeTarget;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInvokeTarget(String invokeTarget)
|
public void setInvokeTarget(String invokeTarget) {
|
||||||
{
|
|
||||||
this.invokeTarget = invokeTarget;
|
this.invokeTarget = invokeTarget;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getJobMessage()
|
public String getJobMessage() {
|
||||||
{
|
|
||||||
return jobMessage;
|
return jobMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setJobMessage(String jobMessage)
|
public void setJobMessage(String jobMessage) {
|
||||||
{
|
|
||||||
this.jobMessage = jobMessage;
|
this.jobMessage = jobMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getStatus()
|
public String getStatus() {
|
||||||
{
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStatus(String status)
|
public void setStatus(String status) {
|
||||||
{
|
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getExceptionInfo()
|
public String getExceptionInfo() {
|
||||||
{
|
|
||||||
return exceptionInfo;
|
return exceptionInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setExceptionInfo(String exceptionInfo)
|
public void setExceptionInfo(String exceptionInfo) {
|
||||||
{
|
|
||||||
this.exceptionInfo = exceptionInfo;
|
this.exceptionInfo = exceptionInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getStartTime()
|
public Date getStartTime() {
|
||||||
{
|
|
||||||
return startTime;
|
return startTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStartTime(Date startTime)
|
public void setStartTime(Date startTime) {
|
||||||
{
|
|
||||||
this.startTime = startTime;
|
this.startTime = startTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getStopTime()
|
public Date getStopTime() {
|
||||||
{
|
|
||||||
return stopTime;
|
return stopTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setStopTime(Date stopTime)
|
public void setStopTime(Date stopTime) {
|
||||||
{
|
|
||||||
this.stopTime = stopTime;
|
this.stopTime = stopTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||||
.append("jobLogId", getJobLogId())
|
.append("jobLogId", getJobLogId())
|
||||||
.append("jobName", getJobName())
|
.append("jobName", getJobName())
|
||||||
.append("jobGroup", getJobGroup())
|
.append("jobGroup", getJobGroup())
|
||||||
.append("jobMessage", getJobMessage())
|
.append("jobMessage", getJobMessage())
|
||||||
.append("status", getStatus())
|
.append("status", getStatus())
|
||||||
.append("exceptionInfo", getExceptionInfo())
|
.append("exceptionInfo", getExceptionInfo())
|
||||||
.append("startTime", getStartTime())
|
.append("startTime", getStartTime())
|
||||||
.append("stopTime", getStopTime())
|
.append("stopTime", getStopTime())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
package com.ruoyi.quartz.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liujiang
|
||||||
|
* @version v1.0
|
||||||
|
* @date 2025/4/16 23:06
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class DailySaleCusDTO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
private Long storeId;
|
||||||
|
/**
|
||||||
|
* 档口客户ID
|
||||||
|
*/
|
||||||
|
private Long storeCusId;
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
package com.ruoyi.quartz.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liujiang
|
||||||
|
* @version v1.0
|
||||||
|
* @date 2025/4/16 23:06
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class DailySaleDTO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
private Long storeId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
/**
|
||||||
|
* 拿货客户数量（人次）
|
||||||
|
*/
|
||||||
|
private Integer customerNum;
|
||||||
|
/**
|
||||||
|
* 入库数量
|
||||||
|
*/
|
||||||
|
private Integer storageNum;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
package com.ruoyi.quartz.dto;
|
||||||
|
|
||||||
|
import com.ruoyi.common.annotation.Excel;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author liujiang
|
||||||
|
* @version v1.0
|
||||||
|
* @date 2025/4/16 23:06
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class DailySaleProdDTO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 档口ID
|
||||||
|
*/
|
||||||
|
private Long storeId;
|
||||||
|
/**
|
||||||
|
* 档口商品ID
|
||||||
|
*/
|
||||||
|
private Long storeProdId;
|
||||||
|
/**
|
||||||
|
* 档口商品货号
|
||||||
|
*/
|
||||||
|
private String prodArtNum;
|
||||||
|
/**
|
||||||
|
* 销售金额
|
||||||
|
*/
|
||||||
|
private BigDecimal saleAmount;
|
||||||
|
/**
|
||||||
|
* 退货金额
|
||||||
|
*/
|
||||||
|
private BigDecimal returnAmount;
|
||||||
|
/**
|
||||||
|
* 销售数量
|
||||||
|
*/
|
||||||
|
private Integer saleNum;
|
||||||
|
/**
|
||||||
|
* 退货数量
|
||||||
|
*/
|
||||||
|
private Integer returnNum;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
package com.ruoyi.quartz.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.ruoyi.quartz.domain.DailySaleCustomer;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleCusDTO;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调度任务信息 数据层
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
public interface DailySaleCustomerMapper extends BaseMapper<DailySaleCustomer> {
|
||||||
|
|
||||||
|
List<DailySaleCusDTO> selectDailySale(Date voucherDate);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
package com.ruoyi.quartz.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.ruoyi.quartz.domain.DailySale;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleDTO;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调度任务信息 数据层
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
public interface DailySaleMapper extends BaseMapper<DailySale> {
|
||||||
|
|
||||||
|
List<DailySaleDTO> selectDailySale(Date voucherDate);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
package com.ruoyi.quartz.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.ruoyi.quartz.domain.DailySaleCustomer;
|
||||||
|
import com.ruoyi.quartz.domain.DailySaleProduct;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleDTO;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleProdDTO;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 调度任务信息 数据层
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
public interface DailySaleProductMapper extends BaseMapper<DailySaleProduct> {
|
||||||
|
|
||||||
|
List<DailySaleProdDTO> selectDailySale(Date voucherDate);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
package com.ruoyi.quartz.mapper;
|
package com.ruoyi.quartz.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import com.ruoyi.quartz.domain.SysJobLog;
|
import com.ruoyi.quartz.domain.SysJobLog;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调度任务日志信息 数据层
|
* 调度任务日志信息 数据层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public interface SysJobLogMapper
|
public interface SysJobLogMapper {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 获取quartz调度器日志的计划任务
|
* 获取quartz调度器日志的计划任务
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
* @return 调度任务日志集合
|
* @return 调度任务日志集合
|
||||||
*/
|
*/
|
||||||
|
|
@ -27,7 +27,7 @@ public interface SysJobLogMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度任务日志ID查询调度信息
|
* 通过调度任务日志ID查询调度信息
|
||||||
*
|
*
|
||||||
* @param jobLogId 调度任务日志ID
|
* @param jobLogId 调度任务日志ID
|
||||||
* @return 调度任务日志对象信息
|
* @return 调度任务日志对象信息
|
||||||
*/
|
*/
|
||||||
|
|
@ -35,7 +35,7 @@ public interface SysJobLogMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增任务日志
|
* 新增任务日志
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -43,7 +43,7 @@ public interface SysJobLogMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度日志信息
|
* 批量删除调度日志信息
|
||||||
*
|
*
|
||||||
* @param logIds 需要删除的数据ID
|
* @param logIds 需要删除的数据ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -51,7 +51,7 @@ public interface SysJobLogMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除任务日志
|
* 删除任务日志
|
||||||
*
|
*
|
||||||
* @param jobId 调度日志ID
|
* @param jobId 调度日志ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
package com.ruoyi.quartz.mapper;
|
package com.ruoyi.quartz.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 调度任务信息 数据层
|
* 调度任务信息 数据层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public interface SysJobMapper
|
public interface SysJobMapper {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 查询调度任务日志集合
|
* 查询调度任务日志集合
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 操作日志集合
|
* @return 操作日志集合
|
||||||
*/
|
*/
|
||||||
|
|
@ -20,14 +20,14 @@ public interface SysJobMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询所有调度任务
|
* 查询所有调度任务
|
||||||
*
|
*
|
||||||
* @return 调度任务列表
|
* @return 调度任务列表
|
||||||
*/
|
*/
|
||||||
public List<SysJob> selectJobAll();
|
public List<SysJob> selectJobAll();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度ID查询调度任务信息
|
* 通过调度ID查询调度任务信息
|
||||||
*
|
*
|
||||||
* @param jobId 调度ID
|
* @param jobId 调度ID
|
||||||
* @return 角色对象信息
|
* @return 角色对象信息
|
||||||
*/
|
*/
|
||||||
|
|
@ -35,7 +35,7 @@ public interface SysJobMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度ID删除调度任务信息
|
* 通过调度ID删除调度任务信息
|
||||||
*
|
*
|
||||||
* @param jobId 调度ID
|
* @param jobId 调度ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -43,7 +43,7 @@ public interface SysJobMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度任务信息
|
* 批量删除调度任务信息
|
||||||
*
|
*
|
||||||
* @param ids 需要删除的数据ID
|
* @param ids 需要删除的数据ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -51,7 +51,7 @@ public interface SysJobMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改调度任务信息
|
* 修改调度任务信息
|
||||||
*
|
*
|
||||||
* @param job 调度任务信息
|
* @param job 调度任务信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -59,7 +59,7 @@ public interface SysJobMapper
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增调度任务信息
|
* 新增调度任务信息
|
||||||
*
|
*
|
||||||
* @param job 调度任务信息
|
* @param job 调度任务信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
package com.ruoyi.quartz.service;
|
package com.ruoyi.quartz.service;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import com.ruoyi.quartz.domain.SysJobLog;
|
import com.ruoyi.quartz.domain.SysJobLog;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度日志信息信息 服务层
|
* 定时任务调度日志信息信息 服务层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public interface ISysJobLogService
|
public interface ISysJobLogService {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 获取quartz调度器日志的计划任务
|
* 获取quartz调度器日志的计划任务
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
* @return 调度任务日志集合
|
* @return 调度任务日志集合
|
||||||
*/
|
*/
|
||||||
|
|
@ -20,7 +20,7 @@ public interface ISysJobLogService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度任务日志ID查询调度信息
|
* 通过调度任务日志ID查询调度信息
|
||||||
*
|
*
|
||||||
* @param jobLogId 调度任务日志ID
|
* @param jobLogId 调度任务日志ID
|
||||||
* @return 调度任务日志对象信息
|
* @return 调度任务日志对象信息
|
||||||
*/
|
*/
|
||||||
|
|
@ -28,14 +28,14 @@ public interface ISysJobLogService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增任务日志
|
* 新增任务日志
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
*/
|
*/
|
||||||
public void addJobLog(SysJobLog jobLog);
|
public void addJobLog(SysJobLog jobLog);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度日志信息
|
* 批量删除调度日志信息
|
||||||
*
|
*
|
||||||
* @param logIds 需要删除的日志ID
|
* @param logIds 需要删除的日志ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -43,7 +43,7 @@ public interface ISysJobLogService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除任务日志
|
* 删除任务日志
|
||||||
*
|
*
|
||||||
* @param jobId 调度日志ID
|
* @param jobId 调度日志ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,20 @@
|
||||||
package com.ruoyi.quartz.service;
|
package com.ruoyi.quartz.service;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.quartz.SchedulerException;
|
|
||||||
import com.ruoyi.common.exception.job.TaskException;
|
import com.ruoyi.common.exception.job.TaskException;
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
import org.quartz.SchedulerException;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度信息信息 服务层
|
* 定时任务调度信息信息 服务层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public interface ISysJobService
|
public interface ISysJobService {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 获取quartz调度器的计划任务
|
* 获取quartz调度器的计划任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 调度任务集合
|
* @return 调度任务集合
|
||||||
*/
|
*/
|
||||||
|
|
@ -22,7 +22,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度任务ID查询调度信息
|
* 通过调度任务ID查询调度信息
|
||||||
*
|
*
|
||||||
* @param jobId 调度任务ID
|
* @param jobId 调度任务ID
|
||||||
* @return 调度任务对象信息
|
* @return 调度任务对象信息
|
||||||
*/
|
*/
|
||||||
|
|
@ -30,7 +30,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 暂停任务
|
* 暂停任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -38,7 +38,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 恢复任务
|
* 恢复任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -46,7 +46,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除任务后，所对应的trigger也将被删除
|
* 删除任务后，所对应的trigger也将被删除
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -54,7 +54,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度信息
|
* 批量删除调度信息
|
||||||
*
|
*
|
||||||
* @param jobIds 需要删除的任务ID
|
* @param jobIds 需要删除的任务ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -62,7 +62,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务调度状态修改
|
* 任务调度状态修改
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -70,7 +70,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 立即运行任务
|
* 立即运行任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -78,7 +78,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增任务
|
* 新增任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -86,7 +86,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新任务
|
* 更新任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
@ -94,7 +94,7 @@ public interface ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验cron表达式是否有效
|
* 校验cron表达式是否有效
|
||||||
*
|
*
|
||||||
* @param cronExpression 表达式
|
* @param cronExpression 表达式
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,78 +1,73 @@
|
||||||
package com.ruoyi.quartz.service.impl;
|
package com.ruoyi.quartz.service.impl;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import com.ruoyi.quartz.domain.SysJobLog;
|
import com.ruoyi.quartz.domain.SysJobLog;
|
||||||
import com.ruoyi.quartz.mapper.SysJobLogMapper;
|
import com.ruoyi.quartz.mapper.SysJobLogMapper;
|
||||||
import com.ruoyi.quartz.service.ISysJobLogService;
|
import com.ruoyi.quartz.service.ISysJobLogService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度日志信息 服务层
|
* 定时任务调度日志信息 服务层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class SysJobLogServiceImpl implements ISysJobLogService
|
public class SysJobLogServiceImpl implements ISysJobLogService {
|
||||||
{
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SysJobLogMapper jobLogMapper;
|
private SysJobLogMapper jobLogMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取quartz调度器日志的计划任务
|
* 获取quartz调度器日志的计划任务
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
* @return 调度任务日志集合
|
* @return 调度任务日志集合
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
|
public List<SysJobLog> selectJobLogList(SysJobLog jobLog) {
|
||||||
{
|
|
||||||
return jobLogMapper.selectJobLogList(jobLog);
|
return jobLogMapper.selectJobLogList(jobLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度任务日志ID查询调度信息
|
* 通过调度任务日志ID查询调度信息
|
||||||
*
|
*
|
||||||
* @param jobLogId 调度任务日志ID
|
* @param jobLogId 调度任务日志ID
|
||||||
* @return 调度任务日志对象信息
|
* @return 调度任务日志对象信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SysJobLog selectJobLogById(Long jobLogId)
|
public SysJobLog selectJobLogById(Long jobLogId) {
|
||||||
{
|
|
||||||
return jobLogMapper.selectJobLogById(jobLogId);
|
return jobLogMapper.selectJobLogById(jobLogId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增任务日志
|
* 新增任务日志
|
||||||
*
|
*
|
||||||
* @param jobLog 调度日志信息
|
* @param jobLog 调度日志信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addJobLog(SysJobLog jobLog)
|
public void addJobLog(SysJobLog jobLog) {
|
||||||
{
|
|
||||||
jobLogMapper.insertJobLog(jobLog);
|
jobLogMapper.insertJobLog(jobLog);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度日志信息
|
* 批量删除调度日志信息
|
||||||
*
|
*
|
||||||
* @param logIds 需要删除的数据ID
|
* @param logIds 需要删除的数据ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int deleteJobLogByIds(Long[] logIds)
|
public int deleteJobLogByIds(Long[] logIds) {
|
||||||
{
|
|
||||||
return jobLogMapper.deleteJobLogByIds(logIds);
|
return jobLogMapper.deleteJobLogByIds(logIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除任务日志
|
* 删除任务日志
|
||||||
*
|
*
|
||||||
* @param jobId 调度日志ID
|
* @param jobId 调度日志ID
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int deleteJobLogById(Long jobId)
|
public int deleteJobLogById(Long jobId) {
|
||||||
{
|
|
||||||
return jobLogMapper.deleteJobLogById(jobId);
|
return jobLogMapper.deleteJobLogById(jobId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -80,8 +75,7 @@ public class SysJobLogServiceImpl implements ISysJobLogService
|
||||||
* 清空任务日志
|
* 清空任务日志
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void cleanJobLog()
|
public void cleanJobLog() {
|
||||||
{
|
|
||||||
jobLogMapper.cleanJobLog();
|
jobLogMapper.cleanJobLog();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,5 @@
|
||||||
package com.ruoyi.quartz.service.impl;
|
package com.ruoyi.quartz.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.constant.ScheduleConstants;
|
||||||
import com.ruoyi.common.exception.job.TaskException;
|
import com.ruoyi.common.exception.job.TaskException;
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
|
@ -16,15 +7,24 @@ import com.ruoyi.quartz.mapper.SysJobMapper;
|
||||||
import com.ruoyi.quartz.service.ISysJobService;
|
import com.ruoyi.quartz.service.ISysJobService;
|
||||||
import com.ruoyi.quartz.util.CronUtils;
|
import com.ruoyi.quartz.util.CronUtils;
|
||||||
import com.ruoyi.quartz.util.ScheduleUtils;
|
import com.ruoyi.quartz.util.ScheduleUtils;
|
||||||
|
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 javax.annotation.PostConstruct;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度信息 服务层
|
* 定时任务调度信息 服务层
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class SysJobServiceImpl implements ISysJobService
|
public class SysJobServiceImpl implements ISysJobService {
|
||||||
{
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private Scheduler scheduler;
|
private Scheduler scheduler;
|
||||||
|
|
||||||
|
|
@ -35,55 +35,49 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
* 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
|
* 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
|
||||||
*/
|
*/
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void init() throws SchedulerException, TaskException
|
public void init() throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
scheduler.clear();
|
scheduler.clear();
|
||||||
List<SysJob> jobList = jobMapper.selectJobAll();
|
List<SysJob> jobList = jobMapper.selectJobAll();
|
||||||
for (SysJob job : jobList)
|
for (SysJob job : jobList) {
|
||||||
{
|
|
||||||
ScheduleUtils.createScheduleJob(scheduler, job);
|
ScheduleUtils.createScheduleJob(scheduler, job);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取quartz调度器的计划任务列表
|
* 获取quartz调度器的计划任务列表
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<SysJob> selectJobList(SysJob job)
|
public List<SysJob> selectJobList(SysJob job) {
|
||||||
{
|
|
||||||
return jobMapper.selectJobList(job);
|
return jobMapper.selectJobList(job);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过调度任务ID查询调度信息
|
* 通过调度任务ID查询调度信息
|
||||||
*
|
*
|
||||||
* @param jobId 调度任务ID
|
* @param jobId 调度任务ID
|
||||||
* @return 调度任务对象信息
|
* @return 调度任务对象信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SysJob selectJobById(Long jobId)
|
public SysJob selectJobById(Long jobId) {
|
||||||
{
|
|
||||||
return jobMapper.selectJobById(jobId);
|
return jobMapper.selectJobById(jobId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 暂停任务
|
* 暂停任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int pauseJob(SysJob job) throws SchedulerException
|
public int pauseJob(SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
String jobGroup = job.getJobGroup();
|
String jobGroup = job.getJobGroup();
|
||||||
job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
|
job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
|
||||||
int rows = jobMapper.updateJob(job);
|
int rows = jobMapper.updateJob(job);
|
||||||
if (rows > 0)
|
if (rows > 0) {
|
||||||
{
|
|
||||||
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -91,19 +85,17 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 恢复任务
|
* 恢复任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int resumeJob(SysJob job) throws SchedulerException
|
public int resumeJob(SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
String jobGroup = job.getJobGroup();
|
String jobGroup = job.getJobGroup();
|
||||||
job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
|
job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
|
||||||
int rows = jobMapper.updateJob(job);
|
int rows = jobMapper.updateJob(job);
|
||||||
if (rows > 0)
|
if (rows > 0) {
|
||||||
{
|
|
||||||
scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -111,18 +103,16 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除任务后，所对应的trigger也将被删除
|
* 删除任务后，所对应的trigger也将被删除
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int deleteJob(SysJob job) throws SchedulerException
|
public int deleteJob(SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
String jobGroup = job.getJobGroup();
|
String jobGroup = job.getJobGroup();
|
||||||
int rows = jobMapper.deleteJobById(jobId);
|
int rows = jobMapper.deleteJobById(jobId);
|
||||||
if (rows > 0)
|
if (rows > 0) {
|
||||||
{
|
|
||||||
scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -130,16 +120,14 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除调度信息
|
* 批量删除调度信息
|
||||||
*
|
*
|
||||||
* @param jobIds 需要删除的任务ID
|
* @param jobIds 需要删除的任务ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public void deleteJobByIds(Long[] jobIds) throws SchedulerException
|
public void deleteJobByIds(Long[] jobIds) throws SchedulerException {
|
||||||
{
|
for (Long jobId : jobIds) {
|
||||||
for (Long jobId : jobIds)
|
|
||||||
{
|
|
||||||
SysJob job = jobMapper.selectJobById(jobId);
|
SysJob job = jobMapper.selectJobById(jobId);
|
||||||
deleteJob(job);
|
deleteJob(job);
|
||||||
}
|
}
|
||||||
|
|
@ -147,21 +135,17 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务调度状态修改
|
* 任务调度状态修改
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int changeStatus(SysJob job) throws SchedulerException
|
public int changeStatus(SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
int rows = 0;
|
int rows = 0;
|
||||||
String status = job.getStatus();
|
String status = job.getStatus();
|
||||||
if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
|
if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {
|
||||||
{
|
|
||||||
rows = resumeJob(job);
|
rows = resumeJob(job);
|
||||||
}
|
} else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) {
|
||||||
else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
|
|
||||||
{
|
|
||||||
rows = pauseJob(job);
|
rows = pauseJob(job);
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -169,13 +153,12 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 立即运行任务
|
* 立即运行任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean run(SysJob job) throws SchedulerException
|
public boolean run(SysJob job) throws SchedulerException {
|
||||||
{
|
|
||||||
boolean result = false;
|
boolean result = false;
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
String jobGroup = job.getJobGroup();
|
String jobGroup = job.getJobGroup();
|
||||||
|
|
@ -184,8 +167,7 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
JobDataMap dataMap = new JobDataMap();
|
JobDataMap dataMap = new JobDataMap();
|
||||||
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
|
dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
|
||||||
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
|
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
|
||||||
if (scheduler.checkExists(jobKey))
|
if (scheduler.checkExists(jobKey)) {
|
||||||
{
|
|
||||||
result = true;
|
result = true;
|
||||||
scheduler.triggerJob(jobKey, dataMap);
|
scheduler.triggerJob(jobKey, dataMap);
|
||||||
}
|
}
|
||||||
|
|
@ -194,17 +176,15 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增任务
|
* 新增任务
|
||||||
*
|
*
|
||||||
* @param job 调度信息 调度信息
|
* @param job 调度信息 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int insertJob(SysJob job) throws SchedulerException, TaskException
|
public int insertJob(SysJob job) throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
|
job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
|
||||||
int rows = jobMapper.insertJob(job);
|
int rows = jobMapper.insertJob(job);
|
||||||
if (rows > 0)
|
if (rows > 0) {
|
||||||
{
|
|
||||||
ScheduleUtils.createScheduleJob(scheduler, job);
|
ScheduleUtils.createScheduleJob(scheduler, job);
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -212,17 +192,15 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新任务的时间表达式
|
* 更新任务的时间表达式
|
||||||
*
|
*
|
||||||
* @param job 调度信息
|
* @param job 调度信息
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public int updateJob(SysJob job) throws SchedulerException, TaskException
|
public int updateJob(SysJob job) throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
SysJob properties = selectJobById(job.getJobId());
|
SysJob properties = selectJobById(job.getJobId());
|
||||||
int rows = jobMapper.updateJob(job);
|
int rows = jobMapper.updateJob(job);
|
||||||
if (rows > 0)
|
if (rows > 0) {
|
||||||
{
|
|
||||||
updateSchedulerJob(job, properties.getJobGroup());
|
updateSchedulerJob(job, properties.getJobGroup());
|
||||||
}
|
}
|
||||||
return rows;
|
return rows;
|
||||||
|
|
@ -230,17 +208,15 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新任务
|
* 更新任务
|
||||||
*
|
*
|
||||||
* @param job 任务对象
|
* @param job 任务对象
|
||||||
* @param jobGroup 任务组名
|
* @param jobGroup 任务组名
|
||||||
*/
|
*/
|
||||||
public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
|
public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
// 判断是否存在
|
// 判断是否存在
|
||||||
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
|
JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
|
||||||
if (scheduler.checkExists(jobKey))
|
if (scheduler.checkExists(jobKey)) {
|
||||||
{
|
|
||||||
// 防止创建时存在数据问题 先移除，然后在执行创建操作
|
// 防止创建时存在数据问题 先移除，然后在执行创建操作
|
||||||
scheduler.deleteJob(jobKey);
|
scheduler.deleteJob(jobKey);
|
||||||
}
|
}
|
||||||
|
|
@ -249,13 +225,12 @@ public class SysJobServiceImpl implements ISysJobService
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验cron表达式是否有效
|
* 校验cron表达式是否有效
|
||||||
*
|
*
|
||||||
* @param cronExpression 表达式
|
* @param cronExpression 表达式
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean checkCronExpressionIsValid(String cronExpression)
|
public boolean checkCronExpressionIsValid(String cronExpression) {
|
||||||
{
|
|
||||||
return CronUtils.isValid(cronExpression);
|
return CronUtils.isValid(cronExpression);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,24 @@
|
||||||
package com.ruoyi.quartz.task;
|
package com.ruoyi.quartz.task;
|
||||||
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度测试
|
* 定时任务调度测试
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@Component("ryTask")
|
@Component("ryTask")
|
||||||
public class RyTask
|
public class RyTask {
|
||||||
{
|
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
|
||||||
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
|
|
||||||
{
|
|
||||||
System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
|
System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ryParams(String params)
|
public void ryParams(String params) {
|
||||||
{
|
|
||||||
System.out.println("执行有参方法：" + params);
|
System.out.println("执行有参方法：" + params);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ryNoParams()
|
public void ryNoParams() {
|
||||||
{
|
|
||||||
System.out.println("执行无参方法");
|
System.out.println("执行无参方法");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,112 @@
|
||||||
|
package com.ruoyi.quartz.task;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.ruoyi.common.constant.Constants;
|
||||||
|
import com.ruoyi.quartz.domain.DailySale;
|
||||||
|
import com.ruoyi.quartz.domain.DailySaleCustomer;
|
||||||
|
import com.ruoyi.quartz.domain.DailySaleProduct;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleCusDTO;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleDTO;
|
||||||
|
import com.ruoyi.quartz.dto.DailySaleProdDTO;
|
||||||
|
import com.ruoyi.quartz.mapper.DailySaleCustomerMapper;
|
||||||
|
import com.ruoyi.quartz.mapper.DailySaleMapper;
|
||||||
|
import com.ruoyi.quartz.mapper.DailySaleProductMapper;
|
||||||
|
import com.ruoyi.xkt.mapper.StoreProductStorageMapper;
|
||||||
|
import com.ruoyi.xkt.mapper.StoreSaleDetailMapper;
|
||||||
|
import com.ruoyi.xkt.mapper.StoreSaleMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 鞋库通定时任务
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
@Component("xktTask")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class XktTask {
|
||||||
|
|
||||||
|
final DailySaleMapper dailySaleMapper;
|
||||||
|
final StoreSaleMapper saleMapper;
|
||||||
|
final StoreSaleDetailMapper saleDetailMapper;
|
||||||
|
final StoreProductStorageMapper storageMapper;
|
||||||
|
final DailySaleCustomerMapper dailySaleCusMapper;
|
||||||
|
final DailySaleProductMapper dailySaleProdMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每晚1点同步档口销售数据
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
public void dailySale() {
|
||||||
|
// 使用LocalDate获取当前日期前一天，并转为 Date 格式
|
||||||
|
final Date yesterday = Date.from(LocalDate.now().minusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||||
|
// 先检查是否有该天的销售数据，若有则先删除，保证数据唯一性
|
||||||
|
List<DailySale> existList = this.dailySaleMapper.selectList(new LambdaQueryWrapper<DailySale>()
|
||||||
|
.eq(DailySale::getVoucherDate, yesterday).eq(DailySale::getDelFlag, Constants.UNDELETED));
|
||||||
|
if (CollectionUtils.isNotEmpty(existList)) {
|
||||||
|
this.dailySaleMapper.deleteByIds(existList.stream().map(DailySale::getId).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
// 查询当前的销售数据
|
||||||
|
List<DailySaleDTO> saleList = this.dailySaleMapper.selectDailySale(yesterday);
|
||||||
|
if (CollectionUtils.isEmpty(saleList)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.dailySaleMapper.insert(saleList.stream().map(x -> BeanUtil.toBean(x, DailySale.class)
|
||||||
|
.setVoucherDate(yesterday)).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每晚1点30分同步档口客户销售数据
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
public void dailySaleCustomer() {
|
||||||
|
// 使用LocalDate获取当前日期前一天，并转为 Date 格式
|
||||||
|
final Date yesterday = Date.from(LocalDate.now().minusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||||
|
// 先检查是否有该天的销售数据，若有则先删除，保证数据唯一性
|
||||||
|
List<DailySaleCustomer> existList = this.dailySaleCusMapper.selectList(new LambdaQueryWrapper<DailySaleCustomer>()
|
||||||
|
.eq(DailySaleCustomer::getVoucherDate, yesterday).eq(DailySaleCustomer::getDelFlag, Constants.UNDELETED));
|
||||||
|
if (CollectionUtils.isNotEmpty(existList)) {
|
||||||
|
this.dailySaleCusMapper.deleteByIds(existList.stream().map(DailySaleCustomer::getId).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
// 查询当前的客户销售数据
|
||||||
|
List<DailySaleCusDTO> cusSaleList = this.dailySaleCusMapper.selectDailySale(yesterday);
|
||||||
|
if (CollectionUtils.isEmpty(cusSaleList)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.dailySaleCusMapper.insert(cusSaleList.stream().map(x -> BeanUtil.toBean(x, DailySaleCustomer.class)
|
||||||
|
.setVoucherDate(yesterday)).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每晚2点同步档口商品销售数据
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
public void dailySaleProduct() {
|
||||||
|
// 使用LocalDate获取当前日期前一天，并转为 Date 格式
|
||||||
|
final Date yesterday = Date.from(LocalDate.now().minusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||||
|
// 先检查是否有该天的销售数据，若有则先删除，保证数据唯一性
|
||||||
|
List<DailySaleProduct> existList = this.dailySaleProdMapper.selectList(new LambdaQueryWrapper<DailySaleProduct>()
|
||||||
|
.eq(DailySaleProduct::getVoucherDate, yesterday).eq(DailySaleProduct::getDelFlag, Constants.UNDELETED));
|
||||||
|
if (CollectionUtils.isNotEmpty(existList)) {
|
||||||
|
this.dailySaleProdMapper.deleteByIds(existList.stream().map(DailySaleProduct::getId).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
// 查询档口商品的销售数据
|
||||||
|
List<DailySaleProdDTO> saleList = this.dailySaleProdMapper.selectDailySale(yesterday);
|
||||||
|
if (CollectionUtils.isEmpty(saleList)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.dailySaleProdMapper.insert(saleList.stream().map(x -> BeanUtil.toBean(x, DailySaleProduct.class)
|
||||||
|
.setVoucherDate(yesterday)).collect(Collectors.toList()));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,5 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
import org.quartz.Job;
|
|
||||||
import org.quartz.JobExecutionContext;
|
|
||||||
import org.quartz.JobExecutionException;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import com.ruoyi.common.constant.Constants;
|
import com.ruoyi.common.constant.Constants;
|
||||||
import com.ruoyi.common.constant.ScheduleConstants;
|
import com.ruoyi.common.constant.ScheduleConstants;
|
||||||
import com.ruoyi.common.utils.ExceptionUtil;
|
import com.ruoyi.common.utils.ExceptionUtil;
|
||||||
|
|
@ -15,14 +9,20 @@ import com.ruoyi.common.utils.spring.SpringUtils;
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
import com.ruoyi.quartz.domain.SysJobLog;
|
import com.ruoyi.quartz.domain.SysJobLog;
|
||||||
import com.ruoyi.quartz.service.ISysJobLogService;
|
import com.ruoyi.quartz.service.ISysJobLogService;
|
||||||
|
import org.quartz.Job;
|
||||||
|
import org.quartz.JobExecutionContext;
|
||||||
|
import org.quartz.JobExecutionException;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 抽象quartz调用
|
* 抽象quartz调用
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractQuartzJob implements Job
|
public abstract class AbstractQuartzJob implements Job {
|
||||||
{
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
|
private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -31,21 +31,16 @@ public abstract class AbstractQuartzJob implements Job
|
||||||
private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
|
private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(JobExecutionContext context) throws JobExecutionException
|
public void execute(JobExecutionContext context) throws JobExecutionException {
|
||||||
{
|
|
||||||
SysJob sysJob = new SysJob();
|
SysJob sysJob = new SysJob();
|
||||||
BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
|
BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
before(context, sysJob);
|
before(context, sysJob);
|
||||||
if (sysJob != null)
|
if (sysJob != null) {
|
||||||
{
|
|
||||||
doExecute(context, sysJob);
|
doExecute(context, sysJob);
|
||||||
}
|
}
|
||||||
after(context, sysJob, null);
|
after(context, sysJob, null);
|
||||||
}
|
} catch (Exception e) {
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
log.error("任务执行异常 - ：", e);
|
log.error("任务执行异常 - ：", e);
|
||||||
after(context, sysJob, e);
|
after(context, sysJob, e);
|
||||||
}
|
}
|
||||||
|
|
@ -55,10 +50,9 @@ public abstract class AbstractQuartzJob implements Job
|
||||||
* 执行前
|
* 执行前
|
||||||
*
|
*
|
||||||
* @param context 工作执行上下文对象
|
* @param context 工作执行上下文对象
|
||||||
* @param sysJob 系统计划任务
|
* @param sysJob 系统计划任务
|
||||||
*/
|
*/
|
||||||
protected void before(JobExecutionContext context, SysJob sysJob)
|
protected void before(JobExecutionContext context, SysJob sysJob) {
|
||||||
{
|
|
||||||
threadLocal.set(new Date());
|
threadLocal.set(new Date());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -66,10 +60,9 @@ public abstract class AbstractQuartzJob implements Job
|
||||||
* 执行后
|
* 执行后
|
||||||
*
|
*
|
||||||
* @param context 工作执行上下文对象
|
* @param context 工作执行上下文对象
|
||||||
* @param sysJob 系统计划任务
|
* @param sysJob 系统计划任务
|
||||||
*/
|
*/
|
||||||
protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
|
protected void after(JobExecutionContext context, SysJob sysJob, Exception e) {
|
||||||
{
|
|
||||||
Date startTime = threadLocal.get();
|
Date startTime = threadLocal.get();
|
||||||
threadLocal.remove();
|
threadLocal.remove();
|
||||||
|
|
||||||
|
|
@ -81,14 +74,11 @@ public abstract class AbstractQuartzJob implements Job
|
||||||
sysJobLog.setStopTime(new Date());
|
sysJobLog.setStopTime(new Date());
|
||||||
long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
|
long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
|
||||||
sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
|
sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
|
||||||
if (e != null)
|
if (e != null) {
|
||||||
{
|
|
||||||
sysJobLog.setStatus(Constants.FAIL);
|
sysJobLog.setStatus(Constants.FAIL);
|
||||||
String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
|
String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
|
||||||
sysJobLog.setExceptionInfo(errorMsg);
|
sysJobLog.setExceptionInfo(errorMsg);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
sysJobLog.setStatus(Constants.SUCCESS);
|
sysJobLog.setStatus(Constants.SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -100,7 +90,7 @@ public abstract class AbstractQuartzJob implements Job
|
||||||
* 执行方法，由子类重载
|
* 执行方法，由子类重载
|
||||||
*
|
*
|
||||||
* @param context 工作执行上下文对象
|
* @param context 工作执行上下文对象
|
||||||
* @param sysJob 系统计划任务
|
* @param sysJob 系统计划任务
|
||||||
* @throws Exception 执行过程中的异常
|
* @throws Exception 执行过程中的异常
|
||||||
*/
|
*/
|
||||||
protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
|
protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,23 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
|
import org.quartz.CronExpression;
|
||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import org.quartz.CronExpression;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cron表达式工具类
|
* cron表达式工具类
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*
|
*
|
||||||
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class CronUtils
|
public class CronUtils {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 返回一个布尔值代表一个给定的Cron表达式的有效性
|
* 返回一个布尔值代表一个给定的Cron表达式的有效性
|
||||||
*
|
*
|
||||||
* @param cronExpression Cron表达式
|
* @param cronExpression Cron表达式
|
||||||
* @return boolean 表达式是否有效
|
* @return boolean 表达式是否有效
|
||||||
*/
|
*/
|
||||||
public static boolean isValid(String cronExpression)
|
public static boolean isValid(String cronExpression) {
|
||||||
{
|
|
||||||
return CronExpression.isValidExpression(cronExpression);
|
return CronExpression.isValidExpression(cronExpression);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -29,15 +27,11 @@ public class CronUtils
|
||||||
* @param cronExpression Cron表达式
|
* @param cronExpression Cron表达式
|
||||||
* @return String 无效时返回表达式错误描述,如果有效返回null
|
* @return String 无效时返回表达式错误描述,如果有效返回null
|
||||||
*/
|
*/
|
||||||
public static String getInvalidMessage(String cronExpression)
|
public static String getInvalidMessage(String cronExpression) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
new CronExpression(cronExpression);
|
new CronExpression(cronExpression);
|
||||||
return null;
|
return null;
|
||||||
}
|
} catch (ParseException pe) {
|
||||||
catch (ParseException pe)
|
|
||||||
{
|
|
||||||
return pe.getMessage();
|
return pe.getMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -48,15 +42,11 @@ public class CronUtils
|
||||||
* @param cronExpression Cron表达式
|
* @param cronExpression Cron表达式
|
||||||
* @return Date 下次Cron表达式执行时间
|
* @return Date 下次Cron表达式执行时间
|
||||||
*/
|
*/
|
||||||
public static Date getNextExecution(String cronExpression)
|
public static Date getNextExecution(String cronExpression) {
|
||||||
{
|
try {
|
||||||
try
|
|
||||||
{
|
|
||||||
CronExpression cron = new CronExpression(cronExpression);
|
CronExpression cron = new CronExpression(cronExpression);
|
||||||
return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
|
return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
|
||||||
}
|
} catch (ParseException e) {
|
||||||
catch (ParseException e)
|
|
||||||
{
|
|
||||||
throw new IllegalArgumentException(e.getMessage());
|
throw new IllegalArgumentException(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,39 +1,35 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
||||||
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
|
||||||
import com.ruoyi.common.utils.spring.SpringUtils;
|
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务执行工具
|
* 任务执行工具
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class JobInvokeUtil
|
public class JobInvokeUtil {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 执行方法
|
* 执行方法
|
||||||
*
|
*
|
||||||
* @param sysJob 系统任务
|
* @param sysJob 系统任务
|
||||||
*/
|
*/
|
||||||
public static void invokeMethod(SysJob sysJob) throws Exception
|
public static void invokeMethod(SysJob sysJob) throws Exception {
|
||||||
{
|
|
||||||
String invokeTarget = sysJob.getInvokeTarget();
|
String invokeTarget = sysJob.getInvokeTarget();
|
||||||
String beanName = getBeanName(invokeTarget);
|
String beanName = getBeanName(invokeTarget);
|
||||||
String methodName = getMethodName(invokeTarget);
|
String methodName = getMethodName(invokeTarget);
|
||||||
List<Object[]> methodParams = getMethodParams(invokeTarget);
|
List<Object[]> methodParams = getMethodParams(invokeTarget);
|
||||||
|
|
||||||
if (!isValidClassName(beanName))
|
if (!isValidClassName(beanName)) {
|
||||||
{
|
|
||||||
Object bean = SpringUtils.getBean(beanName);
|
Object bean = SpringUtils.getBean(beanName);
|
||||||
invokeMethod(bean, methodName, methodParams);
|
invokeMethod(bean, methodName, methodParams);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
|
Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
|
||||||
invokeMethod(bean, methodName, methodParams);
|
invokeMethod(bean, methodName, methodParams);
|
||||||
}
|
}
|
||||||
|
|
@ -42,21 +38,17 @@ public class JobInvokeUtil
|
||||||
/**
|
/**
|
||||||
* 调用任务方法
|
* 调用任务方法
|
||||||
*
|
*
|
||||||
* @param bean 目标对象
|
* @param bean 目标对象
|
||||||
* @param methodName 方法名称
|
* @param methodName 方法名称
|
||||||
* @param methodParams 方法参数
|
* @param methodParams 方法参数
|
||||||
*/
|
*/
|
||||||
private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
|
private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
|
||||||
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
|
throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
|
||||||
InvocationTargetException
|
InvocationTargetException {
|
||||||
{
|
if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) {
|
||||||
if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
|
|
||||||
{
|
|
||||||
Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
|
Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
|
||||||
method.invoke(bean, getMethodParamsValue(methodParams));
|
method.invoke(bean, getMethodParamsValue(methodParams));
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
Method method = bean.getClass().getMethod(methodName);
|
Method method = bean.getClass().getMethod(methodName);
|
||||||
method.invoke(bean);
|
method.invoke(bean);
|
||||||
}
|
}
|
||||||
|
|
@ -64,81 +56,70 @@ public class JobInvokeUtil
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 校验是否为为class包名
|
* 校验是否为为class包名
|
||||||
*
|
*
|
||||||
* @param invokeTarget 名称
|
* @param invokeTarget 名称
|
||||||
* @return true是 false否
|
* @return true是 false否
|
||||||
*/
|
*/
|
||||||
public static boolean isValidClassName(String invokeTarget)
|
public static boolean isValidClassName(String invokeTarget) {
|
||||||
{
|
|
||||||
return StringUtils.countMatches(invokeTarget, ".") > 1;
|
return StringUtils.countMatches(invokeTarget, ".") > 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取bean名称
|
* 获取bean名称
|
||||||
*
|
*
|
||||||
* @param invokeTarget 目标字符串
|
* @param invokeTarget 目标字符串
|
||||||
* @return bean名称
|
* @return bean名称
|
||||||
*/
|
*/
|
||||||
public static String getBeanName(String invokeTarget)
|
public static String getBeanName(String invokeTarget) {
|
||||||
{
|
|
||||||
String beanName = StringUtils.substringBefore(invokeTarget, "(");
|
String beanName = StringUtils.substringBefore(invokeTarget, "(");
|
||||||
return StringUtils.substringBeforeLast(beanName, ".");
|
return StringUtils.substringBeforeLast(beanName, ".");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取bean方法
|
* 获取bean方法
|
||||||
*
|
*
|
||||||
* @param invokeTarget 目标字符串
|
* @param invokeTarget 目标字符串
|
||||||
* @return method方法
|
* @return method方法
|
||||||
*/
|
*/
|
||||||
public static String getMethodName(String invokeTarget)
|
public static String getMethodName(String invokeTarget) {
|
||||||
{
|
|
||||||
String methodName = StringUtils.substringBefore(invokeTarget, "(");
|
String methodName = StringUtils.substringBefore(invokeTarget, "(");
|
||||||
return StringUtils.substringAfterLast(methodName, ".");
|
return StringUtils.substringAfterLast(methodName, ".");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取method方法参数相关列表
|
* 获取method方法参数相关列表
|
||||||
*
|
*
|
||||||
* @param invokeTarget 目标字符串
|
* @param invokeTarget 目标字符串
|
||||||
* @return method方法相关参数列表
|
* @return method方法相关参数列表
|
||||||
*/
|
*/
|
||||||
public static List<Object[]> getMethodParams(String invokeTarget)
|
public static List<Object[]> getMethodParams(String invokeTarget) {
|
||||||
{
|
|
||||||
String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
|
String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
|
||||||
if (StringUtils.isEmpty(methodStr))
|
if (StringUtils.isEmpty(methodStr)) {
|
||||||
{
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
|
String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
|
||||||
List<Object[]> classs = new LinkedList<>();
|
List<Object[]> classs = new LinkedList<>();
|
||||||
for (int i = 0; i < methodParams.length; i++)
|
for (int i = 0; i < methodParams.length; i++) {
|
||||||
{
|
|
||||||
String str = StringUtils.trimToEmpty(methodParams[i]);
|
String str = StringUtils.trimToEmpty(methodParams[i]);
|
||||||
// String字符串类型，以'或"开头
|
// String字符串类型，以'或"开头
|
||||||
if (StringUtils.startsWithAny(str, "'", "\""))
|
if (StringUtils.startsWithAny(str, "'", "\"")) {
|
||||||
{
|
classs.add(new Object[]{StringUtils.substring(str, 1, str.length() - 1), String.class});
|
||||||
classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class });
|
|
||||||
}
|
}
|
||||||
// boolean布尔类型，等于true或者false
|
// boolean布尔类型，等于true或者false
|
||||||
else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))
|
else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) {
|
||||||
{
|
classs.add(new Object[]{Boolean.valueOf(str), Boolean.class});
|
||||||
classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
|
|
||||||
}
|
}
|
||||||
// long长整形，以L结尾
|
// long长整形，以L结尾
|
||||||
else if (StringUtils.endsWith(str, "L"))
|
else if (StringUtils.endsWith(str, "L")) {
|
||||||
{
|
classs.add(new Object[]{Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class});
|
||||||
classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class });
|
|
||||||
}
|
}
|
||||||
// double浮点类型，以D结尾
|
// double浮点类型，以D结尾
|
||||||
else if (StringUtils.endsWith(str, "D"))
|
else if (StringUtils.endsWith(str, "D")) {
|
||||||
{
|
classs.add(new Object[]{Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class});
|
||||||
classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class });
|
|
||||||
}
|
}
|
||||||
// 其他类型归类为整形
|
// 其他类型归类为整形
|
||||||
else
|
else {
|
||||||
{
|
classs.add(new Object[]{Integer.valueOf(str), Integer.class});
|
||||||
classs.add(new Object[] { Integer.valueOf(str), Integer.class });
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return classs;
|
return classs;
|
||||||
|
|
@ -146,16 +127,14 @@ public class JobInvokeUtil
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取参数类型
|
* 获取参数类型
|
||||||
*
|
*
|
||||||
* @param methodParams 参数相关列表
|
* @param methodParams 参数相关列表
|
||||||
* @return 参数类型列表
|
* @return 参数类型列表
|
||||||
*/
|
*/
|
||||||
public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
|
public static Class<?>[] getMethodParamsType(List<Object[]> methodParams) {
|
||||||
{
|
|
||||||
Class<?>[] classs = new Class<?>[methodParams.size()];
|
Class<?>[] classs = new Class<?>[methodParams.size()];
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Object[] os : methodParams)
|
for (Object[] os : methodParams) {
|
||||||
{
|
|
||||||
classs[index] = (Class<?>) os[1];
|
classs[index] = (Class<?>) os[1];
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
@ -164,16 +143,14 @@ public class JobInvokeUtil
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取参数值
|
* 获取参数值
|
||||||
*
|
*
|
||||||
* @param methodParams 参数相关列表
|
* @param methodParams 参数相关列表
|
||||||
* @return 参数值列表
|
* @return 参数值列表
|
||||||
*/
|
*/
|
||||||
public static Object[] getMethodParamsValue(List<Object[]> methodParams)
|
public static Object[] getMethodParamsValue(List<Object[]> methodParams) {
|
||||||
{
|
|
||||||
Object[] classs = new Object[methodParams.size()];
|
Object[] classs = new Object[methodParams.size()];
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for (Object[] os : methodParams)
|
for (Object[] os : methodParams) {
|
||||||
{
|
|
||||||
classs[index] = (Object) os[0];
|
classs[index] = (Object) os[0];
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,18 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
import org.quartz.DisallowConcurrentExecution;
|
import org.quartz.DisallowConcurrentExecution;
|
||||||
import org.quartz.JobExecutionContext;
|
import org.quartz.JobExecutionContext;
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务处理（禁止并发执行）
|
* 定时任务处理（禁止并发执行）
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*
|
*
|
||||||
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@DisallowConcurrentExecution
|
@DisallowConcurrentExecution
|
||||||
public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
|
public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob {
|
||||||
{
|
|
||||||
@Override
|
@Override
|
||||||
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
|
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception {
|
||||||
{
|
|
||||||
JobInvokeUtil.invokeMethod(sysJob);
|
JobInvokeUtil.invokeMethod(sysJob);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,16 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
import org.quartz.JobExecutionContext;
|
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
import org.quartz.JobExecutionContext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务处理（允许并发执行）
|
* 定时任务处理（允许并发执行）
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*
|
*
|
||||||
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class QuartzJobExecution extends AbstractQuartzJob
|
public class QuartzJobExecution extends AbstractQuartzJob {
|
||||||
{
|
|
||||||
@Override
|
@Override
|
||||||
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
|
protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception {
|
||||||
{
|
|
||||||
JobInvokeUtil.invokeMethod(sysJob);
|
JobInvokeUtil.invokeMethod(sysJob);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,5 @@
|
||||||
package com.ruoyi.quartz.util;
|
package com.ruoyi.quartz.util;
|
||||||
|
|
||||||
import org.quartz.CronScheduleBuilder;
|
|
||||||
import org.quartz.CronTrigger;
|
|
||||||
import org.quartz.Job;
|
|
||||||
import org.quartz.JobBuilder;
|
|
||||||
import org.quartz.JobDetail;
|
|
||||||
import org.quartz.JobKey;
|
|
||||||
import org.quartz.Scheduler;
|
|
||||||
import org.quartz.SchedulerException;
|
|
||||||
import org.quartz.TriggerBuilder;
|
|
||||||
import org.quartz.TriggerKey;
|
|
||||||
import com.ruoyi.common.constant.Constants;
|
import com.ruoyi.common.constant.Constants;
|
||||||
import com.ruoyi.common.constant.ScheduleConstants;
|
import com.ruoyi.common.constant.ScheduleConstants;
|
||||||
import com.ruoyi.common.exception.job.TaskException;
|
import com.ruoyi.common.exception.job.TaskException;
|
||||||
|
|
@ -17,23 +7,21 @@ import com.ruoyi.common.exception.job.TaskException.Code;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import com.ruoyi.common.utils.spring.SpringUtils;
|
import com.ruoyi.common.utils.spring.SpringUtils;
|
||||||
import com.ruoyi.quartz.domain.SysJob;
|
import com.ruoyi.quartz.domain.SysJob;
|
||||||
|
import org.quartz.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务工具类
|
* 定时任务工具类
|
||||||
*
|
|
||||||
* @author ruoyi
|
|
||||||
*
|
*
|
||||||
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
public class ScheduleUtils
|
public class ScheduleUtils {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* 得到quartz任务类
|
* 得到quartz任务类
|
||||||
*
|
*
|
||||||
* @param sysJob 执行计划
|
* @param sysJob 执行计划
|
||||||
* @return 具体执行任务类
|
* @return 具体执行任务类
|
||||||
*/
|
*/
|
||||||
private static Class<? extends Job> getQuartzJobClass(SysJob sysJob)
|
private static Class<? extends Job> getQuartzJobClass(SysJob sysJob) {
|
||||||
{
|
|
||||||
boolean isConcurrent = "0".equals(sysJob.getConcurrent());
|
boolean isConcurrent = "0".equals(sysJob.getConcurrent());
|
||||||
return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
|
return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
|
||||||
}
|
}
|
||||||
|
|
@ -41,24 +29,21 @@ public class ScheduleUtils
|
||||||
/**
|
/**
|
||||||
* 构建任务触发对象
|
* 构建任务触发对象
|
||||||
*/
|
*/
|
||||||
public static TriggerKey getTriggerKey(Long jobId, String jobGroup)
|
public static TriggerKey getTriggerKey(Long jobId, String jobGroup) {
|
||||||
{
|
|
||||||
return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
|
return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构建任务键对象
|
* 构建任务键对象
|
||||||
*/
|
*/
|
||||||
public static JobKey getJobKey(Long jobId, String jobGroup)
|
public static JobKey getJobKey(Long jobId, String jobGroup) {
|
||||||
{
|
|
||||||
return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
|
return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建定时任务
|
* 创建定时任务
|
||||||
*/
|
*/
|
||||||
public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException
|
public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException {
|
||||||
{
|
|
||||||
Class<? extends Job> jobClass = getQuartzJobClass(job);
|
Class<? extends Job> jobClass = getQuartzJobClass(job);
|
||||||
// 构建job信息
|
// 构建job信息
|
||||||
Long jobId = job.getJobId();
|
Long jobId = job.getJobId();
|
||||||
|
|
@ -77,22 +62,19 @@ public class ScheduleUtils
|
||||||
jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
|
jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
|
||||||
|
|
||||||
// 判断是否存在
|
// 判断是否存在
|
||||||
if (scheduler.checkExists(getJobKey(jobId, jobGroup)))
|
if (scheduler.checkExists(getJobKey(jobId, jobGroup))) {
|
||||||
{
|
|
||||||
// 防止创建时存在数据问题 先移除，然后在执行创建操作
|
// 防止创建时存在数据问题 先移除，然后在执行创建操作
|
||||||
scheduler.deleteJob(getJobKey(jobId, jobGroup));
|
scheduler.deleteJob(getJobKey(jobId, jobGroup));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 判断任务是否过期
|
// 判断任务是否过期
|
||||||
if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression())))
|
if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression()))) {
|
||||||
{
|
|
||||||
// 执行调度任务
|
// 执行调度任务
|
||||||
scheduler.scheduleJob(jobDetail, trigger);
|
scheduler.scheduleJob(jobDetail, trigger);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 暂停任务
|
// 暂停任务
|
||||||
if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
|
if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) {
|
||||||
{
|
|
||||||
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -101,10 +83,8 @@ public class ScheduleUtils
|
||||||
* 设置定时任务策略
|
* 设置定时任务策略
|
||||||
*/
|
*/
|
||||||
public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb)
|
public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb)
|
||||||
throws TaskException
|
throws TaskException {
|
||||||
{
|
switch (job.getMisfirePolicy()) {
|
||||||
switch (job.getMisfirePolicy())
|
|
||||||
{
|
|
||||||
case ScheduleConstants.MISFIRE_DEFAULT:
|
case ScheduleConstants.MISFIRE_DEFAULT:
|
||||||
return cb;
|
return cb;
|
||||||
case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
|
case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
|
||||||
|
|
@ -121,16 +101,14 @@ public class ScheduleUtils
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查包名是否为白名单配置
|
* 检查包名是否为白名单配置
|
||||||
*
|
*
|
||||||
* @param invokeTarget 目标字符串
|
* @param invokeTarget 目标字符串
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public static boolean whiteList(String invokeTarget)
|
public static boolean whiteList(String invokeTarget) {
|
||||||
{
|
|
||||||
String packageName = StringUtils.substringBefore(invokeTarget, "(");
|
String packageName = StringUtils.substringBefore(invokeTarget, "(");
|
||||||
int count = StringUtils.countMatches(packageName, ".");
|
int count = StringUtils.countMatches(packageName, ".");
|
||||||
if (count > 1)
|
if (count > 1) {
|
||||||
{
|
|
||||||
return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
|
return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
|
||||||
}
|
}
|
||||||
Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
|
Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.ruoyi.quartz.mapper.DailySaleCustomerMapper">
|
||||||
|
|
||||||
|
<select id="selectDailySale" resultType="com.ruoyi.quartz.dto.DailySaleCusDTO">
|
||||||
|
SELECT
|
||||||
|
ss.store_id,
|
||||||
|
ss.store_cus_id,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS returnAmount,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS returnNum
|
||||||
|
FROM
|
||||||
|
store_sale ss
|
||||||
|
LEFT JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id
|
||||||
|
WHERE
|
||||||
|
ss.del_flag = 0
|
||||||
|
AND ss.voucher_date = #{voucherDate}
|
||||||
|
GROUP BY
|
||||||
|
ss.store_id,
|
||||||
|
ss.store_cus_id
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.ruoyi.quartz.mapper.DailySaleMapper">
|
||||||
|
|
||||||
|
<select id="selectDailySale" resultType="com.ruoyi.quartz.dto.DailySaleDTO">
|
||||||
|
SELECT
|
||||||
|
ss.store_id,
|
||||||
|
COALESCE(SUM(CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END), 0) AS saleAmount,
|
||||||
|
COALESCE(SUM(CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END), 0) AS returnAmount,
|
||||||
|
COALESCE(SUM(CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END), 0) AS saleNum,
|
||||||
|
COALESCE(SUM(CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END), 0) AS returnNum,
|
||||||
|
COALESCE(COUNT(ss.store_cus_id), 0) AS customerNum,
|
||||||
|
COALESCE(SUM(sps.quantity), 0) AS storageNum
|
||||||
|
FROM
|
||||||
|
store_sale ss
|
||||||
|
LEFT JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id
|
||||||
|
LEFT JOIN store_product_storage sps ON ss.store_id = sps.store_id
|
||||||
|
WHERE
|
||||||
|
ss.del_flag = 0 AND ss.voucher_date = #{voucherDate}
|
||||||
|
GROUP BY
|
||||||
|
ss.store_id
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<!DOCTYPE mapper
|
||||||
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.ruoyi.quartz.mapper.DailySaleProductMapper">
|
||||||
|
|
||||||
|
<select id="selectDailySale" resultType="com.ruoyi.quartz.dto.DailySaleProdDTO">
|
||||||
|
SELECT
|
||||||
|
sp.store_id,
|
||||||
|
sp.id AS store_prod_id,
|
||||||
|
sp.prod_art_num,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.amount ELSE 0 END ), 0 ) AS saleAmount,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.amount ELSE 0 END ), 0 ) AS returnAmount,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 1 THEN ssd.quantity ELSE 0 END ), 0 ) AS saleNum,
|
||||||
|
COALESCE ( SUM( CASE WHEN ssd.sale_type = 2 THEN ssd.quantity ELSE 0 END ), 0 ) AS returnNum
|
||||||
|
FROM
|
||||||
|
store_sale_detail ssd
|
||||||
|
JOIN store_product sp ON ssd.store_prod_id = sp.id
|
||||||
|
WHERE
|
||||||
|
ssd.del_flag = 0
|
||||||
|
AND ssd.voucher_date = #{voucherDate}
|
||||||
|
GROUP BY
|
||||||
|
sp.store_id,
|
||||||
|
sp.id
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
|
|
@ -1,94 +1,103 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
|
<mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
|
||||||
|
|
||||||
<resultMap type="SysJobLog" id="SysJobLogResult">
|
<resultMap type="SysJobLog" id="SysJobLogResult">
|
||||||
<id property="jobLogId" column="job_log_id" />
|
<id property="jobLogId" column="job_log_id"/>
|
||||||
<result property="jobName" column="job_name" />
|
<result property="jobName" column="job_name"/>
|
||||||
<result property="jobGroup" column="job_group" />
|
<result property="jobGroup" column="job_group"/>
|
||||||
<result property="invokeTarget" column="invoke_target" />
|
<result property="invokeTarget" column="invoke_target"/>
|
||||||
<result property="jobMessage" column="job_message" />
|
<result property="jobMessage" column="job_message"/>
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status"/>
|
||||||
<result property="exceptionInfo" column="exception_info" />
|
<result property="exceptionInfo" column="exception_info"/>
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectJobLogVo">
|
<sql id="selectJobLogVo">
|
||||||
select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
|
select job_log_id,
|
||||||
from sys_job_log
|
job_name,
|
||||||
|
job_group,
|
||||||
|
invoke_target,
|
||||||
|
job_message,
|
||||||
|
status,
|
||||||
|
exception_info,
|
||||||
|
create_time
|
||||||
|
from sys_job_log
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
|
<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
|
||||||
<include refid="selectJobLogVo"/>
|
<include refid="selectJobLogVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="jobName != null and jobName != ''">
|
<if test="jobName != null and jobName != ''">
|
||||||
AND job_name like concat('%', #{jobName}, '%')
|
AND job_name like concat('%', #{jobName}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="jobGroup != null and jobGroup != ''">
|
<if test="jobGroup != null and jobGroup != ''">
|
||||||
AND job_group = #{jobGroup}
|
AND job_group = #{jobGroup}
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null and status != ''">
|
<if test="status != null and status != ''">
|
||||||
AND status = #{status}
|
AND status = #{status}
|
||||||
</if>
|
</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">
|
<if test="invokeTarget != null and invokeTarget != ''">
|
||||||
AND invoke_target like concat('%', #{invokeTarget}, '%')
|
AND invoke_target like concat('%', #{invokeTarget}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||||
and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
|
and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
|
||||||
</if>
|
</if>
|
||||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||||
and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
|
and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by create_time desc
|
order by create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectJobLogAll" resultMap="SysJobLogResult">
|
<select id="selectJobLogAll" resultMap="SysJobLogResult">
|
||||||
<include refid="selectJobLogVo"/>
|
<include refid="selectJobLogVo"/>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
|
<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
|
||||||
<include refid="selectJobLogVo"/>
|
<include refid="selectJobLogVo"/>
|
||||||
where job_log_id = #{jobLogId}
|
where job_log_id = #{jobLogId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteJobLogById" parameterType="Long">
|
<delete id="deleteJobLogById" parameterType="Long">
|
||||||
delete from sys_job_log where job_log_id = #{jobLogId}
|
delete
|
||||||
</delete>
|
from sys_job_log
|
||||||
|
where job_log_id = #{jobLogId}
|
||||||
<delete id="deleteJobLogByIds" parameterType="Long">
|
</delete>
|
||||||
delete from sys_job_log where job_log_id in
|
|
||||||
<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
|
<delete id="deleteJobLogByIds" parameterType="Long">
|
||||||
#{jobLogId}
|
delete from sys_job_log where job_log_id in
|
||||||
</foreach>
|
<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
|
||||||
</delete>
|
#{jobLogId}
|
||||||
|
</foreach>
|
||||||
<update id="cleanJobLog">
|
</delete>
|
||||||
|
|
||||||
|
<update id="cleanJobLog">
|
||||||
truncate table sys_job_log
|
truncate table sys_job_log
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insertJobLog" parameterType="SysJobLog">
|
<insert id="insertJobLog" parameterType="SysJobLog">
|
||||||
insert into sys_job_log(
|
insert into sys_job_log(
|
||||||
<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
|
<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
|
||||||
<if test="jobName != null and jobName != ''">job_name,</if>
|
<if test="jobName != null and jobName != ''">job_name,</if>
|
||||||
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
|
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
|
<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
|
||||||
<if test="jobMessage != null and jobMessage != ''">job_message,</if>
|
<if test="jobMessage != null and jobMessage != ''">job_message,</if>
|
||||||
<if test="status != null and status != ''">status,</if>
|
<if test="status != null and status != ''">status,</if>
|
||||||
<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
|
<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
|
||||||
create_time
|
create_time
|
||||||
)values(
|
)values(
|
||||||
<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
|
<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
|
||||||
<if test="jobName != null and jobName != ''">#{jobName},</if>
|
<if test="jobName != null and jobName != ''">#{jobName},</if>
|
||||||
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
|
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
|
<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
|
||||||
<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
|
<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
|
||||||
<if test="status != null and status != ''">#{status},</if>
|
<if test="status != null and status != ''">#{status},</if>
|
||||||
<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
|
<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
|
||||||
sysdate()
|
sysdate()
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -1,111 +1,123 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
|
<mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
|
||||||
|
|
||||||
<resultMap type="SysJob" id="SysJobResult">
|
<resultMap type="SysJob" id="SysJobResult">
|
||||||
<id property="jobId" column="job_id" />
|
<id property="jobId" column="job_id"/>
|
||||||
<result property="jobName" column="job_name" />
|
<result property="jobName" column="job_name"/>
|
||||||
<result property="jobGroup" column="job_group" />
|
<result property="jobGroup" column="job_group"/>
|
||||||
<result property="invokeTarget" column="invoke_target" />
|
<result property="invokeTarget" column="invoke_target"/>
|
||||||
<result property="cronExpression" column="cron_expression" />
|
<result property="cronExpression" column="cron_expression"/>
|
||||||
<result property="misfirePolicy" column="misfire_policy" />
|
<result property="misfirePolicy" column="misfire_policy"/>
|
||||||
<result property="concurrent" column="concurrent" />
|
<result property="concurrent" column="concurrent"/>
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status"/>
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by"/>
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time"/>
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectJobVo">
|
<sql id="selectJobVo">
|
||||||
select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
|
select job_id,
|
||||||
from sys_job
|
job_name,
|
||||||
|
job_group,
|
||||||
|
invoke_target,
|
||||||
|
cron_expression,
|
||||||
|
misfire_policy,
|
||||||
|
concurrent,
|
||||||
|
status,
|
||||||
|
create_by,
|
||||||
|
create_time,
|
||||||
|
remark
|
||||||
|
from sys_job
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
|
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
|
||||||
<include refid="selectJobVo"/>
|
<include refid="selectJobVo"/>
|
||||||
<where>
|
<where>
|
||||||
<if test="jobName != null and jobName != ''">
|
<if test="jobName != null and jobName != ''">
|
||||||
AND job_name like concat('%', #{jobName}, '%')
|
AND job_name like concat('%', #{jobName}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="jobGroup != null and jobGroup != ''">
|
<if test="jobGroup != null and jobGroup != ''">
|
||||||
AND job_group = #{jobGroup}
|
AND job_group = #{jobGroup}
|
||||||
</if>
|
</if>
|
||||||
<if test="status != null and status != ''">
|
<if test="status != null and status != ''">
|
||||||
AND status = #{status}
|
AND status = #{status}
|
||||||
</if>
|
</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">
|
<if test="invokeTarget != null and invokeTarget != ''">
|
||||||
AND invoke_target like concat('%', #{invokeTarget}, '%')
|
AND invoke_target like concat('%', #{invokeTarget}, '%')
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectJobAll" resultMap="SysJobResult">
|
<select id="selectJobAll" resultMap="SysJobResult">
|
||||||
<include refid="selectJobVo"/>
|
<include refid="selectJobVo"/>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
|
<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
|
||||||
<include refid="selectJobVo"/>
|
<include refid="selectJobVo"/>
|
||||||
where job_id = #{jobId}
|
where job_id = #{jobId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteJobById" parameterType="Long">
|
<delete id="deleteJobById" parameterType="Long">
|
||||||
delete from sys_job where job_id = #{jobId}
|
delete
|
||||||
</delete>
|
from sys_job
|
||||||
|
where job_id = #{jobId}
|
||||||
<delete id="deleteJobByIds" parameterType="Long">
|
</delete>
|
||||||
delete from sys_job where job_id in
|
|
||||||
<foreach collection="array" item="jobId" open="(" separator="," close=")">
|
<delete id="deleteJobByIds" parameterType="Long">
|
||||||
#{jobId}
|
delete from sys_job where job_id in
|
||||||
</foreach>
|
<foreach collection="array" item="jobId" open="(" separator="," close=")">
|
||||||
</delete>
|
#{jobId}
|
||||||
|
</foreach>
|
||||||
<update id="updateJob" parameterType="SysJob">
|
</delete>
|
||||||
update sys_job
|
|
||||||
<set>
|
<update id="updateJob" parameterType="SysJob">
|
||||||
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
|
update sys_job
|
||||||
<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
|
<set>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
|
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
|
||||||
<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
|
<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
|
||||||
<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
|
<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
|
||||||
<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
|
<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
|
||||||
<if test="status !=null">status = #{status},</if>
|
<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
|
||||||
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
<if test="status !=null">status = #{status},</if>
|
||||||
update_time = sysdate()
|
<if test="remark != null and remark != ''">remark = #{remark},</if>
|
||||||
</set>
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
where job_id = #{jobId}
|
update_time = sysdate()
|
||||||
</update>
|
</set>
|
||||||
|
where job_id = #{jobId}
|
||||||
<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
|
</update>
|
||||||
insert into sys_job(
|
|
||||||
<if test="jobId != null and jobId != 0">job_id,</if>
|
<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
|
||||||
<if test="jobName != null and jobName != ''">job_name,</if>
|
insert into sys_job(
|
||||||
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
|
<if test="jobId != null and jobId != 0">job_id,</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
|
<if test="jobName != null and jobName != ''">job_name,</if>
|
||||||
<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
|
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
|
||||||
<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
|
<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
|
||||||
<if test="concurrent != null and concurrent != ''">concurrent,</if>
|
<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
|
||||||
<if test="status != null and status != ''">status,</if>
|
<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="concurrent != null and concurrent != ''">concurrent,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="status != null and status != ''">status,</if>
|
||||||
create_time
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
)values(
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
<if test="jobId != null and jobId != 0">#{jobId},</if>
|
create_time
|
||||||
<if test="jobName != null and jobName != ''">#{jobName},</if>
|
)values(
|
||||||
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
|
<if test="jobId != null and jobId != 0">#{jobId},</if>
|
||||||
<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
|
<if test="jobName != null and jobName != ''">#{jobName},</if>
|
||||||
<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
|
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
|
||||||
<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
|
<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
|
||||||
<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
|
<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
|
||||||
<if test="status != null and status != ''">#{status},</if>
|
<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="status != null and status != ''">#{status},</if>
|
||||||
sysdate()
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
)
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
</insert>
|
sysdate()
|
||||||
|
)
|
||||||
|
</insert>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.ruoyi.xkt.domain;
|
package com.ruoyi.xkt.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.XktBaseEntity;
|
import com.ruoyi.common.core.domain.XktBaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -10,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 档口商品入库对象 store_product_storage
|
* 档口商品入库对象 store_product_storage
|
||||||
|
|
@ -61,6 +63,12 @@ public class StoreProductStorage extends XktBaseEntity {
|
||||||
* 操作人名称
|
* 操作人名称
|
||||||
*/
|
*/
|
||||||
private String operatorName;
|
private String operatorName;
|
||||||
|
/**
|
||||||
|
* 单据日期
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@Excel(name = "单据日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
|
private Date voucherDate;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.ruoyi.xkt.domain;
|
package com.ruoyi.xkt.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.XktBaseEntity;
|
import com.ruoyi.common.core.domain.XktBaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -10,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 档口销售明细对象 store_sale_detail
|
* 档口销售明细对象 store_sale_detail
|
||||||
|
|
@ -91,6 +93,11 @@ public class StoreSaleDetail extends XktBaseEntity {
|
||||||
*/
|
*/
|
||||||
@Excel(name = "条码")
|
@Excel(name = "条码")
|
||||||
private String sns;
|
private String sns;
|
||||||
|
/**
|
||||||
|
* 单据日期
|
||||||
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private Date voucherDate;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,8 @@ public class StoreProductStorageServiceImpl implements IStoreProductStorageServi
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
// 新增档口商品入库
|
// 新增档口商品入库
|
||||||
StoreProductStorage storeProdStorage = BeanUtil.toBean(storeProdStorageDTO, StoreProductStorage.class)
|
StoreProductStorage storeProdStorage = BeanUtil.toBean(storeProdStorageDTO, StoreProductStorage.class)
|
||||||
.setCode(code).setQuantity(totalNum).setProduceAmount(produceAmount).setOperatorId(loginUser.getUserId()).setOperatorName(loginUser.getUsername());
|
.setCode(code).setQuantity(totalNum).setProduceAmount(produceAmount).setOperatorId(loginUser.getUserId())
|
||||||
|
.setOperatorName(loginUser.getUsername()).setVoucherDate(DateUtils.getNowDate());
|
||||||
int count = this.storageMapper.insert(storeProdStorage);
|
int count = this.storageMapper.insert(storeProdStorage);
|
||||||
// 新增档口商品入库明细
|
// 新增档口商品入库明细
|
||||||
List<StoreProductStorageDetail> detailList = storeProdStorageDTO.getDetailList().stream().map(x -> BeanUtil.toBean(x, StoreProductStorageDetail.class)
|
List<StoreProductStorageDetail> detailList = storeProdStorageDTO.getDetailList().stream().map(x -> BeanUtil.toBean(x, StoreProductStorageDetail.class)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue