From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 159 +++++++++++++++++-----------------------------------
1 files changed, 53 insertions(+), 106 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 b6105ec..837d4fc 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,11 +1,10 @@
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;
import com.ruoyi.alarmpoints.wall.domain.ArdWall;
import com.ruoyi.alarmpoints.wall.mapper.ArdWallMapper;
+import com.ruoyi.app.position.appcontainer.AppContainer;
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.mapper.ArdAppPositionMapper;
import com.ruoyi.app.position.service.IArdAppPositionService;
@@ -15,16 +14,15 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.scheduling.domian.SchedulingParam;
+import com.ruoyi.system.mapper.SysDeptMapper;
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;
@@ -52,6 +50,8 @@
IArdAlarmWallService ardAlarmWallService;
@Resource
private SysUserMapper sysUserMapper;
+ @Resource
+ private SysDeptMapper sysDeptMapper;
Map<String, String> firstAlarmMap = new HashMap<>();//棣栨鎶ヨ缂撳瓨key:鐢ㄦ埛id_鍥存爮id value: 鎶ヨid
/**
@@ -98,7 +98,12 @@
ardAppPosition.setId(IdUtils.simpleUUID());
ardAppPosition.setCreateTime(DateUtils.getNowDate());
ardAppPositionMapper.insertArdAppPosition(ardAppPosition);
- return DetectionWallAlarm(ardAppPosition);
+ try{
+ return DetectionWallAlarm(ardAppPosition);
+ }finally {
+ AppContainer.getArdAppPositionMap().put(ardAppPosition.getUserId(),ardAppPosition);//瀹炴椂浣嶇疆瀛樺叆瀹瑰櫒
+ }
+
}
/**
@@ -478,111 +483,53 @@
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);
- }
- }
+ @Override
+ public List<ArdAppPosition> getAPPPositionByUserIdAndTime(Map<String, String> para) {
+ String userId = para.get("userId");
+ String beginTime = para.get("beginTime");
+ String endTime = para.get("endTime");
+ List<ArdAppPosition> result = ardAppPositionMapper.getAPPPositionByUserIdAndTime(userId,beginTime,endTime);
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);
+ @Override
+ public List<Map<String,Object>> getOnlineAPPSoilderByCommanderId(String userId) {
+ SysUser sysUser = sysUserMapper.selectUserById(userId);//鑾峰彇绯荤粺鐢ㄦ埛
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.add(sysUser.getDeptId());
+ deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//閫掑綊鏌ヨ涓嬪睘閮ㄩ棬涓婚敭
+ List<SysUser> result = sysUserMapper.getOwnAndChildrenOnlineSoilderList(deptIdList);
+ List<Map<String,Object>> resultList = new ArrayList();
+ for(SysUser sysUserIn : result){
+ Map<String,Object> map = new HashMap();
+ map.put("userId",sysUserIn.getUserId());
+ map.put("deptId",sysUserIn.getDeptId());
+ map.put("userName",sysUserIn.getUserName());
+ map.put("nickName",sysUserIn.getNickName());
+ try{
+ map.put("longitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getLongitude());
+ map.put("latitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getLatitude());
+ map.put("altitude",AppContainer.getArdAppPositionMap().get(sysUserIn.getUserId()).getAltitude());
+ }catch(Exception e){
+ ArdAppPosition ardAppPosition = ardAppPositionMapper.getLastAPPPositionByUserId(sysUserIn.getUserId());
+ map.put("longitude",ardAppPosition.getLongitude());
+ map.put("latitude",ardAppPosition.getLatitude());
+ map.put("altitude",ardAppPosition.getAltitude());
}
+ resultList.add(map);
}
- return result;
- }*/
+ return resultList;
+ }
- /*@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);
- }
+ public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
+ deptIdListr.addAll(deptIdList);
+ List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
+ if(result.size() != 0){
+ deptIdListr.addAll(result);
+ result = getOwnAndChildrenDeptIdList(result,deptIdListr);
}
- //鏌ョ湅杞﹁締浣嶇疆鐢宠
- 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;
- }*/
+ deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
+ return deptIdListr;
+ }
+
}
--
Gitblit v1.9.3