chore:测试提交

jinpengyong

2023-07-28 9f7685f3488b5582d48cf8778ee45feb99bd5eec

chore:测试提交

 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);

 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 @@

    }
}
*/


 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 @@

}

*/