Merge remote-tracking branch 'origin/hckx' into hckx

maven

10 小时以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

 src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
@@ -13,6 +16,8 @@
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;

/**
 * @author :yys
@@ -38,10 +43,24 @@
    }

    /**
     * 导出
     */
    @PostMapping("/export")
    @ApiOperation(value = "导出定时任务")
    public void export(HttpServletResponse response) {
        Page page = new Page<>(-1,-1);
        TimingTaskDto timingTask = new TimingTaskDto();
        IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
        ExcelUtil<TimingTaskDto> util = new ExcelUtil<>(TimingTaskDto.class);
        util.exportExcel(response, list.getRecords(), "导出定时任务");
    }

    /**
     * 定时巡检任务表新增修改
     */
    @PostMapping("/addOrEditTimingTask")
    @ApiOperation(value = "新增修改定时任务")
    @Log(title = "定时任务", businessType = BusinessType.INSERT)
    public R addOrEditTimingTask(@RequestBody TimingTaskDto timingTaskDto) throws SchedulerException {
        return R.ok(timingTaskService.addOrEditTimingTask(timingTaskDto));
    }
@@ -51,6 +70,7 @@
     */
    @DeleteMapping("/delTimingTask")
    @ApiOperation(value = "删除定时任务")
    @Log(title = "定时任务", businessType = BusinessType.DELETE)
    public R remove(@RequestBody Long[] ids) {
        return R.ok(timingTaskService.delByIds(ids));
    }