From e3bac98f092a10c0e897143bece3abbcc59469f2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:06:24 +0800
Subject: [PATCH] fix：小程序提交
---
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 649 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 623 insertions(+), 26 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 fd19d65..e8204e2 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
@@ -1,30 +1,49 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.HistorySecondSpecial;
-import com.moral.api.entity.Organization;
-import com.moral.api.entity.SpecialDevice;
-import com.moral.api.entity.SpecialDeviceHistory;
-import com.moral.api.mapper.HistorySecondSpecialMapper;
+
+import com.moral.api.entity.*;
+import com.moral.api.mapper.DailyMapper;
+import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.mapper.SysDictTypeMapper;
+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.enums.SysDictTypeEnum;
+import com.moral.api.pojo.vo.excel.DailyVo;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SpecialDeviceHistoryService;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysDictTypeService;
import com.moral.constant.Constants;
-import com.moral.constant.RedisConstants;
+
+import com.moral.util.AmendUtils;
+import com.moral.util.DateUtils;
+import com.moral.util.FileUtils;
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;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -38,7 +57,10 @@
public class SpecialDeviceServiceImpl extends ServiceImpl<SpecialDeviceMapper, SpecialDevice> implements SpecialDeviceService {
@Autowired
- private HistorySecondSpecialMapper historySecondSpecialMapper;
+ private HistorySecondCruiserMapper HistorySecondCruiserMapper;
+
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
@Autowired
private SpecialDeviceHistoryService specialDeviceHistoryService;
@@ -48,41 +70,70 @@
@Autowired
SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired
+ private HistorySecondCruiserMapper historySecondCruiserMapper;
+
+ @Autowired
+ private SpecialDeviceService specialDeviceService;
+
+ @Autowired
+ private DailyMapper dailyMapper;
+
@Autowired
RedisTemplate redisTemplate;
private final static Double dis = 50d;
+
+ private final static Double DIS_NEW = 100d;
+
@Override
- public List<Map<String, Object>> getCarsInfo() {
+ public List<Map<String, Object>> selectCruisers() {
//������������������������
Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer userId = (Integer) userInfo.get("userId");
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
Integer orgId = (Integer) orgInfo.get("id");
+ //���������������������
+ List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
+ integerList.addAll(orgIds);
QueryWrapper<SpecialDeviceHistory> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("mac", "name")
- .eq("organization_id", orgId)
- .eq("special_type", Constants.SPECIAL_DEVICE_CAR)
- .eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.select("DISTINCT mac, name").lambda();
+
+ //.eq("special_type", Constants.SPECIAL_DEVICE_CRUISER)
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE)
+ .in("organization_id", integerList);
return specialDeviceHistoryService.listMaps(queryWrapper);
}
@Override
- public List<Map<String, Object>> carTrajectory(Map<String, Object> params) {
+ public List<Map<String, Object>> carTrajectory(Map<String, Object> params,boolean type) {
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);
//������������������������������������
- List<Map<String, Object>> data = historySecondSpecialMapper.getSpecialDeviceData(params);
+ List<Map<String, Object>> data = HistorySecondCruiserMapper.getCruiserData(params);
if (ObjectUtils.isEmpty(data)) {
return data;
}
data.removeIf(o -> {
Map<String, Object> value = JSONObject.parseObject(o.remove("value").toString(), Map.class);
- Object flylon = value.get("flylon");
- Object flylat = value.get("flylat");
+ Object flylon = value.get(Constants.SENSOR_CODE_LON);
+ Object flylat = value.get(Constants.SENSOR_CODE_LAT);
if (ObjectUtils.isEmpty(flylon) || ObjectUtils.isEmpty(flylat)) {
return true;
}
@@ -94,24 +145,433 @@
o.putAll(value);
return false;
});
+ /*for (Map<String, Object> map:data) {
+ Object third = map.get("dustld");
+ map.put("dustld",map.get("a21026"));
+ map.put("a21026",String.valueOf(Double.parseDouble(third.toString())*10000));
+ }*/
+ /*for (Map<String, Object> map : data) {
+ String a21026 = String.valueOf(map.get("a21026"));
+ String a21004 = String.valueOf(map.get("a21004"));
+ map.put("a21026",String.valueOf(Double.parseDouble(a21026) / 100));
+ map.put("a21004",String.valueOf(Double.parseDouble(a21004) / 10));
+ }*/
return filterData(data);
}
@Override
- public Map<String,Object> getSpecialDeviceMapByMac(String mac) {
- //������������������
- Map<String,Object> specialDeviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,mac);
- return specialDeviceMap;
+ public List<HistorySecondCruiserResultDTO> carTrajectoryNewAvg(Map<String, Object> params) {
+ double range = Double.valueOf(params.get("range").toString());
+ String type = params.get("type").toString();
+ params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ Integer userId = (Integer) userInfo.get("userId");
+ Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+ List<Integer> integerList = new ArrayList<>();
+ SysDictData listSys = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER_RANGE.getValue(),userId.toString());
+ if(listSys.getDataValue().contains(",")){
+ List<Integer> resultStr = Arrays.asList(listSys.getDataValue().split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+ integerList.addAll(resultStr);
+ }else {
+ Integer dataValue = Objects.nonNull(listSys.getDataValue())?Integer.parseInt(listSys.getDataValue()):0;
+ integerList.add(dataValue);
+ }
+ integerList.add(orgId);
+ params.put("orgIds", integerList);
+ params.put("type","$."+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;
+ }
+ List<HistorySecondCruiserResultDTO> result = filterDataNew(data,range);
+ if(CollectionUtils.isNotEmpty(result)){
+ SysDictData list = sysDictTypeService.listOne(SysDictTypeEnum.SYS_SECOND_CRUISER.getValue(),type);
+ if(list.getDataValue().contains(",")){
+ List<String> resultStr = Arrays.asList(list.getDataValue().split(","));
+ if(resultStr.size() % 2 ==0){
+ result.forEach(it->{
+ it.setAvgNum(numAvg(resultStr,it.getAvgNum()));
+ });
+ }
+ }else {
+ BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Integer.parseInt(list.getDataValue())):BigDecimal.ZERO;
+ result.forEach(it->{
+ it.setAvgNum(it.getAvgNum().add(dataValue));
+ });
+ }
+
+
+ }
+ return result;
+ }
+
+ private BigDecimal numAvg(List<String> list , BigDecimal num){
+ int nums = 1;
+ for (int i=0;i<list.size();i=i+2){
+ if(num.compareTo(BigDecimal.valueOf(Integer.parseInt(list.get(i))))>= 0 ){
+ return num.add(BigDecimal.valueOf(Integer.parseInt(list.get(nums))));
+ }
+ nums+=2;
+ }
+ return num;
}
@Override
- public SpecialDevice getSpecialDeviceByMac(String mac) {
+ public SpecialDevice getSpecialDeviceMapByMac(String mac) {
QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper();
- queryWrapper.eq("mac",mac);
- queryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryWrapper.eq("mac", mac);
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
return specialDevice;
}
+
+ @Override
+ public List<String> getDatesByMac(String mac) {
+ Map<String, Object> userInfo = (Map) TokenUtils.getUserInfo();
+ Map<String, Object> orgInfo = (Map) userInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
+
+ Map<String, Object> params = new HashMap<>();
+ params.put("orgId", orgId);
+ params.put("mac", mac);
+ Date start = DateUtils.addMonths(new Date(), -6);
+ params.put("start", DateUtils.dateToDateString(start));
+ return historySecondCruiserMapper.getDates(params);
+ }
+
+
+
+ /**
+ * ���������������
+ * @param params
+ * @return
+ */
+ @Override
+ public ExcelBO getDaily(Map<String, Object> params, List<MultipartFile> files) throws ParseException {
+ ExcelBO excelBO = new ExcelBO();
+ ArrayList<String> list = new ArrayList<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time1 = params.get("time1").toString();
+ String time2 = params.get("time2").toString();
+ String rsTime = getTime(time1, time2);
+ list.add(rsTime);
+// List<Map<String, Object>> maps = specialDeviceService.carTrajectory(params,false);
+// List<Map<String, Object>> maps = HistorySecondCruiserMapper.getCruiserData(params);
+ List<Map<String, Object>> maps = HistorySecondCruiserMapper.getAllCruiserData(params);
+
+ if (ObjectUtils.isEmpty(maps)){
+ return null;
+ }
+ if (params.containsKey("time3")){
+ Map<String, Object> map = new HashMap<>();
+ String time3 = params.get("time3").toString();
+ String time4 = params.get("time4").toString();
+ String mac = params.get("mac").toString();
+ map.put("time1",time3);
+ map.put("time2",time4);
+ map.put("mac",mac);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
+ if (ObjectUtils.isEmpty(maps1)){
+ return null;
+ }
+ maps.addAll(maps1);
+ list.add(getTime(time3, time4));
+
+ }
+ if (params.containsKey("time5")){
+ Map<String, Object> map = new HashMap<>();
+ String time5 = params.get("time5").toString();
+ String time6 = params.get("time6").toString();
+ String mac = params.get("mac").toString();
+ map.put("time1",time5);
+ map.put("time2",time6);
+ map.put("mac",mac);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
+ if (ObjectUtils.isEmpty(maps1)){
+ return null;
+ }
+ maps.addAll(maps1);
+ list.add(getTime(time5, time6));
+
+ }
+ HashMap<String, Object> rsMap = getStringObjectHashMap(maps);
+
+ rsMap.put("time",list);
+
+
+ //������jar���������������
+ ApplicationHome applicationHome = new ApplicationHome(getClass());
+ //���jar������������������������������upload������������������������������������
+ String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
+
+
+
+ String type = params.get("type").toString();
+ String code = params.get("code").toString();
+ String area = params.get("area").toString();
+ rsMap.put("area",area);
+ String value = JSON.toJSONString(rsMap);
+
+ String mac = params.get("mac").toString();
+ QueryWrapper<TbDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac",mac);
+ queryWrapper.likeRight("time",time1.substring(0,10));
+ TbDaily daily = dailyMapper.selectOne(queryWrapper);
+ ArrayList<String> images = new ArrayList<>();
+
+ if (daily==null){
+ TbDaily daily1 = new TbDaily();
+ //������������
+ if (files.size()>0){
+ for (MultipartFile file : files) {
+ String fileType = file.getContentType();
+ if ("image/jpg".equals(fileType) || "image/png".equals(fileType) || "image/jpeg".equals(fileType)){
+ //���������������
+ String fileName = file.getOriginalFilename();
+ //���������������������
+ String suffixName = fileName.substring(fileName.lastIndexOf("."));
+ //������������������
+ fileName.substring(fileName.lastIndexOf("."));
+ //���������������������
+ fileName = UUID.randomUUID() + suffixName;
+ //������������
+ if (FileUtils.upload(file, path, fileName)) {
+ images.add(fileName);
+ }
+ }
+ }
+ }
+
+ if (!ObjectUtils.isEmpty(images)) {
+ String image = images.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ daily1.setImages(image);
+ }
+ //������������
+ daily1.setMac(mac);
+ daily1.setTime(sdf.parse(time1));
+ Date date = new Date();
+ daily1.setDate(date);
+ daily1.setValue(value);
+ daily1.setType(type);
+ daily1.setCode(code);
+ dailyMapper.insert(daily1);
+ excelBO.setId(daily1.getId());
+ excelBO.setTime(sdf.parse(time1));
+ excelBO.setDate(date);
+ }else {
+ //���������������������������������
+ String images1 = daily.getImages();
+// ObjectUtils.isEmpty(images1);
+ if (!ObjectUtils.isEmpty(images1)){
+ String[] splits = images1.split(",");
+ for (String split : splits) {
+ String realPath = path + File.separator + split;
+ File file = new File(realPath);
+ if (file.exists() && file.isFile()) {
+ file.delete();
+ }
+ }
+ }
+
+
+ if (files.size() > 0) {
+ for (MultipartFile file : files) {
+ //������������������������
+ String fileType = file.getContentType();
+ if ("image/jpg".equals(fileType) || "image/png".equals(fileType) || "image/jpeg".equals(fileType)) {
+ //���������������
+ String fileName = file.getOriginalFilename();
+ //���������������������
+ String suffixName = fileName.substring(fileName.lastIndexOf("."));
+ //���������������������
+ fileName = UUID.randomUUID() + suffixName;
+ //������������
+ if (FileUtils.upload(file, path, fileName)) {
+ images.add(fileName);
+ }
+ }
+ }
+ }
+
+ if (!ObjectUtils.isEmpty(images)) {
+ String image = images.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ daily.setImages(image);
+
+ }else {
+ daily.setImages("");
+ }
+ daily.setValue(value);
+ daily.setTime(sdf.parse(time1));
+ daily.setTime(sdf.parse(time1));
+ daily.setDate(new Date());
+ daily.setType(type);
+ dailyMapper.updateById(daily);
+ excelBO.setId(daily.getId());
+ excelBO.setTime(sdf.parse(time1));
+ excelBO.setDate(new Date());
+
+ }
+ return excelBO;
+ }
+
+ private String getTime(String time1, String time2) {
+ String substring1 = time1.substring(11, 13);
+ String substring2= time2.substring(11, 13);
+ String substring3 = time1.substring(5, 7);
+ String substring4 = time1.substring(8, 10);
+ return substring3 + "���" + substring4 + "���" + substring1 + "���-" + substring2+"���";
+ }
+
+ /**
+ * ���������������������
+ * @param id
+ * @return
+ */
+ @Override
+ public DailyVo loadDaily(Integer id) {
+ ArrayList<String> rsList = new ArrayList<>();
+ DailyVo dailyVo = new DailyVo();
+ TbDaily tbDaily = dailyMapper.selectById(id);
+ if (tbDaily==null){
+ return null;
+ }
+ String images = tbDaily.getImages();
+ if (!ObjectUtils.isEmpty(images)){
+ String[] split = images.split(",");
+ List<String> list1 = Arrays.asList(split);
+ dailyVo.setImages(list1);
+ }else {
+ dailyVo.setImages(rsList);
+ }
+ String value = tbDaily.getValue();
+ Map map = JSON.parseObject(value, Map.class);
+ dailyVo.setCode(map);
+ return dailyVo;
+ }
+
+ /**
+ * ������������
+ * @param params
+ * @return
+ */
+ @Override
+ public List<ExcelBO> selectDaily(Map<String, Object> params) {
+ ArrayList<ExcelBO> excelBOS = new ArrayList<>();
+ String startTime = params.get("startTime").toString();
+ String endTime = params.get("endTime").toString();
+ String type = params.get("type").toString();
+ String code = params.get("code").toString();
+
+ Object mac = params.get("mac");
+ if (!ObjectUtils.isEmpty(mac)){
+ String MAC = mac.toString();
+ QueryWrapper<TbDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type",type).eq("code",code).eq("mac",MAC);
+ queryWrapper.between("time",startTime,endTime);
+ List<TbDaily> dailies = dailyMapper.selectList(queryWrapper);
+ for (TbDaily daily : dailies) {
+ ExcelBO excelBO = new ExcelBO();
+ BeanUtils.copyProperties(daily,excelBO);
+ excelBOS.add(excelBO);
+ }
+ return excelBOS;
+ }
+ QueryWrapper<TbDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("type",type).eq("code",code);
+ queryWrapper.between("time",startTime,endTime);
+ List<TbDaily> dailies = dailyMapper.selectList(queryWrapper);
+ for (TbDaily daily : dailies) {
+ ExcelBO excelBO = new ExcelBO();
+ BeanUtils.copyProperties(daily,excelBO);
+ excelBOS.add(excelBO);
+ }
+ return excelBOS;
+ }
+
+ //���������������������������
+ private HashMap<String, Object> getStringObjectHashMap(List<Map<String, Object>> maps) {
+ HashMap<String, Object> rsMap = new HashMap<>();
+
+ ArrayList<Double> pm25List = new ArrayList<>();
+ ArrayList<Double> pm10List = new ArrayList<>();
+ ArrayList<Double> COList = new ArrayList<>();
+ ArrayList<Double> SO2List = new ArrayList<>();
+ ArrayList<Double> NO2List = new ArrayList<>();
+ ArrayList<Double> O3List = new ArrayList<>();
+ ArrayList<Double> VOCList = new ArrayList<>();
+
+
+ for (Map<String, Object> map : maps) {
+ Map value = JSON.parseObject(map.get("value").toString(), Map.class);
+ if (!ObjectUtils.isEmpty(value.get("a34004"))){
+ pm25List.add(Double.parseDouble(value.get("a34004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a34002"))){
+ pm10List.add(Double.parseDouble(value.get("a34002").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21005"))){
+ COList.add(Double.parseDouble(value.get("a21005").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21026"))){
+ SO2List.add(Double.parseDouble(value.get("a21026").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21004"))){
+ NO2List.add(Double.parseDouble(value.get("a21004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a05024"))){
+ O3List.add(Double.parseDouble(value.get("a05024").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a99054"))){
+ VOCList.add(Double.parseDouble(value.get("a99054").toString()));
+ }
+ }
+
+ //���������������
+ double PM25 = AmendUtils.sciCal(pm25List.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double PM10 = AmendUtils.sciCal(pm10List.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double CO = AmendUtils.sciCal(COList.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double SO2 = AmendUtils.sciCal(SO2List.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double O3 = AmendUtils.sciCal(O3List.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double VOC= AmendUtils.sciCal(VOCList.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+ double NO2= AmendUtils.sciCal(NO2List.stream().collect(Collectors.averagingDouble(Double::doubleValue)), 2);
+
+
+ rsMap.put("maxPm25", Collections.max(pm25List));
+ rsMap.put("avgPm25",PM25);
+ rsMap.put("maxPm10",Collections.max(pm10List));
+ rsMap.put("avgPm10",PM10);
+ rsMap.put("maxCO",Collections.max(COList));
+ rsMap.put("avgCO",CO);
+ rsMap.put("maxSO2",Collections.max(SO2List));
+ rsMap.put("avgSO2",SO2);
+ rsMap.put("maxO3",Collections.max(O3List));
+ rsMap.put("avgO3",O3);
+ rsMap.put("maxVOC",Collections.max(VOCList));
+ rsMap.put("avgVOC",VOC);
+ rsMap.put("maxNO2",Collections.max(NO2List));
+ rsMap.put("avgNO2",NO2);
+ return rsMap;
+ }
+
//������������������������
@@ -134,6 +594,143 @@
result.add(map);
}
}
+
+
return result;
}
+ //���������������
+ private List<Map<String, Object>> filterData(List<Map<String, Object>> data, List<Map<String, Object>> result) {
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ Map<String,List<Object>> map = new HashMap<>();
+ result.forEach(it->map.put(it.get(Constants.SENSOR_CODE_LON).toString()+ "_"+Constants.SENSOR_CODE_LAT.toString(),Arrays.asList(it)));
+ // ���������50 ������������
+ for (Map<String, Object> mapData : data) {
+ for (Map.Entry<String, List<Object>> entry : map.entrySet()) {
+ double lng1 = Double.parseDouble(mapData.get(Constants.SENSOR_CODE_LON).toString());
+ double lat1 = Double.parseDouble(mapData.get(Constants.SENSOR_CODE_LAT).toString());
+ String[] mapKey = entry.getKey().split("_");
+ List<Object> mapValue = entry.getValue();
+ double lng2 = Double.parseDouble(mapKey[0]);
+ double lat2 = Double.parseDouble(mapKey[1]);
+ double distance = GeodesyUtils.getDistance(lat1, lng1, lat2, lng2);
+ if (distance < dis) {
+ mapValue.add(mapData);
+ }
+ }
+ }
+
+ return list;
+ }
+ //������������������������
+ private List<HistorySecondCruiserResultDTO> filterDataNew(List<HistorySecondCruiserListDTO> data,double range) {
+ 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 < range) {
+ 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++;
+ HistorySecondCruiserResultCountDTO countResultDTO = Objects.isNull(map.get(integer))?new HistorySecondCruiserResultCountDTO():map.get(integer);
+ countResultDTO.setSumNum(d.getNum());
+ countResultDTO.setContNum(1);
+ map.put(integer,countResultDTO);
+ mapTest.put(d.getFlyLon()+"_"+d.getFlyLat(),d.getNum());
+ }
+ }
+ }
+ 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,double range) {
+ 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 < range ) {
+ 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