From ea9e0b49cafc3c08f57033448bec1c0fa1a12314 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 21 Dec 2023 09:49:49 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 280c7fd..31f5cb1 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
@@ -474,19 +474,18 @@
// list.add(id);
// }
-
ArrayList<HeatMapDTO> rsHeatMap = new ArrayList<>();
if (form.equals("hour")){ //������
- log.info(""+startTime);
+// log.info(""+startTime);
String dateString = DateUtils.stringToDateString(startTime, DateUtils.yyyy_MM_dd_HH_EN, DateUtils.yyyyMM_EN);
// Date date1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
- log.info(""+dateString);
+// log.info(""+dateString);
map.put("organizationIds",list);
map.put("tableName","_"+dateString);
List<HeatMapDTO> heatMap = deviceMapper.getHeatMapV1(map);
- log.info(heatMap.size()+"");
+// log.info(heatMap.size()+"");
List<HeatMapDTO> collect1 = heatMap.stream().filter(d -> d.getTime() != null).collect(Collectors.toList());
if (ObjectUtils.isEmpty(collect1)){
@@ -528,6 +527,7 @@
GeoCoordinate geoCoordinate = new GeoCoordinate();
doubleArrayList.add(heatMapDTO.getCount());
// heatMapDTO.setCount(heatMapDTO.getCount());
+
heatMapDTO.setCount(0.0);
geoCoordinate.setLongitude(heatMapDTO.getLng());
geoCoordinate.setLatitude(heatMapDTO.getLat());
@@ -539,10 +539,14 @@
double asDouble = doubleArrayList.stream().mapToDouble(Double::valueOf).max().getAsDouble();
//���������������
GeoCoordinate centerPoint = GetCenterPointFromListOfCoordinates.getCenterPoint(geoCoordinates);
- heatMapDTO.setCount(asDouble);
+ double rsCode = asDouble - doubleArrayList.size()-1;
+// log.info(asDouble+"-----"+rsCode);
+ heatMapDTO.setCount(rsCode<=0.0?0.0:rsCode);
+// heatMapDTO.setSum(asDouble);
heatMapDTO.setLng(centerPoint.getLongitude());
heatMapDTO.setLat(centerPoint.getLatitude());
heatMapDTO.setMac(i+"");
+ heatMapDTO.setName(integer+"");
heatMap.add(heatMapDTO);
i++;
}
--
Gitblit v1.8.0