提取通用方法到基类控制器

RuoYi

2021-08-08 aa2ca750c1dd866aa0ce3c5bbe1ceeaed1fa9b5f

 src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java

@@ -12,8 +12,9 @@
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.constant.Constants;

import com.ruoyi.common.exception.job.TaskException;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.job.CronUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

@@ -77,14 +78,22 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:add')")

    @Log(title = "定时任务", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException

    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException

    {

        if (!CronUtils.isValid(sysJob.getCronExpression()))

        if (!CronUtils.isValid(job.getCronExpression()))

        {

            return AjaxResult.error("cron表达式不正确");

            return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");

        }

        sysJob.setCreateBy(SecurityUtils.getUsername());

        return toAjax(jobService.insertJob(sysJob));

        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))

        {

            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");

        }

        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))

        {

            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");

        }

        job.setCreateBy(getUsername());

        return toAjax(jobService.insertJob(job));

    }



    /**

@@ -93,14 +102,22 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")

    @Log(title = "定时任务", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException

    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException

    {

        if (!CronUtils.isValid(sysJob.getCronExpression()))

        if (!CronUtils.isValid(job.getCronExpression()))

        {

            return AjaxResult.error("cron表达式不正确");

            return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");

        }

        sysJob.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(jobService.updateJob(sysJob));

        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))

        {

            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi://'调用");

        }

        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))

        {

            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)//'调用");

        }

        job.setUpdateBy(getUsername());

        return toAjax(jobService.updateJob(job));

    }



    /**