From b9931cda30d13a02c29194bbf387f87b0a9d368b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 六月 2022 15:25:22 +0800
Subject: [PATCH] !192 优化登出方法 Merge pull request !192 from zendwang/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index fb0b002..5bec151 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -1,15 +1,19 @@
package com.ruoyi.web.controller.monitor;
+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.R;
+import com.ruoyi.common.core.domain.PageQuery;
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.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -18,45 +22,47 @@
/**
* 绯荤粺璁块棶璁板綍
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@Api(value = "绯荤粺璁块棶璁板綍", tags = {"绯荤粺璁块棶璁板綍绠＄悊"})
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/logininfor")
-public class SysLogininforController extends BaseController
-{
- @Autowired
- private ISysLogininforService logininforService;
+public class SysLogininforController extends BaseController {
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+ private final ISysLogininforService logininforService;
+
+ @ApiOperation("鏌ヨ绯荤粺璁块棶璁板綍鍒楄〃")
+ @SaCheckPermission("monitor:logininfor:list")
@GetMapping("/list")
- public TableDataInfo list(SysLogininfor logininfor)
- {
- return logininforService.selectPageLogininforList(logininfor);
+ public TableDataInfo<SysLogininfor> list(SysLogininfor logininfor, PageQuery pageQuery) {
+ return logininforService.selectPageLogininforList(logininfor, pageQuery);
}
+ @ApiOperation("瀵煎嚭绯荤粺璁块棶璁板綍鍒楄〃")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
- @GetMapping("/export")
- public void export(SysLogininfor logininfor, HttpServletResponse response)
- {
+ @SaCheckPermission("monitor:logininfor:export")
+ @PostMapping("/export")
+ public void export(SysLogininfor logininfor, HttpServletResponse response) {
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
- ExcelUtil.exportExcel(list, "鐧诲綍鏃ュ織", SysLogininfor.class, response);
+ ExcelUtil.exportExcel(list, "鐧诲綍鏃ュ織", SysLogininfor.class, response);
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @ApiOperation("鍒犻櫎绯荤粺璁块棶璁板綍")
+ @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
- public AjaxResult remove(@PathVariable Long[] infoIds)
- {
+ public R<Void> remove(@PathVariable Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @ApiOperation("娓呯┖绯荤粺璁块棶璁板綍")
+ @SaCheckPermission("monitor:logininfor:remove")
@Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
- public AjaxResult clean()
- {
+ public R<Void> clean() {
logininforService.cleanLogininfor();
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3