From 8bafb39c563225acb1068a3b83462c33f4b3bab7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 05 八月 2023 16:37:26 +0800
Subject: [PATCH] 获取权限下用户和兴趣点
---
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
index 465b865..69a7747 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
@@ -139,18 +139,7 @@
List<SysUser> list = sysUserService.selectUserList(user);
return AjaxResult.success(list);
}
- /**
- * 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
- */
- @ApiOperation("鑾峰彇鎵�鏈塧pp鐢ㄦ埛")
- @GetMapping("/getAppUserlist")
- public AjaxResult getAppUserlist(Long deptId)
- {
- SysUser user=new SysUser();
- user.setDeptId(deptId);
- List<SysUser> list = sysUserService.selectAppUserList(user);
- return AjaxResult.success(list);
- }
+
/**
* 鑾峰彇鎵�鏈塧pp鐢ㄦ埛
@@ -161,30 +150,36 @@
{
SysUser user=new SysUser();
user.setDeptId(deptId);
- List<SysUser> list = sysUserService.selectAppUserList(user);
+ List<SysUser> list = sysUserService.selectAllAppUserList(user);
List<SysUser> onLineList=new ArrayList<>();
List<SysUser> offLineList=new ArrayList<>();
for(SysUser sysUser:list)
{
-
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
if(ardAppPosition!=null) {
Map<String, Object> params =new HashMap<>();
params.put("longitude", ardAppPosition.getLongitude());
- params.put("lagitude", ardAppPosition.getLatitude());
+ params.put("latitude", ardAppPosition.getLatitude());
params.put("altitude", ardAppPosition.getAltitude());
params.put("bearing", ardAppPosition.getBearing());
sysUser.setParams(params);
}
- Boolean online = rongCloudService.checkOnline(sysUser.getUserId());
- if(online)
+ if(StringUtils.isNotNull(sysUser.getAppOnlineState()))
{
- onLineList.add(sysUser);
+ if(sysUser.getAppOnlineState().equals("1"))
+ {
+ onLineList.add(sysUser);
+ }
+ else
+ {
+ offLineList.add(sysUser);
+ }
}
else
{
offLineList.add(sysUser);
}
+
}
Map<String,Object> onlineMap=new HashMap<>();
onlineMap.put("children",onLineList);
--
Gitblit v1.9.3