From c4efaf9345da0f7012a277408bef6db24cdaf542 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 25 一月 2024 16:09:50 +0800
Subject: [PATCH] 单兵端查看指挥端位置提交
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 148 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 142 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..d4ce82c 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,16 +15,20 @@
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;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
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 +50,8 @@
ArdWallMapper ardWallMapper;
@Resource
IArdAlarmWallService ardAlarmWallService;
+ @Resource
+ private SysUserMapper sysUserMapper;
Map<String, String> firstAlarmMap = new HashMap<>();//棣栨鎶ヨ缂撳瓨key:鐢ㄦ埛id_鍥存爮id value: 鎶ヨid
/**
@@ -238,12 +245,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 +328,137 @@
}
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 List<Map<String,Object>> getOnlineCommanderPosition(String soilderId) {
+ List<Map<String,Object>> result = ardAppPositionMapper.getOnlineCommanderPosition(soilderId);
+ 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","");
+ value.put("commanderId",commanderId);
+ value.put("soilderId",usersId);
+ 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涓篶heckSYCarsPosition_鎸囨尌绔富閿�/PC绔富閿甠鍗曞叺绔富閿�
+ String key = "checkSYCarsPosition_" + commanderId + "_" + usersId;
+ Map<String,Object> value = new HashMap();
+ value.put("reason",reason);
+ value.put("state","0");
+ value.put("begin","");
+ value.put("commanderId",commanderId);
+ value.put("soilderId",usersId);
+ redisCache.setCacheObject(key, JSON.toJSONString(value));
+ }
+ }*/
+
+ /*@Override
+ public List<Map<String, Object>> getCheckCommandersPosition(String usersId) {
+ String key = "checkCommanderPosition_" + usersId + "_";
+ List<Object> keyValueList = redisCache.getListKey(key);
+ List<Map<String, Object>> result = new ArrayList();
+ for(Object o : keyValueList){
+ Map<String,Object> map = JSON.parseObject((String) o);
+ if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+ SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+ map.put("userName",sysUser.getUserName());
+ result.add(map);
+ }
+ }
+ return result;
+ }*/
+
+ /*@Override
+ public List<Map<String, Object>> getCheckSYCarsPosition(String usersId) {
+ String key = "checkSYCarsPosition_" + usersId + "_";
+ List<Object> keyValueList = redisCache.getListKey(key);
+ List<Map<String, Object>> result = new ArrayList();
+ for(Object o : keyValueList){
+ Map<String,Object> map = JSON.parseObject((String) o);
+ if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+ SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+ map.put("userName",sysUser.getUserName());
+ result.add(map);
+ }
+ }
+ return result;
+ }*/
+
+ /*@Override
+ public Map<String, List<Map<String, Object>>> getCheckPosition(String usersId) {
+ Map<String, List<Map<String, Object>>> result = new HashMap();
+ //鏌ョ湅鎸囨尌绔綅缃敵璇�
+ String keyCommanderPosition = "checkCommanderPosition_" + usersId + "_";
+ List<Object> keyValueCommanderPositionList = redisCache.getListKey(keyCommanderPosition);
+ List<Map<String, Object>> resultCommanderPosition = new ArrayList();
+ for(Object o : keyValueCommanderPositionList){
+ Map<String,Object> map = JSON.parseObject((String) o);
+ if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+ SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+ map.put("userName",sysUser.getUserName());
+ if(sysUser.getNickName() != null){
+ map.put("nickName",sysUser.getNickName());
+ }else{
+ map.put("nickName",sysUser.getNickName());
+ }
+ resultCommanderPosition.add(map);
+ }
+ }
+ //鏌ョ湅杞﹁締浣嶇疆鐢宠
+ String keySYCarsPosition = "checkSYCarsPosition_" + usersId + "_";
+ List<Object> keyValueSYCarsPositionList = redisCache.getListKey(keySYCarsPosition);
+ List<Map<String, Object>> resultSYCarsPosition = new ArrayList();
+ for(Object o : keyValueSYCarsPositionList){
+ Map<String,Object> map = JSON.parseObject((String) o);
+ if(((String)map.get("state")).equals("0")){//state涓�0灏辨槸鏈鎵�
+ SysUser sysUser = sysUserMapper.selectUserById((String) map.get("soilderId"));
+ map.put("userName",sysUser.getUserName());
+ if(sysUser.getNickName() != null){
+ map.put("nickName",sysUser.getNickName());
+ }else{
+ map.put("nickName",sysUser.getNickName());
+ }
+ resultSYCarsPosition.add(map);
+ }
+ }
+ result.put("commander",resultCommanderPosition);
+ result.put("SYCars",resultSYCarsPosition);
+ return result;
+ }*/
}
--
Gitblit v1.9.3