|
|
|
@ -13,7 +13,9 @@ import org.dromara.common.log.annotation.Log; |
|
|
|
import org.dromara.common.log.enums.BusinessType; |
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
|
import org.dromara.common.web.core.BaseController; |
|
|
|
import org.dromara.common.websocket.utils.WebSocketUtils; |
|
|
|
import org.dromara.im.domain.ImUser; |
|
|
|
import org.dromara.im.domain.bo.ImSensitiveWordBo; |
|
|
|
import org.dromara.im.domain.bo.ImUserBo; |
|
|
|
@ -27,10 +29,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Objects; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.ScheduledExecutorService; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -49,6 +49,8 @@ public class ImUserController extends BaseController { |
|
|
|
|
|
|
|
private final PasswordEncoder passwordEncoder; |
|
|
|
|
|
|
|
private final ScheduledExecutorService scheduledExecutorService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询用户列表 |
|
|
|
*/ |
|
|
|
@ -153,6 +155,10 @@ public class ImUserController extends BaseController { |
|
|
|
@SaCheckPermission("im:user:listCustomer") |
|
|
|
@GetMapping("/listCustomer") |
|
|
|
public TableDataInfo<ImUserVo> listCustomer(ImUserBo bo, PageQuery pageQuery) { |
|
|
|
Set<Long> test = WebSocketUtils.getOnlineUserIds(); |
|
|
|
System.out.println(LoginHelper.getUserId()); |
|
|
|
System.out.println("1111111"); |
|
|
|
System.out.println(test); |
|
|
|
return userService.queryPageListCustomer(bo, pageQuery); |
|
|
|
} |
|
|
|
|
|
|
|
|