From 4c8992891ac92ace938ad81f38d7b9fb6e5cd78c Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期六, 20 七月 2024 21:52:13 +0800 Subject: [PATCH] 森林防火 供应商管理 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java index 4a6ec7c..5344b6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.system.query.SysOperLogQuery; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -36,42 +37,23 @@ */ @RestController @RequestMapping("/operlog") +@Api(tags = "操作日志记录") public class SysOperlogController extends BaseController { @Autowired private ISysOperLogService operLogService; -// @RequiresPermissions("system:operlog:list") -// @GetMapping("/list") -// public TableDataInfo list(SysOperLog operLog) -// { -// startPage(); -// List<SysOperLog> list = operLogService.selectOperLogList(operLog); -// return getDataTable(list); -// } - - @ApiOperation(value = "当前车辆操作日志查询") - @PostMapping("/list") - public AjaxResult list(@RequestBody SysOperLogQuery query) + @RequiresPermissions("system:operlog:list") + @GetMapping("/list") + public TableDataInfo list(SysOperLog operLog) { - LambdaQueryWrapper<SysOperLog> wrapper = new LambdaQueryWrapper<>(); - wrapper.like(SysOperLog::getTitle,"车辆管理"); - wrapper.ne(SysOperLog::getBusinessType,1); - List<SysOperLog> list = operLogService.list(wrapper); - Iterator<SysOperLog> iterator = list.iterator(); - while (iterator.hasNext()){ - SysOperLog sysOperLog = iterator.next(); - String operParam = sysOperLog.getOperParam(); - JSONObject jsonObject = JSONObject.parseObject(operParam); - String carId = jsonObject.getString("carId"); - if(StringUtils.isNotEmpty(carId) && Objects.nonNull(query.getCarId()) && !carId.equals(String.valueOf(query.getCarId()))){ - iterator.remove(); - } - } - return AjaxResult.success(list); + startPage(); + List<SysOperLog> list = operLogService.selectOperLogList(operLog); + return getDataTable(list); } + @Log(title = "操作日志", businessType = BusinessType.EXPORT) @RequiresPermissions("system:operlog:export") @PostMapping("/export") -- Gitblit v1.7.1