From 6fe3e9841f25481cf78bd1f102886d4ce35e9e17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 28 Jul 2023 13:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 108 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index 89acda0..0c2c67d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -86,15 +86,11 @@
ArrayList<Double> flyLatList = new ArrayList<>();
//������
ArrayList<Double> flyLonList = new ArrayList<>();
-// HashMap<String, Object> map = new HashMap<>();
-// String mac ="p5dnd7a0243592";
-// String time1 ="2023-05-14 10:40:00";
-// String time2 ="2023-05-14 11:10:00";
-// map.put("mac",mac);
-// map.put("time1",time1);
-// map.put("time2",time2);
-// map.put("height",0.5);
-// List<UAVResultDTO> uavResultDTOS = historySecondUavMapper.reList(map);
+// String mac ="p5dnd7a0243591";
+// String time1 ="2023-07-19 14:14:08";
+// String time2 ="2023-07-19 14:35:29";
+//
+//// List<UAVResultDTO> uavResultDTOS = historySecondUavMapper.reList(map);
// QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
// queryWrapper.select("value");
// queryWrapper.eq("mac",mac);
@@ -104,12 +100,13 @@
if (ObjectUtils.isEmpty(historySecondUavs)){
return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,"null");
}
-
+ int ik=1;
for (HistorySecondUav historySecondUav : historySecondUavs) {
String value = historySecondUav.getValue();
Map map1 = JSON.parseObject(value, Map.class);
flyLatList.add(Double.parseDouble(map1.get("flylat").toString()));
flyLonList.add(Double.parseDouble(map1.get("flylon").toString()));
+ historySecondUav.setId(ik++);
}
Double maxLat = Collections.max(flyLatList);
@@ -166,24 +163,8 @@
}
}
}
- ArrayList<UAVResultDTO> uavResultDTOS1 = new ArrayList<>();
- for (UAVGteForDTO uavGteForDTO : list) {
- ArrayList<String[]> doubleArrayList = new ArrayList<>();
- doubleArrayList.add(uavGteForDTO.getLeftTop());
- doubleArrayList.add(uavGteForDTO.getLeftBottom());
- doubleArrayList.add(uavGteForDTO.getRightTop());
- doubleArrayList.add(uavGteForDTO.getRightBottom());
-// UAVResultDTO result = getResult(doubleArrayList);
-// uavResultDTOS1.add(result);
- }
- if (!ObjectUtils.isEmpty(uavResultDTOS1)){
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),uavResultDTOS1);
-
- }
-
-// ArrayList<List<String>> lists = new ArrayList<>();
HashMap<String,List<String>> rsMap = new HashMap<>();
-// HashMap<String,List<Map<String,Object>>> rsMap1 = new HashMap<>();
+ List<String> stringList = new ArrayList<>();
for (UAVGteForDTO uavGteForDTO : list) {
ArrayList<String> list1 = new ArrayList<>();
ArrayList<String[]> doubleArrayList = new ArrayList<>();
@@ -191,20 +172,30 @@
doubleArrayList.add(uavGteForDTO.getLeftBottom());
doubleArrayList.add(uavGteForDTO.getRightTop());
doubleArrayList.add(uavGteForDTO.getRightBottom());
+ String[] leftTops = uavGteForDTO.getLeftTop();
+ String[] rightBottoms = uavGteForDTO.getRightBottom();
+ Double x1 = Double.parseDouble(leftTops[0]);
+ Double x2 = Double.parseDouble(rightBottoms[0]);
+ Double y1 = Double.parseDouble(leftTops[1]);
+ Double y2 = Double.parseDouble(rightBottoms[1]);
//������������������
- for (HistorySecondUav historySecondUav : historySecondUavs) {
+ for (int i = 0; i < historySecondUavs.size(); i++) {
+ HistorySecondUav historySecondUav = historySecondUavs.get(i);
String value = historySecondUav.getValue();
Map map1 = JSON.parseObject(value, Map.class);
String flylat = map1.get("flylat").toString();
String flylon = map1.get("flylon").toString();
//���������������������������
- boolean flag = isInPolygon(flylon,flylat,doubleArrayList);
+ boolean flag = isInPolygon(flylon,flylat,x1,x2,y1,y2);
if (flag){
-
- list1.add(historySecondUav.getValue());
+ String time = DateUtils.dateToDateString(historySecondUav.getTime());
+ //historySecondUavs.remove(i);
+ if(!stringList.contains(time)){
+ list1.add(historySecondUav.getValue());
+ stringList.add(time);
+ }
}
}
-// lists.add(list1);
//���������������������
String result = getResult(doubleArrayList);
rsMap.put(result,list1);
@@ -390,8 +381,12 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������
List<UAVQueryTimeSlotDTO> dtos = historySecondUavService.queryTimeSlot(form);
+ if (ObjectUtils.isEmpty(dtos)){
+ return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,null);
+ }
//������vo���
UAVQueryTimeSlotVOs vo = UAVQueryTimeSlotVOs.convert(dtos);
+
//������������
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
@@ -487,6 +482,40 @@
return rsLon+"_"+rsLat;
// return uavResultDTO;
+ }
+
+
+ //���������������
+ public static UAVResultDTO getResults(ArrayList<String[]> doubleArrayList){
+ UAVResultDTO uavResultDTO = new UAVResultDTO();
+ int total = doubleArrayList.size();
+ double X = 0, Y = 0, Z = 0;
+ for (int i = 0; i < total; i++) {
+ double lat, lon, x, y, z;
+ String[] strings = doubleArrayList.get(i);
+ lon = Double.parseDouble(strings[0]) * Math.PI / 180;
+ lat = Double.parseDouble(strings[1]) * Math.PI / 180;
+ x = Math.cos(lat) * Math.cos(lon);
+ y = Math.cos(lat) * Math.sin(lon);
+ z = Math.sin(lat);
+ X += x;
+ Y += y;
+ Z += z;
+ }
+ X = X / total;
+ Y = Y / total;
+ Z = Z / total;
+ double Lon = Math.atan2(Y, X);
+ double Hyp = Math.sqrt(X * X + Y * Y);
+ double Lat = Math.atan2(Z, Hyp);
+
+ double rsLon = Lon * 180 / Math.PI;
+ double rsLat = Lat * 180 / Math.PI;
+ uavResultDTO.setFlyLon(rsLon);
+ uavResultDTO.setFlyLat(rsLat);
+
+// return rsLon+"_"+rsLat;
+ return uavResultDTO;
}
/**
@@ -596,9 +625,7 @@
double p_x =Double.parseDouble(X);
double p_y =Double.parseDouble(Y);
Point2D.Double point = new Point2D.Double(p_x, p_y);
-
List<Point2D.Double> pointList= new ArrayList<Point2D.Double>();
-
for (String[] strings : doubleArrayList) {
double polygonPoint_x=Double.parseDouble(strings[0]);
double polygonPoint_y=Double.parseDouble(strings[1]);
@@ -609,4 +636,17 @@
}
+ public boolean isInPolygon(String X,String Y,double x1,double x2,double y1,double y2){
+ boolean result = false;
+ double x =Double.parseDouble(X);
+ double y =Double.parseDouble(Y);
+ if(x >= Math.min(x1, x2) && x <= Math.max(x1, x2) ){
+ if(y >= Math.min(y1, y2) && y <= Math.max(y1, y2)){
+ result = true;
+ }
+ }
+ return result;
+
+ }
+
}
--
Gitblit v1.8.0