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 | 325 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 265 insertions(+), 60 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 121db66..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,45 +1,40 @@
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;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.awt.geom.Point2D;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-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.ManageCoordinateDetail;
-import com.moral.api.mapper.HistorySecondCruiserMapper;
-import com.moral.api.mapper.ManageCoordinateDetailMapper;
-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.Constants;
-import com.moral.constant.RedisConstants;
-import com.moral.util.TokenUtils;
-import com.sun.org.apache.regexp.internal.RE;
@Service
@@ -55,6 +50,9 @@
@Autowired
private RedisTemplate redisTemplate;
+
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
/**
* ���������������
* @param params
@@ -74,10 +72,12 @@
List<Map<String, Object>> data = (List<Map<String, Object>>) params.get("data");
for (Map<String, Object> datum : data) {
- ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
+
String code = datum.get("code").toString();
String state = datum.get("state").toString();
- if (state.equals("1")){
+
+ if (state.equals("2")){
+ ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
String[] rs = code.split("_");
manageCoordinateDetail.setCoordinateId(coordinateId);
manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
@@ -91,25 +91,19 @@
wrapper.eq("latitude",manageCoordinateDetail.getLatitude());
Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
if (integer>=1){
- return null;
+ return 1;
}
manageCoordinateDetailMapper.insert(manageCoordinateDetail);
}else {
- manageCoordinateDetailMapper.deleteById(manageCoordinateDetail.getId());
-// manageCoordinateDetailMapper.delete(wrapper);
+ Object id1 = datum.get("id");
+ if (ObjectUtils.isEmpty(id1)){
+ return 2;
+ }
+ manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
}
}
return 200;
- }
-
- /**
- * ������������������
- * @param id
- */
- @Override
- public void deleteCoordinate(Integer id) {
- manageCoordinateDetailMapper.deleteById(id);
}
@@ -174,12 +168,18 @@
String[] rs = data.split("_");
String flyLon = rs[0];
String flyLat = rs[1];
+// double lonDouble = Double.parseDouble(flyLon);
+// double latDouble = Double.parseDouble(flyLat);
for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
String latitude = manageCoordinateDetail.getLatitude().toString();
String longitude = manageCoordinateDetail.getLongitude().toString();
- if (latitude.equals(flyLat) && longitude.equals(flyLon)){
- manageCoordinateDetail.setLongitude(Double.parseDouble(flyLon));
- manageCoordinateDetail.setLatitude(Double.parseDouble(flyLat));
+// double lonDouble1 = Double.parseDouble(longitude);
+// double latDouble1 = Double.parseDouble(latitude);
+// if (latDouble1==latDouble && lonDouble==lonDouble1){
+ if (flyLon.equals(longitude) && flyLat.equals(latitude)){
+ manageCoordinateDetail.setCode(data);
+ manageCoordinateDetail.setLongitude(cruiserDTO.getFlyLon());
+ manageCoordinateDetail.setLatitude(cruiserDTO.getFlyLat());
rsList1.add(manageCoordinateDetail);
cruiserInfo.remove(i);
break;
@@ -202,32 +202,237 @@
@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);
+ int j =0;
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
- List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
- for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
- String latitude = manageCoordinateDetail.getLatitude().toString();
- String longitude = manageCoordinateDetail.getLongitude().toString();
+// List<CruiserDTO> cruiserInfo = (List<CruiserDTO>) params.get("list");
+ 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());
+
+ }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();
Double flyLon = cruiserDTO.getFlyLon();
- if (!latitude.equals(flyLat+"") || !longitude.equals(flyLon+"")){
- ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
- rsDTO.setLatitude(flyLat);
- rsDTO.setLongitude(flyLon);
- rsDTO.setState("2");
- rsDTO.setCreateTime(new Date());
- rsDTO.setUpdateTime(new Date());
- rsDTO.setCoordinateId(coordinateId);
- int insert = manageCoordinateDetailMapper.insert(rsDTO);
- if (insert!=1){
- return null;
- }
+ if (ObjectUtils.isEmpty(flyLat) || ObjectUtils.isEmpty(flyLon)){
+ continue;
}
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(flyLat);
+ rsDTO.setLongitude(flyLon);
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinateId);
+ manageCoordinateDetailMapper.insert(rsDTO);
+ j++;
+ log.info(j+"");
+ }
+ }else {
+ Map<String,Integer> map = new HashMap<>(manageCoordinateDetails.size()+50);
+ manageCoordinateDetails.forEach(it->map.put(it.getLatitude()+"_"+it.getLongitude(),it.getId()));
+ List<ManageCoordinateDetail> result = new ArrayList<>();
+ for (CruiserDTO cruiserDTO : cruiserInfo) {
+ String fly = cruiserDTO.getFlyLat()+"_"+cruiserDTO.getFlyLon();
+ if(!map.containsKey(fly)){
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(cruiserDTO.getFlyLat());
+ rsDTO.setLongitude(cruiserDTO.getFlyLon());
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinateId);
+ result.add(rsDTO);
+ }
+ }
+ if(!CollectionUtils.isEmpty(result)){
+ this.saveBatch(result);
}
}
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