From 4b4a35fc7cc56a8b304ca35f0a9ec0bdd2e0e036 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:41:48 +0800
Subject: [PATCH] fix:路径规划补充提交
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 219 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 195 insertions(+), 24 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
index 2d79ff0..0800113 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
@@ -1,16 +1,22 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ManageAccount;
+import com.moral.api.entity.ManageCoordinate;
import com.moral.api.entity.ManageCoordinateDetail;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.pojo.dto.cruiser.CruiserDTO;
import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.util.RoadUtils;
import com.moral.constant.RedisConstants;
+import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +28,8 @@
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+
+import java.awt.geom.Point2D;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
@@ -42,6 +50,9 @@
@Autowired
private RedisTemplate redisTemplate;
+
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
/**
* ���������������
* @param params
@@ -191,38 +202,44 @@
@Transactional
public Integer batchAll(Map<String, Object> params) {
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ String type = params.get("type").toString();
int coordinateId = Integer.parseInt(params.get("coordinateId").toString());
QueryWrapper<ManageCoordinateDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("coordinate_id",coordinateId);
- /* String time1 = params.remove("time1").toString();
- String time2 = params.remove("time2").toString();
- long l = DateUtils.compareDateStrDay(time1, time2);
- if (l>0){
- params.put("time1",time1);
- params.put("time2",time2);
- }else {
- params.put("time1",time2);
- params.put("time2",time1);
- }*/
int j =0;
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
// List<CruiserDTO> cruiserInfo = (List<CruiserDTO>) params.get("list");
- List<HashMap<String, Object>> list = (List<HashMap<String, Object>>) params.get("list");
- List<CruiserDTO> cruiserInfo = list.stream().distinct()
- .map(map -> {
+ List<CruiserDTO> cruiserInfo;
+ //������������
+ if (type.equals("1")){
+ List<HashMap<String, Object>> list = (List<HashMap<String, Object>>) params.get("list");
+ cruiserInfo = list.stream().distinct()
+ .map(map -> {
- CruiserDTO p = new CruiserDTO();
- Double flylat = (Double) map.get("flylat");
- Double flylon = (Double) map.get("flylon");
- p.setFlyLat(flylat);
- p.setFlyLon(flylon);
- return p;
- })
- .collect(Collectors.toList());
+ CruiserDTO p = new CruiserDTO();
+ Double flylat = (Double) map.get("flylat");
+ Double flylon = (Double) map.get("flylon");
+ p.setFlyLat(flylat);
+ p.setFlyLon(flylon);
+ return p;
+ })
+ .collect(Collectors.toList());
-
-// List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
-// cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+ }else {
+ //���������������
+ String time1 = params.remove("time1").toString();
+ String time2 = params.remove("time2").toString();
+ long l = DateUtils.compareDateStrDay(time1, time2);
+ if (l>0){
+ params.put("time1",time1);
+ params.put("time2",time2);
+ }else {
+ params.put("time1",time2);
+ params.put("time2",time1);
+ }
+ cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
+ cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+ }
if (ObjectUtils.isEmpty(manageCoordinateDetails)){
for (CruiserDTO cruiserDTO : cruiserInfo) {
Double flyLat = cruiserDTO.getFlyLat();
@@ -264,4 +281,158 @@
}
return 200;
}
+
+ /**
+ * ������������������������
+ *
+ * @param params
+ */
+ @Override
+ public void queryAll(Map<String, Object> params) {
+ //������������������
+ List<ManageCoordinate> coordinates = specialDeviceMapper.selectCoordinate(params.get("mac").toString());
+ //���������������������
+ List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
+ cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+ List<ManageCoordinateDetail> result = new ArrayList<>();
+ for (ManageCoordinate coordinate : coordinates) {
+ String value = coordinate.getValue();
+ if (!ObjectUtils.isEmpty(value)){
+ List<Map<String, Object>> parse = (List<Map<String, Object>>) JSONArray.parse(value);
+
+ for (int i = 0; i < cruiserInfo.size(); i++) {
+ CruiserDTO cruiserDTO = cruiserInfo.get(i);
+ if (ObjectUtils.isEmpty(cruiserDTO)){
+ continue;
+ }
+ Double flyLat = cruiserDTO.getFlyLat();
+ Double flyLon = cruiserDTO.getFlyLon();
+ if (ObjectUtils.isEmpty(flyLat)||ObjectUtils.isEmpty(flyLon)){
+ continue;
+ }
+ boolean inPolygon = isInPolygon(flyLon, flyLat, parse);
+ if (inPolygon){
+ LambdaQueryWrapper<ManageCoordinateDetail> wr = new LambdaQueryWrapper<>();
+ wr.eq(ManageCoordinateDetail::getLongitude,flyLon);
+ wr.eq(ManageCoordinateDetail::getLatitude,flyLat);
+ List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(wr);
+ if (ObjectUtils.isEmpty(manageCoordinateDetails)){
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(flyLat);
+ rsDTO.setLongitude(flyLon);
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinate.getCoordinateId());
+ result.add(rsDTO);
+ cruiserInfo.remove(i);
+ i--;
+ }
+ }
+ }
+
+ }
+ }
+ if(!CollectionUtils.isEmpty(result)){
+ this.saveBatch(result);
+ }
+
+
+
+ }
+
+
+ /**
+ * ���������������������������������������������
+ * @param
+ * @param mapList ������������
+ * @return
+ */
+ public static boolean isInPolygon(Double X,Double Y,List<Map<String, Object>> mapList){
+
+
+ Point2D.Double point = new Point2D.Double(X, Y);
+ List<Point2D.Double> pointList= new ArrayList<Point2D.Double>();
+
+ for (Map<String, Object> param : mapList) {
+ //������
+ String lat = param.get("lat").toString();
+ //������
+ String lng = param.get("lng").toString();
+ Point2D.Double polygonPoint = new Point2D.Double(Double.parseDouble(lng),Double.parseDouble(lat));
+ pointList.add(polygonPoint);
+ }
+ return IsPtInPoly(point,pointList);
+
+ }
+
+ /**
+ * ������������������������������������������������������������������������������������������������������������������������true
+ * @param point ���������
+ * @param pts ������������������
+ * @return ������������������������true,������������false
+ */
+ public static boolean IsPtInPoly(Point2D.Double point, List<Point2D.Double> pts){
+
+ int N = pts.size();
+ boolean boundOrVertex = true; //���������������������������������������������������������������������������������������true
+ int intersectCount = 0;//cross points count of x
+ double precision = 2e-10; //���������������������������0���������������������
+ Point2D.Double p1, p2;//neighbour bound vertices
+ Point2D.Double p = point; //���������
+
+ p1 = pts.get(0);//left vertex
+ for(int i = 1; i <= N; ++i){//check all rays
+ if(p.equals(p1)){
+ return boundOrVertex;//p is an vertex
+ }
+
+ p2 = pts.get(i % N);
+ if(p.x < Math.min(p1.x, p2.x) || p.x > Math.max(p1.x, p2.x)){
+ p1 = p2;
+ continue;
+ }
+
+ if(p.x > Math.min(p1.x, p2.x) && p.x < Math.max(p1.x, p2.x)){
+ if(p.y <= Math.max(p1.y, p2.y)){
+ if(p1.x == p2.x && p.y >= Math.min(p1.y, p2.y)){
+ return boundOrVertex;
+ }
+
+ if(p1.y == p2.y){
+ if(p1.y == p.y){
+ return boundOrVertex;
+ }else{//before ray
+ ++intersectCount;
+ }
+ }else{
+ double xinters = (p.x - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
+ if(Math.abs(p.y - xinters) < precision){
+ return boundOrVertex;
+ }
+
+ if(p.y < xinters){
+ ++intersectCount;
+ }
+ }
+ }
+ }else{
+ if(p.x == p2.x && p.y <= p2.y){
+ Point2D.Double p3 = pts.get((i+1) % N);
+ if(p.x >= Math.min(p1.x, p3.x) && p.x <= Math.max(p1.x, p3.x)){
+ ++intersectCount;
+ }else{
+ intersectCount += 2;
+ }
+ }
+ }
+ p1 = p2;
+ }
+
+ if(intersectCount % 2 == 0){//���������������������
+ return false;
+ } else { //���������������������
+ return true;
+ }
+ }
}
--
Gitblit v1.8.0