Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

6 天以前 d06ef3f44d6dc19dae223ab420165369ea13cc16

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

@@ -3,7 +3,6 @@
import java.util.List;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

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;

@@ -15,7 +14,7 @@
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.AjaxResult;

import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.project.monitor.service.ISysOperLogService;

@@ -54,17 +53,18 @@
    @Log(title = "操作日志", businessType = BusinessType.DELETE)

    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")

    @DeleteMapping("/{operIds}")

    public AjaxResult remove(@PathVariable Long[] operIds)

    public R<?> remove(@PathVariable Long[] operIds)
    {

        return toAjax(operLogService.deleteOperLogByIds(operIds));

        operLogService.deleteOperLogByIds(operIds);
        return R.ok();
    }



    @Log(title = "操作日志", businessType = BusinessType.CLEAN)

    @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")

    @DeleteMapping("/clean")

    public AjaxResult clean()

    public R<?> clean()
    {

        operLogService.cleanOperLog();

        return success();

        return R.ok();
    }

}