From 6e54b432ab969eccb47b0aa388b95bf14e398790 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 31 八月 2023 10:34:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 16 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 bd751a8..db67b30 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,27 @@
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.util.*;
import java.util.stream.Collectors;
@@ -81,10 +79,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);
}
/**
@@ -160,7 +159,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);
@@ -175,6 +174,7 @@
}
return filteredList;
}
+
/**
* 鑾峰彇灏佹帶鍦堝唴鎵�鏈夊湪绾縜pp鐢ㄦ埛(澶氳竟褰�)
* 鍒樿嫃涔�
@@ -204,8 +204,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);
@@ -220,4 +220,81 @@
}
return filteredList;
}
+
+
+ @Resource
+ RedisCache redisCache;
+ @Resource
+ ArdWallMapper ardWallMapper;
+ @Resource
+ IArdAlarmWallService ardAlarmWallService;
+ Map<String, String> userLastAlarm = new HashMap<>();
+
+ /**
+ * 瀹炴椂浣嶇疆妫�娴嬪洿鏍忔姤璀�
+ * 鍒樿嫃涔�
+ * 2023/8/31 8:54:06
+ */
+ public List<ArdAlarmWall> DetectionWallAlarm(ArdAppPosition ardAppPosition) {
+ 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);
+ if (ardWalls.size() > 0) {
+ for (ArdWall wall : ardWalls) {
+ 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();
+ userPoint.setLongitude(ardAppPosition.getLongitude());
+ userPoint.setLatitude(ardAppPosition.getLatitude());
+ boolean inPolygon = GisUtil.isInPolygon(userPoint, pointList);
+ if (inPolygon) {
+ String lastAlarmId = userLastAlarm.get(userId);
+ ArdAlarmWall ardAlarmWall = new ArdAlarmWall();
+ ardAlarmWall.setWallId(wall.getId());
+ ardAlarmWall.setWallName(wall.getWallName());
+ ardAlarmWall.setUserId(userId);
+ ardAlarmWall.setAlarmTime(new Date());
+ ardAlarmWall.setAlarmType(wall.getType());
+ ardAlarmWall.setLongitude(ardAppPosition.getLongitude());
+ ardAlarmWall.setLatitude(ardAppPosition.getLatitude());
+ ardAlarmWall.setAltitude(ardAppPosition.getAltitude());
+ if (lastAlarmId == null) {
+ String uuid = IdUtils.simpleUUID();
+ // 褰撳墠鐢ㄦ埛涓婁竴娆＄姸鎬佹湭杩涘叆锛岀敓鎴愭姤璀�
+ ardAlarmWall.setId(uuid);
+ ardAlarmWallService.insertArdAlarmWall(ardAlarmWall);
+ //鏇存柊鏈�鍚庢姤璀d
+ userLastAlarm.put(userId, uuid);
+ } else {
+ // 涓婁竴娆＄敤鎴风姸鎬佸凡杩涘叆锛屾洿鏂版渶鍚庢姤璀�
+ ardAlarmWall.setId(lastAlarmId);
+ ardAlarmWallService.updateArdAlarmWall(ardAlarmWall);
+ }
+ ardAlarmWalls.add(ardAlarmWall);
+ }
+ else
+ {
+ //绉婚櫎鏈�鍚庢姤璀d
+ userLastAlarm.remove(userId);
+ }
+ }
+ }
+ return ardAlarmWalls;
+ }
}
--
Gitblit v1.9.3