From 6c1e146bc17c51ed744aa289b20febe339703196 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 11 七月 2022 13:10:41 +0800 Subject: [PATCH] update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index cec09ff..f2dd1ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -3,16 +3,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,44 +23,51 @@ * @author Lion Li */ @Validated -@Api(value = "鎿嶄綔鏃ュ織璁板綍", tags = {"鎿嶄綔鏃ュ織璁板綍绠$悊"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/monitor/operlog") public class SysOperlogController extends BaseController { private final ISysOperLogService operLogService; - @ApiOperation("鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃") + /** + * 鑾峰彇鎿嶄綔鏃ュ織璁板綍鍒楄〃 + */ @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") - public TableDataInfo<SysOperLog> list(SysOperLog operLog) { - return operLogService.selectPageOperLogList(operLog); + public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) { + return operLogService.selectPageOperLogList(operLog, pageQuery); } - @ApiOperation("瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃") + /** + * 瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃 + */ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:operlog:export") - @GetMapping("/export") + @PostMapping("/export") public void export(SysOperLog operLog, HttpServletResponse response) { List<SysOperLog> list = operLogService.selectOperLogList(operLog); ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response); } - @ApiOperation("鍒犻櫎鎿嶄綔鏃ュ織璁板綍") + /** + * 鑾峰彇鎿嶄綔鏃ュ織璁板綍璇︽儏 + */ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE) @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") - public AjaxResult<Void> remove(@PathVariable Long[] operIds) { + public R<Void> remove(@PathVariable Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } - @ApiOperation("娓呯┖鎿嶄綔鏃ュ織璁板綍") + /** + * 娓呯悊鎿嶄綔鏃ュ織璁板綍 + */ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN) @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/clean") - public AjaxResult<Void> clean() { + public R<Void> clean() { operLogService.cleanOperLog(); - return AjaxResult.success(); + return R.ok(); } } -- Gitblit v1.9.3