From 72a254f120ae42780b77f873e4c4f3bf37345904 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 12:45:32 +0800
Subject: [PATCH] 修改雷达移动入侵报警按create_time逆序返回数据 修改电子围栏获取不按用户部门获取按用户关联获取
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 120 insertions(+), 17 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 a9d10ef..8aead3f 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,29 +1,28 @@
package com.ruoyi.app.position.service.impl;
+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.domain.ArdAppPosition;
import com.ruoyi.app.position.mapper.ArdAppPositionMapper;
import com.ruoyi.app.position.service.IArdAppPositionService;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.utils.tools.GisTool;
-import com.ruoyi.utils.tools.Point;
+import com.ruoyi.utils.gis.GisUtil;
+import com.ruoyi.utils.gis.Point;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
@@ -40,7 +39,14 @@
private ArdAppPositionMapper ardAppPositionMapper;
@Resource
private ISysUserService iSysUserService;
+ @Resource
+ RedisCache redisCache;
+ @Resource
+ ArdWallMapper ardWallMapper;
+ @Resource
+ IArdAlarmWallService ardAlarmWallService;
+ Map<String, String> firstAlarmMap = new HashMap<>();//棣栨鎶ヨ缂撳瓨key:鐢ㄦ埛id_鍥存爮id value: 鎶ヨid
/**
* 鏌ヨapp浣嶇疆
*
@@ -81,10 +87,11 @@
* @return 缁撴灉
*/
@Override
- public int insertArdAppPosition(ArdAppPosition ardAppPosition) {
+ public List<ArdAlarmWall> insertArdAppPosition(ArdAppPosition ardAppPosition) {
ardAppPosition.setId(IdUtils.simpleUUID());
ardAppPosition.setCreateTime(DateUtils.getNowDate());
- return ardAppPositionMapper.insertArdAppPosition(ardAppPosition);
+ ardAppPositionMapper.insertArdAppPosition(ardAppPosition);
+ return DetectionWallAlarm(ardAppPosition);
}
/**
@@ -146,9 +153,10 @@
SysUser user = new SysUser();
user.setDeptId(deptId);
List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user);
- //杩囨护鍦ㄧ嚎
+ //杩囨护鍦ㄧ嚎鍜屽崟鍏电
List<SysUser> onLineList = appUserList.stream()
.filter(sysUser -> (sysUser.getAppOnlineState().equals("1")))
+ .filter(sysUser -> (sysUser.getAppUserType().equals("1")))
.collect(Collectors.toList());
//杩囨护鑼冨洿
for (SysUser sysUser : onLineList) {
@@ -159,7 +167,7 @@
if (longitude == null || latitude == null) {
continue;
}
- double distance = GisTool.getDistance(new double[]{longitude, latitude}, new double[]{lon, lat});
+ double distance = GisUtil.getDistance(new double[]{longitude, latitude}, new double[]{lon, lat});
if (distance <= radius) {
Map<String, Object> params = new HashMap<>();
params.put("longitude", lon);
@@ -174,6 +182,7 @@
}
return filteredList;
}
+
/**
* 鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛(澶氳竟褰�)
* 鍒樿嫃涔�
@@ -192,6 +201,7 @@
//杩囨护鍦ㄧ嚎
List<SysUser> onLineList = appUserList.stream()
.filter(sysUser -> (sysUser.getAppOnlineState().equals("1")))
+ .filter(sysUser -> (sysUser.getAppUserType().equals("1")))
.collect(Collectors.toList());
//杩囨护鑼冨洿
for (SysUser sysUser : onLineList) {
@@ -202,8 +212,8 @@
if (lon == null || lat == null) {
continue;
}
- Point point2D=new Point(lon,lat);
- boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
+ Point point2D = new Point(lon, lat);
+ boolean inPolygon = GisUtil.isInPolygon(point2D, partitionLocation);
if (inPolygon) {
Map<String, Object> params = new HashMap<>();
params.put("longitude", lon);
@@ -218,4 +228,97 @@
}
return filteredList;
}
+
+ /**
+ * 瀹炴椂浣嶇疆妫�娴嬪洿鏍忔姤璀�
+ * 鍒樿嫃涔�
+ * 2023/8/31 8:54:06
+ */
+ public List<ArdAlarmWall> DetectionWallAlarm(ArdAppPosition ardAppPosition) {
+ List<ArdAlarmWall> ardAlarmWalls = new ArrayList<>();
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯儴闂�
+ String userId = ardAppPosition.getUserId();
+ //鑾峰彇鐢ㄦ埛鍏宠仈鐨勬墍鏈夌數瀛愬洿鏍�
+ List<ArdWall> ardWalls = ardWallMapper.selectArdWallListByUserId(userId);
+ if (ardWalls.size() > 0) {
+ //閬嶅巻鎵�鏈夌數瀛愬洿鏍�
+ for (ArdWall wall : ardWalls) {
+ String wallId = wall.getId();//鍥存爮ID
+ String wallType = wall.getType();//鍥存爮绫诲瀷
+ String wallPoi = wall.getWallPoi();//鍥存爮鍧愭爣闆嗗悎
+ //澶勭悊澶氳竟褰㈢殑姣忎釜鐐圭殑缁忕含搴�
+ String[] parts = wallPoi.split(",");
+ List<Point> pointList = new ArrayList<>();
+ for (int i = 0; i < parts.length; i += 3) {
+ Point point = new Point();
+ point.setLongitude(Double.valueOf(parts[i]));
+ point.setLatitude(Double.valueOf(parts[i + 1]));
+ pointList.add(point);
+ }
+ //褰撳墠鐢ㄦ埛鐨勪綅缃�
+ 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());
+ ardAlarmWall.setUserId(userId);
+ ardAlarmWall.setAlarmTime(DateUtils.getNowDate());
+ ardAlarmWall.setAlarmType(wall.getType());
+ ardAlarmWall.setLongitude(ardAppPosition.getLongitude());
+ ardAlarmWall.setLatitude(ardAppPosition.getLatitude());
+ ardAlarmWall.setAltitude(ardAppPosition.getAltitude());
+ String key = userId + "_" + wallId;//鏈�鍚庝竴娆℃姤璀︾紦瀛榢ey
+ //鎸夌被鍨嬪尯鍒嗗洿鏍忕鍏ユ垨鑰呯鍑�
+ if ("1".equals(wallType)) {
+ if (inPolygon) {
+ //绂佸叆鍥存爮鍒欒嫢鍦ㄥ洿鏍忓唴,鑾峰彇棣栨杩涘叆鍥存爮鎶ヨID
+ String lastInAlarmId = firstAlarmMap.get(key);
+ //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁棣栨杩涘叆鍥存爮鍐�
+ if (lastInAlarmId == null) {
+ //褰撳墠鐢ㄦ埛棣栨杩涘叆鐢熸垚鎶ヨ
+ String uuid = IdUtils.simpleUUID();
+ ardAlarmWall.setId(uuid);
+ ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
+ //璁板綍棣栨鎶ヨid
+ firstAlarmMap.put(key, uuid);
+ } else {
+ //鐢ㄦ埛宸茶繘鍏ユ洿鏂版渶鍚庢姤璀�
+ ardAlarmWall.setId(lastInAlarmId);
+ ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
+ }
+ ardAlarmWalls.add(ardAlarmWall);
+ } else {
+ //绂佸叆鍥存爮鍒欒嫢鍦ㄥ洿鏍忓鍒欑Щ闄ゆ姤璀︾紦瀛�
+ firstAlarmMap.remove(key);
+ }
+ } else//绂佸嚭
+ {
+ //鍒ゆ柇褰撳墠鐢ㄦ埛浣嶇疆鏄惁鍦ㄥ洿鏍忓
+ if (!inPolygon) {
+ //绂佸嚭鍥存爮鍒欒嫢鍦ㄥ洿鏍忓,鑾峰彇棣栨璧板嚭鍥存爮鎶ヨID
+ String lastAlarmId = firstAlarmMap.get(key);
+ //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁棣栨鍦ㄥ洿鏍忓
+ if (lastAlarmId == null) {
+ String uuid = IdUtils.simpleUUID();
+ //褰撳墠鐢ㄦ埛棣栨鍑哄洿鏍忕敓鎴愭姤璀�
+ ardAlarmWall.setId(uuid);
+ ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
+ //璁板綍棣栨鎶ヨid
+ firstAlarmMap.put(key, uuid);
+ } else {
+ //鐢ㄦ埛宸茬粡鍦ㄥ洿鏍忓鏇存柊鎶ヨ
+ ardAlarmWall.setId(lastAlarmId);
+ ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
+ }
+ ardAlarmWalls.add(ardAlarmWall);
+ } else {
+ //绉婚櫎棣栨鎶ヨ缂撳瓨
+ firstAlarmMap.remove(key);
+ }
+ }
+ }
+ }
+ return ardAlarmWalls;
+ }
}
--
Gitblit v1.9.3