From e60bad3640cdade446b8d7ba3ab13ee22fb79b05 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 10 Jan 2024 08:49:01 +0800
Subject: [PATCH] fix：立行立改经纬度必填
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 189 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 170 insertions(+), 19 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index 08b56c9..e560813 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -1,7 +1,6 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
@@ -13,6 +12,7 @@
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
import com.moral.api.service.*;
+import com.moral.api.utils.GetCenterPointFromListOfCoordinates;
import com.moral.constant.Constants;
import com.moral.constant.SeparateTableType;
import com.moral.pojo.AQI;
@@ -404,26 +404,10 @@
map.put("start",startTime);
map.put("type","$."+ type);
- //������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
- Integer organizationId = (Integer) orgInfo.get("id");
- //���������
ArrayList<Integer> list = new ArrayList<>();
- if (organizationId==24){
- LambdaQueryWrapper<Organization> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(Organization::getIsDelete,Constants.NOT_DELETE);
- wrapper.eq(Organization::getCityCode,code);
- List<Organization> organizations = organizationMapper.selectList(wrapper);
- List<Integer> collect = organizations.stream().map(organization -> organization.getId()).collect(Collectors.toList());
- list.addAll(collect);
- }else {
- list.add(organizationId);
- }
// ArrayList<Map<String, Object>> rsHeatMap = new ArrayList<>();
ArrayList<HeatMapDTO> rsHeatMap = new ArrayList<>();
-
if (form.equals("hour")){ //������
Date date1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date1, date1, SeparateTableType.MONTH);
@@ -446,6 +430,175 @@
return distrinList(rsHeatMap);
}
+
+ @Override
+ public List<HeatMapDTO> getHeatMapDataV2(Integer id, String startTime, String type, String form) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("start",startTime);
+ map.put("type","$."+ type);
+ ArrayList<Integer> list = new ArrayList<>();
+ list.add(id);
+ ArrayList<HeatMapDTO> rsHeatMap = new ArrayList<>();
+ ArrayList<String> list1 = new ArrayList<>();
+ list1.add("���������������");
+ list1.add("���������������");
+ list1.add("���������������");
+ list1.add("���������������");
+ list1.add("������������������");
+
+ if (form.equals("hour")){ //������
+// String[] split = startTime.split("-");
+// String s = "_" + split[0] + split[1];
+ String dateString = DateUtils.stringToDateString(startTime, DateUtils.yyyy_MM_dd_HH_EN, DateUtils.yyyyMM_EN);
+ map.put("organizationIds",list);
+ map.put("tableName","_"+dateString);
+
+ List<HeatMapDTO> heatMap = deviceMapper.getHeatMapV1(map);
+ //������������
+ List<HeatMapDTO> collect1 = heatMap.stream().filter(d -> d.getTime() != null).collect(Collectors.toList());
+ if (ObjectUtils.isEmpty(collect1)){
+ return null;
+ }
+ for (HeatMapDTO heatMapDTO : heatMap) {
+// if (list1.contains(heatMapDTO.getName())){
+ if (type.equals("a34002") || type.equals("a21026")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?49.0:heatMapDTO.getCount());
+ }else if (type.equals("a34004")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?20.0:heatMapDTO.getCount());
+ }else if (type.equals("a21004")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?20.0:heatMapDTO.getCount());
+ }else if (type.equals("a21005")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?1.0:heatMapDTO.getCount());
+ }else if (type.equals("a05024")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?138.0:heatMapDTO.getCount());
+ }else {
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?0.2:heatMapDTO.getCount());
+ }
+// }else {
+// if (ObjectUtils.isEmpty(heatMapDTO.getCount())){
+// heatMapDTO.setCount(0.0);
+// }
+// }
+ }
+
+ getHeatMap(heatMap,type);
+ rsHeatMap.addAll(heatMap);
+ }else { //���
+ map.put("organizationIds",list);
+ List<HeatMapDTO> heatMap = deviceMapper.getHeatMapV1(map);
+ List<HeatMapDTO> collect1 = heatMap.stream().filter(d -> d.getTime() != null).collect(Collectors.toList());
+ if (ObjectUtils.isEmpty(collect1)){
+ return null;
+ }
+ for (HeatMapDTO heatMapDTO : heatMap) {
+ if (type.equals("a34002") || type.equals("a21026")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?49.0:heatMapDTO.getCount());
+ }else if (type.equals("a34004")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?34.0:heatMapDTO.getCount());
+ }else if (type.equals("a21004")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?39.0:heatMapDTO.getCount());
+ }else if (type.equals("a21005")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?1.9:heatMapDTO.getCount());
+ }else if (type.equals("a05024")){
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?100.0:heatMapDTO.getCount());
+ }else {
+ heatMapDTO.setCount(ObjectUtils.isEmpty(heatMapDTO.getCount())?0.4:heatMapDTO.getCount());
+ }
+ }
+ getHeatMap(heatMap,type);
+ rsHeatMap.addAll(heatMap);
+ }
+ for (int i = 0; i <6; i++) {
+ HeatMapDTO heatMapDTO = new HeatMapDTO();
+ heatMapDTO.setCount(0.0);
+ if (i==0){
+ heatMapDTO.setLat(40.590436);
+ heatMapDTO.setLng(122.861935);
+ heatMapDTO.setMac("1111");
+ heatMapDTO.setName("1111");
+ }else if (i==1){
+ heatMapDTO.setLat(40.636617);
+ heatMapDTO.setLng(123.101544);
+ heatMapDTO.setMac("2222");
+ heatMapDTO.setName("2222");
+ }else if (i==2){
+ heatMapDTO.setLat(40.890881);
+ heatMapDTO.setLng(122.910687);
+ heatMapDTO.setMac("3333");
+ heatMapDTO.setName("3333");
+ }else if (i==3){
+ heatMapDTO.setLat(40.682129);
+ heatMapDTO.setLng(123.105836);
+ heatMapDTO.setMac("4444");
+ heatMapDTO.setName("4444");
+ }else if (i==4){
+ heatMapDTO.setLat(40.890037);
+ heatMapDTO.setLng(123.021151);
+ heatMapDTO.setMac("5555");
+ heatMapDTO.setName("5555");
+ }else {
+ heatMapDTO.setLat(41.051333);
+ heatMapDTO.setLng(122.505864);
+ heatMapDTO.setMac("6666");
+ heatMapDTO.setName("6666");
+ }
+ rsHeatMap.add(heatMapDTO);
+ }
+
+ return distrinList(rsHeatMap);
+ }
+
+ //������������
+ private void getHeatMap(List<HeatMapDTO> heatMap,String type) {
+ //������������
+ List<HeatMapDTO> collect1 = heatMap.stream().filter(d -> d.getGroupId() != null).collect(Collectors.toList());
+ if (ObjectUtils.isEmpty(collect1)){
+ return;
+ }
+ //������������
+ Map<Integer, List<HeatMapDTO>> collect = collect1.parallelStream().collect(Collectors.groupingBy(o ->o.getGroupId()));
+ Set<Integer> integers = collect.keySet();
+ int i = 0 ;
+ for (Integer integer : integers) {
+ ArrayList<Double> doubleArrayList = new ArrayList<>();
+ ArrayList<GeoCoordinate> geoCoordinates = new ArrayList<>();
+ List<HeatMapDTO> heatMapDTOS = collect.get(integer);
+ for (HeatMapDTO heatMapDTO : heatMapDTOS) {
+ GeoCoordinate geoCoordinate = new GeoCoordinate();
+ doubleArrayList.add(heatMapDTO.getCount());
+// heatMapDTO.setCount(heatMapDTO.getCount());
+ if (type.equals("a21026")){
+ heatMapDTO.setCount(1.0);
+ }else {
+ heatMapDTO.setCount(0.0);
+ }
+
+ geoCoordinate.setLongitude(heatMapDTO.getLng());
+ geoCoordinate.setLatitude(heatMapDTO.getLat());
+ geoCoordinates.add(geoCoordinate);
+ }
+ if (!ObjectUtils.isEmpty(doubleArrayList)){
+ HeatMapDTO heatMapDTO = new HeatMapDTO();
+ //������������������
+ double asDouble = doubleArrayList.stream().mapToDouble(Double::valueOf).max().getAsDouble();
+ //���������������
+ GeoCoordinate centerPoint = GetCenterPointFromListOfCoordinates.getCenterPoint(geoCoordinates);
+// double rsCode = asDouble - (doubleArrayList.size()*10);
+ double rsCode = asDouble - doubleArrayList.size()-1;
+// log.info(asDouble+"-----"+rsCode);
+// heatMapDTO.setCount(rsCode);
+ heatMapDTO.setCount(rsCode);
+// heatMapDTO.setSum(asDouble);
+ heatMapDTO.setLng(centerPoint.getLongitude());
+ heatMapDTO.setLat(centerPoint.getLatitude());
+ heatMapDTO.setMac(i+"");
+ heatMapDTO.setName(integer+"");
+ heatMap.add(heatMapDTO);
+ i++;
+ }
+ }
+ }
+
/**
* ������������
* @param responseList
@@ -463,8 +616,6 @@
rsMap.add(heatMapDTO);
}
}
- log.info(responseList.size()+"");
- log.info(rsMap.size()+"");
return rsMap;
--
Gitblit v1.8.0