From 9d79af48261f04c1bd2cc0113e5c7c10060637b4 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Mon, 6 Mar 2023 16:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysUserOnlineContr?=
 =?UTF-8?q?oller.java=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserOnlineController.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java
index 2044e431..5276f1b9 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java
@@ -52,12 +52,13 @@ public class SysUserOnlineController {
     @Resource
     private BaseCommonService baseCommonService;
 
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+//    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @GetMapping("/list")
     public Result<Page<SysUserOnlineVO>> list(@RequestParam(name="username", required=false) String username, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                               @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
         Collection<String> keys = redisTemplate.keys(CommonConstant.PREFIX_USER_TOKEN + "*");
         SysUserOnlineVO online;
-        List<SysUserOnlineVO> onlineList = new ArrayList<SysUserOnlineVO>();
+        List<SysUserOnlineVO> onlineList = new ArrayList<>();
         for (String key : keys) {
             online = new SysUserOnlineVO();
             String token = (String) redisUtil.get(key);
@@ -75,7 +76,7 @@ public class SysUserOnlineController {
             }
         }
 
-        Page<SysUserOnlineVO> page = new Page<SysUserOnlineVO>(pageNo, pageSize);
+        Page<SysUserOnlineVO> page = new Page<>(pageNo, pageSize);
         int count = onlineList.size();
         List<SysUserOnlineVO> pages = new ArrayList<>();
         //计算当前页第一条数据的下标
@@ -92,7 +93,7 @@ public class SysUserOnlineController {
 
         Collections.reverse(onlineList);
         onlineList.removeAll(Collections.singleton(null));
-        Result<Page<SysUserOnlineVO>> result = new Result<Page<SysUserOnlineVO>>();
+        Result<Page<SysUserOnlineVO>> result = new Result<>();
         result.setSuccess(true);
         result.setResult(page);
         return result;
@@ -101,7 +102,8 @@ public class SysUserOnlineController {
     /**
      * 强退用户
      */
-    @RequestMapping(value = "/forceLogout",method = RequestMethod.POST)
+//    @RequestMapping(value = "/forceLogout",method = RequestMethod.POST)
+    @PostMapping("/forceLogout")
     public Result<Object> forceLogout(@RequestBody SysUserOnlineVO online) {
         //用户退出逻辑
         if(oConvertUtils.isEmpty(online.getToken())) {