From 97f4a9b9621eca21da79df727121f5fac12cc42a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 一月 2024 10:01:41 +0800
Subject: [PATCH] app单兵端发起查看指挥端位置及车辆位置提交
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index 5c227bb..6fd2713 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.app.position.service.impl;
+import com.alibaba.fastjson2.JSON;
import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
import com.ruoyi.alarm.wall.service.IArdAlarmWallService;
@@ -14,6 +15,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.scheduling.domian.SchedulingParam;
+import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.gis.Point;
@@ -24,6 +26,8 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
+
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
@@ -45,6 +49,8 @@
ArdWallMapper ardWallMapper;
@Resource
IArdAlarmWallService ardAlarmWallService;
+ @Resource
+ private SysUserMapper sysUserMapper;
Map<String, String> firstAlarmMap = new HashMap<>();//棣栨鎶ヨ缂撳瓨key:鐢ㄦ埛id_鍥存爮id value: 鎶ヨid
/**
@@ -238,12 +244,8 @@
List<ArdAlarmWall> ardAlarmWalls = new ArrayList<>();
//鑾峰彇褰撳墠鐢ㄦ埛鐨勯儴闂�
String userId = ardAppPosition.getUserId();
- SysUser sysUser = redisCache.getCacheObject("user_list:" + userId);
- Long deptId = sysUser.getDeptId();
- //鑾峰彇褰撳墠閮ㄩ棬鍙婂瓙閮ㄩ棬涓嬬殑鎵�鏈夌數瀛愬洿鏍�
- ArdWall ardWall = new ArdWall();
- ardWall.setDeptId(deptId);
- List<ArdWall> ardWalls = ardWallMapper.selectArdWallList(ardWall);
+ //鑾峰彇鐢ㄦ埛鍏宠仈鐨勬墍鏈夌數瀛愬洿鏍�
+ List<ArdWall> ardWalls = ardWallMapper.selectArdWallListByUserId(userId);
if (ardWalls.size() > 0) {
//閬嶅巻鎵�鏈夌數瀛愬洿鏍�
for (ArdWall wall : ardWalls) {
@@ -325,4 +327,53 @@
}
return ardAlarmWalls;
}
+
+ @Override
+ public Map<String, List<SysUser>> getOnlinePCOrCommander(String usersId) {
+ Map<String, List<SysUser>> result = new HashMap();
+ List<SysUser> commanderList = sysUserMapper.getOnlineCommander(usersId);
+ result.put("commander",commanderList);
+ try{
+ List<String> onLinePCIdList = new ArrayList();
+ //onLinePCIdList.addAll(ONLINE_USER_SESSIONS.keySet());
+ for(String id : ONLINE_USER_SESSIONS.keySet()){
+ onLinePCIdList.add(id.split("_")[0]);
+ }
+ List<SysUser> pcList = sysUserMapper.getOnlinePC(usersId,onLinePCIdList);
+ result.put("pc",pcList);
+ }catch(Exception e){
+ result.put("pc",new ArrayList());
+ }
+ return result;
+ }
+
+ @Override
+ public void sendCheckCommandersPosition(String usersId,Map<String, Object> para) {
+ String reason = (String) para.get("reason");
+ List<String> usersIdList = (List<String>) para.get("usersIdList");
+ for(String commanderId : usersIdList){
+ //璁剧疆key涓篶heckCommanderPosition_鎸囨尌绔富閿甠鍗曞叺绔富閿�
+ String key = "checkCommanderPosition_" + commanderId + "_" + usersId;
+ Map<String,Object> value = new HashMap();
+ value.put("reason",reason);
+ value.put("state","0");
+ value.put("begin","");
+ redisCache.setCacheObject(key, JSON.toJSONString(value));
+ }
+ }
+
+ @Override
+ public void sendCheckSYCarsPosition(String usersId, Map<String, Object> para) {
+ String reason = (String) para.get("reason");
+ List<String> usersIdList = (List<String>) para.get("usersIdList");
+ for(String commanderId : usersIdList){
+ //璁剧疆key涓篶heckCommanderPosition_鎸囨尌绔富閿�/PC绔富閿甠鍗曞叺绔富閿�
+ String key = "checkSYCarsPosition_" + commanderId + "_" + usersId;
+ Map<String,Object> value = new HashMap();
+ value.put("reason",reason);
+ value.put("state","0");
+ value.put("begin","");
+ redisCache.setCacheObject(key, JSON.toJSONString(value));
+ }
+ }
}
--
Gitblit v1.9.3