From a9f04c57e93b35d923b72ba96ac31290f69bf82b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 28 May 2020 09:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E5=BC=BA?=
 =?UTF-8?q?=E9=80=80=E6=96=B9=E6=B3=95=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitor/SysUserOnlineController.java        | 17 ++++-------------
 .../templates/monitor/online/online.html        |  7 ++-----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index 2fb1bdc8..1c36b111 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -1,7 +1,6 @@
 package com.ruoyi.web.controller.monitor;
 
 import java.util.List;
-
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,12 +8,12 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 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.page.TableDataInfo;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.OnlineStatus;
 import com.ruoyi.framework.shiro.session.OnlineSession;
@@ -57,21 +56,13 @@ public class SysUserOnlineController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 1、删除了 forceLogout 方法
-     * 2、将 batchForceLogout 和 forceLogout 的权限逻辑 改成了 OR【按需要设定】
-     * 3、@RequestParam("ids[]") ==> @RequestParam("ids")
-     * 4、开源拥有者 可以斟酌一下
-     * @param ids
-     * @return
-     */
-    @RequiresPermissions(value = {"monitor:online:batchForceLogout","monitor:online:forceLogout"},logical = Logical.OR)
+    @RequiresPermissions(value = { "monitor:online:batchForceLogout", "monitor:online:forceLogout" }, logical = Logical.OR)
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
     @PostMapping("/batchForceLogout")
     @ResponseBody
-    public AjaxResult batchForceLogout(@RequestParam("ids") String[] ids)
+    public AjaxResult batchForceLogout(String ids)
     {
-        for (String sessionId : ids)
+        for (String sessionId : Convert.toStrArray(ids))
         {
             SysUserOnline online = userOnlineService.selectOnlineById(sessionId);
             if (online == null)
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
index 9d0068de..3ee925f3 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
@@ -114,9 +114,7 @@
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
-		            	// 传值改成 array 类型
-		            	var ids = [row.sessionId]
-		                var msg = '<a class="btn btn-danger btn-xs ' + forceFlag + '" href="javascript:void(0)" onclick="forceLogout(\'' + ids + '\')"><i class="fa fa-sign-out"></i>强退</a> ';
+		                var msg = '<a class="btn btn-danger btn-xs ' + forceFlag + '" href="javascript:void(0)" onclick="forceLogout(\'' + row.sessionId + '\')"><i class="fa fa-sign-out"></i>强退</a> ';
 		                return msg;
 		            }
 		        }]
@@ -125,7 +123,6 @@
 		});
 
 		// 单条强退
-		// 将该请求并到  batchForceLogout 中
 		function forceLogout(sessionId) {
 		    $.modal.confirm("确定要强制选中用户下线吗？", function() {
 		    	var data = { "ids": sessionId };
@@ -142,7 +139,7 @@
 		    }
 		    $.modal.confirm("确认要强退选中的" + rows.length + "条数据吗?", function() {
 		        var url = prefix + "/batchForceLogout";
-		        var data = { "ids": rows };
+		        var data = { "ids": rows.join() };
 		        $.operate.post(url, data);
 		    });
 		}