From 123181df72f846957a5b05cf45b323f8762fe9b8 Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 29 Jun 2023 13:31:41 +0800
Subject: [PATCH] 走航车添加百日均值接口
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 141 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 7172787..b232159 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -13,6 +13,9 @@
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.pojo.bo.ExcelBO;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserListDTO;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultCountDTO;
+import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
import com.moral.api.pojo.vo.excel.DailyVo;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
@@ -26,6 +29,7 @@
import com.moral.util.GeodesyUtils;
import com.moral.util.TokenUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
@@ -36,16 +40,10 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -84,6 +82,9 @@
RedisTemplate redisTemplate;
private final static Double dis = 50d;
+
+
+ private final static Double DIS_NEW = 100d;
@Override
public List<Map<String, Object>> selectCruisers() {
@@ -147,6 +148,33 @@
map.put("a21004",String.valueOf(Double.parseDouble(a21004) / 10));
}*/
return filterData(data);
+ }
+
+ @Override
+ public List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params) {
+ params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ params.put("orgId", orgId);
+ params.put("type","$."+params.get("type"));
+ //������������������������������������
+ List<HistorySecondCruiserListDTO> data = HistorySecondCruiserMapper.getCruiserDataNewAvg(params);
+ data.removeIf(o->{
+ if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
+ return true;
+ }
+ double lon = o.getFlyLon();
+ double lat = o.getFlyLat();
+ if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
+ return true;
+ }
+ return false;
+ });
+ if(CollectionUtils.isEmpty(data)){
+ return null;
+ }
+ return filterDataNew(data);
}
@Override
public SpecialDevice getSpecialDeviceMapByMac(String mac) {
@@ -528,5 +556,110 @@
return list;
}
+ //������������������������
+ private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data) {
+ List<HistorySecondCruiserListDTO> list = new ArrayList<>();
+ Map<Integer, HistorySecondCruiserResultCountDTO> map = new HashMap<>();
+ Map<String, BigDecimal> mapTest = new HashMap<>();
+ Integer integer = 1;
+ HistorySecondCruiserResultCountDTO countDTO = new HistorySecondCruiserResultCountDTO();
+ countDTO.setSumNum(data.get(0).getNum());
+ countDTO.setContNum(1);
+ map.put(integer,countDTO);
+ list.add(0,data.remove(0));
+ mapTest.put(data.get(0).getFlyLon()+"_"+data.get(0).getFlyLat(),data.get(0).getNum());
+ int k =1;
+ for (HistorySecondCruiserListDTO d : data) {
+ boolean flag = true;
+ for (HistorySecondCruiserListDTO l : list) {
+ double distance = GeodesyUtils.getDistance(d.getFlyLat(), d.getFlyLon(), l.getFlyLat(), l.getFlyLon());
+ if (distance < DIS_NEW) {
+ flag = false;
+ if(integer.equals(list.size())&& !mapTest.containsKey(d.getFlyLon()+"_"+d.getFlyLat())){
+ HistorySecondCruiserResultCountDTO countResultDTO = Objects.isNull(map.get(integer))?new HistorySecondCruiserResultCountDTO():map.get(integer);
+ countResultDTO.setContNum(countResultDTO.getContNum()+1);
+ countResultDTO.setSumNum(countResultDTO.getSumNum().add(d.getNum()));
+ map.put(integer,countResultDTO);
+ mapTest.put(d.getFlyLon()+"_"+d.getFlyLat(),d.getNum());
+ k++;
+ }
+ }
+ }
+ if (flag) {
+ if(!list.contains(d)){
+ list.add(d);
+ integer++;
+ }
+ }
+ }
+ if(!list.contains(data.get(data.size()-1))){
+ HistorySecondCruiserListDTO result = data.get(data.size()-1);
+ list.add(result);
+ integer++;
+ HistorySecondCruiserResultCountDTO countResultDTO = new HistorySecondCruiserResultCountDTO();
+ countResultDTO.setContNum(1);
+ countResultDTO.setSumNum(result.getNum());
+ map.put(integer,countResultDTO);
+ }
+ return filterDataNe(list,map);
+ }
+ private List<HistorySecondCruiserResultDTO> filterDataNe(List<HistorySecondCruiserListDTO> list,Map<Integer, HistorySecondCruiserResultCountDTO> map){
+ List<HistorySecondCruiserResultDTO> listResult = new ArrayList<>();
+ for(Map.Entry<Integer, HistorySecondCruiserResultCountDTO> entry : map.entrySet()){
+ Integer mapKey = entry.getKey();
+ HistorySecondCruiserResultCountDTO mapValue = entry.getValue();
+ BigDecimal avgNum = mapValue.getSumNum().divide(BigDecimal.valueOf(mapValue.getContNum()),2,BigDecimal.ROUND_HALF_UP);
+ HistorySecondCruiserResultDTO resultDTO = new HistorySecondCruiserResultDTO();
+ resultDTO.setTime(list.get(mapKey-1).getTime());
+ resultDTO.setAvgNum(avgNum);
+ resultDTO.setFlyLon(list.get(mapKey-1).getFlyLon());
+ resultDTO.setFlyLat(list.get(mapKey-1).getFlyLat());
+ listResult.add(resultDTO);
+ }
+ return listResult;
+
+ }
+
+ private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data, List<HistorySecondCruiserListDTO> list) {
+ List<HistorySecondCruiserResultDTO> listResult = new ArrayList<>();
+ List<HistorySecondCruiserListDTO> filter = new ArrayList<>();
+ for (HistorySecondCruiserListDTO d : data) {
+ for (HistorySecondCruiserListDTO l : list) {
+ double distance = GeodesyUtils.getDistance(d.getFlyLat(), d.getFlyLon(), l.getFlyLat(), l.getFlyLon());
+ if (filter.contains(d)) {
+ break;
+ }
+ if (distance < DIS_NEW ) {
+ List<BigDecimal> numList = new ArrayList<>(CollectionUtils.isEmpty(l.getNumList()) ? Arrays.asList(l.getNum()) : l.getNumList());
+ numList.add(d.getNum());
+ l.setNumList(numList);
+ filter.add(d);
+ break;
+ }
+ }
+ }
+ int k = 0;
+ for(int j =0;j<list.size(); j++){
+ HistorySecondCruiserListDTO l = list.get(j);
+ HistorySecondCruiserResultDTO resultDTO = new HistorySecondCruiserResultDTO();
+ resultDTO.setFlyLat(l.getFlyLat());
+ resultDTO.setTime(l.getTime());
+ resultDTO.setFlyLon(l.getFlyLon());
+ BigDecimal num = BigDecimal.ZERO;
+ int count = l.getNumList().size();
+ for(int i = 0;i < count; i++) {
+ num = num.add(l.getNumList().get(i));
+ }
+ k = k+count;
+ resultDTO.setAvgNum(num.divide(BigDecimal.valueOf(count),2,BigDecimal.ROUND_HALF_UP));
+ listResult.add(resultDTO);
+ }
+ System.out.println("sss>>>>:"+ (k++));
+ System.out.println("sss>>>>:"+ (filter.size())+">>>>:"+data.size());
+ int z = 0 ;
+ return listResult;
+
+
+ }
}
--
Gitblit v1.8.0