From 9f7685f3488b5582d48cf8778ee45feb99bd5eec Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Jul 2023 14:02:31 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 10 +++++-----
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 34 ++++++++++++++++------------------
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 16 ++++++++--------
3 files changed, 29 insertions(+), 31 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 9d28eec..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
@@ -88,6 +88,14 @@
ArrayList<Double> flyLonList = new ArrayList<>();
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.reList(params);
+ for (HistorySecondUav historySecondUav : historySecondUavs) {
+ String value = historySecondUav.getValue();
+ 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");
}
@@ -96,13 +104,13 @@
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);
//���������������������
@@ -110,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();
@@ -298,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);
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index ebdfc28..50f3a47 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,4 +1,4 @@
-/*
+
package com.moral.api.exception.consumer;
import com.moral.api.utils.AdjustDataUtils;
@@ -26,12 +26,12 @@
import com.moral.api.websocket.CruiserWebSocketServer;
import com.moral.constant.KafkaConstants;
-*/
+
/*
* ������������������������
- * *//*
+ * */
-@Component
+//@Component
@Slf4j
public class CruiserDataConsumer implements ConsumerSeekAware {
@@ -67,9 +67,9 @@
continue;
}
Double sourceDataD = Double.valueOf(String.valueOf(data.get(code)));
- */
-/*BigDecimal bg = new BigDecimal(sourceDataD);
- bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);*//*
+
+ BigDecimal bg = new BigDecimal(sourceDataD);
+ bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
String sourceData = String.valueOf(sourceDataD);
//������������
@@ -117,4 +117,4 @@
}
}
-*/
+
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index bb8d4a2..225e1ab 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -1,4 +1,4 @@
-/*
+
package com.moral.api.exception.consumer;
import com.alibaba.fastjson.JSON;
@@ -23,16 +23,16 @@
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
-*/
+
/**
* @ClassName SecondsDataConsumer1
* @Description TODO
* @Author ���������
* @Date 2021/6/15 14:49
* @Version TODO
- **//*
+ **/
-@Component
+//@Component
@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
@@ -119,4 +119,4 @@
}
-*/
+
--
Gitblit v1.8.0