From e608fef1dd88213af3cc7f0fdb8f7952214c64a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Jul 2023 14:21:57 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 55 +++++++++++++++++--------------------------------------
1 files changed, 17 insertions(+), 38 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 0c2c67d..5ab31e9 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,42 +86,31 @@
ArrayList<Double> flyLatList = new ArrayList<>();
//������
ArrayList<Double> flyLonList = new ArrayList<>();
-// 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);
-// queryWrapper.between("time",time1,time2);
-// List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
+
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.reList(params);
- 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++);
-
+ JSONObject jsonObject = JSONObject.parseObject(value);
+ String flylon = jsonObject.get("flylon").toString();
+ String flylat = jsonObject.get("flylat").toString();
+ flyLatList.add(Double.parseDouble(flylat));
+ flyLonList.add(Double.parseDouble(flylon));
+ }
+ if (ObjectUtils.isEmpty(historySecondUavs)){
+ return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,"null");
}
Double maxLat = Collections.max(flyLatList);
Double maxLon = Collections.max(flyLonList);
Double minLat = Collections.min(flyLatList);
Double minLon = Collections.min(flyLonList);
-
//������������������
- String leftTop = minLat +";"+ maxLon;
+// String leftTop = minLat +";"+ maxLon;
//������
- String rightTop = maxLat +";"+ maxLon;
+// String rightTop = maxLat +";"+ maxLon;
//������
- String leftBottom = minLat +";" + minLon;
+// String leftBottom = minLat +";" + minLon;
//������
- String rightBottom = maxLat +";" + minLon;
+// String rightBottom = maxLat +";" + minLon;
//���������������������
double distance1 = getDistance(maxLon, minLat, maxLon, maxLat);
//���������������������
@@ -129,13 +118,13 @@
ArrayList<UAVGteForDTO> list = new ArrayList<>();
//������������
- String [] lefts =new String[]{maxLon.toString(),minLat.toString()};
+// String [] lefts =new String[]{maxLon.toString(),minLat.toString()};
//������2
- String[] youshang = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, 50);
+ String[] youshang = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, size);
//������2
- String[] youxia = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(youshang[0]), Double.parseDouble(youshang[1]), 50);
+ String[] youxia = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(youshang[0]), Double.parseDouble(youshang[1]), size);
//������2
- String[] zuoxia = calLocationByDistanceAndLocationAndDirection(180, minLon, maxLat, 50);
+ String[] zuoxia = calLocationByDistanceAndLocationAndDirection(180, minLon, maxLat, size);
for (int i = 0; i <distance2 ; i+=size) {
UAVGteForDTO dto1 = new UAVGteForDTO();
@@ -317,16 +306,6 @@
O3Double = O3ArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
}
-// dto.setCoAvg(CODouble);
-// dto.setNO2Avg(NODouble);
-// dto.setO3Avg(O3Double);
-// dto.setTVOCAvg(TVODouble);
-// dto.setPM10Avg(PM10Double);
-// dto.setPM25Avg(PM25Double);
-// dto.setSO2Avg(SODouble);
-// dto.setWDAvg(WDDouble);
-// dto.setSHAvg(SHDouble);
-// dto.setQYAvg(QYDouble);
dto.setA21005(CODouble);
dto.setA21004(NODouble);
dto.setA05024(O3Double);
--
Gitblit v1.8.0