first commit

qiaoba-modules/qiaoba-module-monitor/src/main/java/com/qiaoba/module/monitor/controller/OnlineUserController.java

@@ -1,6 +1,8 @@
 package com.qiaoba.module.monitor.controller;
 
+import com.qiaoba.auth.entity.OnlineUser;
 import com.qiaoba.auth.service.OnlineUserService;
+import com.qiaoba.common.base.entity.BasePage;
 import com.qiaoba.common.base.result.AjaxResult;
 import com.qiaoba.common.database.entity.TableDataInfo;
 import io.swagger.v3.oas.annotations.Operation;
@@ -9,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+
 /**
  * 在线用户管理 Web层
  *
@@ -27,7 +30,7 @@ public class OnlineUserController {
     @PreAuthorize("hasAuthority('monitor:online:list')")
     @Operation(summary = "获取列表")
     @GetMapping("/list")
-    public TableDataInfo getList(String username) {
+    public BasePage<OnlineUser> getList(String username) {
         return TableDataInfo.build(onlineUserService.selectList(username));
     }
 
@@ -35,7 +38,7 @@ public class OnlineUserController {
     @DeleteMapping("/{username}/{deviceSn}")
     @Operation(summary = "强退用户")
     public AjaxResult forceLogout(@PathVariable String username, @PathVariable String deviceSn) {
-        onlineUserService.deleteOne(username, deviceSn);
+        onlineUserService.deleteOne(username, deviceSn, false);
         return AjaxResult.success();
     }
 }