From 7931656b17def59e738843eebb13411051e29a39 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 一月 2024 15:13:43 +0800
Subject: [PATCH] 单兵端查看已通过的申请提交
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 229 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 182 insertions(+), 47 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 614f958..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;
/**
@@ -39,7 +44,16 @@
private ArdAppPositionMapper ardAppPositionMapper;
@Resource
private ISysUserService iSysUserService;
+ @Resource
+ RedisCache redisCache;
+ @Resource
+ ArdWallMapper ardWallMapper;
+ @Resource
+ IArdAlarmWallService ardAlarmWallService;
+ @Resource
+ private SysUserMapper sysUserMapper;
+ Map<String, String> firstAlarmMap = new HashMap<>();//棣栨鎶ヨ缂撳瓨key:鐢ㄦ埛id_鍥存爮id value: 鎶ヨid
/**
* 鏌ヨapp浣嶇疆
*
@@ -222,35 +236,23 @@
return filteredList;
}
-
- @Resource
- RedisCache redisCache;
- @Resource
- ArdWallMapper ardWallMapper;
- @Resource
- IArdAlarmWallService ardAlarmWallService;
- Map<String, String> userInLastAlarm = new HashMap<>();
- Map<String, String> userOutLastAlarm = new HashMap<>();
/**
* 瀹炴椂浣嶇疆妫�娴嬪洿鏍忔姤璀�
* 鍒樿嫃涔�
* 2023/8/31 8:54:06
*/
public List<ArdAlarmWall> DetectionWallAlarm(ArdAppPosition ardAppPosition) {
- SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<ArdAlarmWall> ardAlarmWalls=new ArrayList<>();
+ 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) {
- String wallPoi = wall.getWallPoi();
- String wallType = wall.getType();
+ String wallId = wall.getId();//鍥存爮ID
+ String wallType = wall.getType();//鍥存爮绫诲瀷
+ String wallPoi = wall.getWallPoi();//鍥存爮鍧愭爣闆嗗悎
//澶勭悊澶氳竟褰㈢殑姣忎釜鐐圭殑缁忕含搴�
String[] parts = wallPoi.split(",");
List<Point> pointList = new ArrayList<>();
@@ -260,8 +262,10 @@
point.setLatitude(Double.valueOf(parts[i + 1]));
pointList.add(point);
}
- Point userPoint=new Point(ardAppPosition.getLongitude(),ardAppPosition.getLatitude());
- boolean inPolygon = GisUtil.isInPolygon(userPoint, pointList);
+ //褰撳墠鐢ㄦ埛鐨勪綅缃�
+ Point userPoint = new Point(ardAppPosition.getLongitude(), ardAppPosition.getLatitude());
+ boolean inPolygon = GisUtil.isInPolygon(userPoint, pointList);//鍒ゆ柇鏄惁鍦ㄥ洿鏍忓唴
+ //鍒涘缓鍥存爮鎶ヨ瀹炰綋瀵硅薄
ArdAlarmWall ardAlarmWall = new ArdAlarmWall();
ardAlarmWall.setWallId(wall.getId());
ardAlarmWall.setWallName(wall.getWallName());
@@ -271,59 +275,190 @@
ardAlarmWall.setLongitude(ardAppPosition.getLongitude());
ardAlarmWall.setLatitude(ardAppPosition.getLatitude());
ardAlarmWall.setAltitude(ardAppPosition.getAltitude());
- //绂佸叆
- if("1".equals(wallType)) {
- //鍒ゆ柇褰撳墠鐢ㄦ埛浣嶇疆鏄惁鍦ㄥ洿鏍忓唴
+ String key = userId + "_" + wallId;//鏈�鍚庝竴娆℃姤璀︾紦瀛榢ey
+ //鎸夌被鍨嬪尯鍒嗗洿鏍忕鍏ユ垨鑰呯鍑�
+ if ("1".equals(wallType)) {
if (inPolygon) {
- String lastInAlarmId = userInLastAlarm.get(userId);
+ //绂佸叆鍥存爮鍒欒嫢鍦ㄥ洿鏍忓唴,鑾峰彇棣栨杩涘叆鍥存爮鎶ヨID
+ String lastInAlarmId = firstAlarmMap.get(key);
+ //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁棣栨杩涘叆鍥存爮鍐�
if (lastInAlarmId == null) {
+ //褰撳墠鐢ㄦ埛棣栨杩涘叆鐢熸垚鎶ヨ
String uuid = IdUtils.simpleUUID();
- //褰撳墠鐢ㄦ埛涓婁竴娆＄姸鎬佹湭杩涘叆锛岀敓鎴愭姤璀�
ardAlarmWall.setId(uuid);
ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
- //鏇存柊鏈�鍚庢姤璀d
- userInLastAlarm.put(userId, uuid);
+ //璁板綍棣栨鎶ヨid
+ firstAlarmMap.put(key, uuid);
} else {
- //涓婁竴娆＄敤鎴风姸鎬佸凡杩涘叆锛屾洿鏂版渶鍚庢姤璀�
+ //鐢ㄦ埛宸茶繘鍏ユ洿鏂版渶鍚庢姤璀�
ardAlarmWall.setId(lastInAlarmId);
ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
}
ardAlarmWalls.add(ardAlarmWall);
+ } else {
+ //绂佸叆鍥存爮鍒欒嫢鍦ㄥ洿鏍忓鍒欑Щ闄ゆ姤璀︾紦瀛�
+ firstAlarmMap.remove(key);
}
- else
- {
- //绉婚櫎鏈�鍚庢姤璀d
- userInLastAlarm.remove(userId);
- }
- }
- else//绂佸嚭
+ } else//绂佸嚭
{
//鍒ゆ柇褰撳墠鐢ㄦ埛浣嶇疆鏄惁鍦ㄥ洿鏍忓
if (!inPolygon) {
- String lastAlarmId = userOutLastAlarm.get(userId);
+ //绂佸嚭鍥存爮鍒欒嫢鍦ㄥ洿鏍忓,鑾峰彇棣栨璧板嚭鍥存爮鎶ヨID
+ String lastAlarmId = firstAlarmMap.get(key);
+ //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁棣栨鍦ㄥ洿鏍忓
if (lastAlarmId == null) {
String uuid = IdUtils.simpleUUID();
- //褰撳墠鐢ㄦ埛涓婁竴娆＄姸鎬佹湭杩涘叆锛岀敓鎴愭姤璀�
+ //褰撳墠鐢ㄦ埛棣栨鍑哄洿鏍忕敓鎴愭姤璀�
ardAlarmWall.setId(uuid);
ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
- //鏇存柊鏈�鍚庢姤璀d
- userOutLastAlarm.put(userId, uuid);
+ //璁板綍棣栨鎶ヨid
+ firstAlarmMap.put(key, uuid);
} else {
- //涓婁竴娆＄敤鎴风姸鎬佸凡杩涘叆锛屾洿鏂版渶鍚庢姤璀�
+ //鐢ㄦ埛宸茬粡鍦ㄥ洿鏍忓鏇存柊鎶ヨ
ardAlarmWall.setId(lastAlarmId);
ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
}
ardAlarmWalls.add(ardAlarmWall);
- }
- else
- {
- //绉婚櫎鏈�鍚庢姤璀d
- userOutLastAlarm.remove(userId);
+ } else {
+ //绉婚櫎棣栨鎶ヨ缂撳瓨
+ firstAlarmMap.remove(key);
}
}
-
}
}
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