From 2e1d289a38cf4e0dfe0f1c7301b7a365cda8d395 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Dec 2023 16:33:44 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 1280620..08b56c9 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
@@ -3,23 +3,20 @@
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;
import com.moral.api.mapper.HistoryMonthlyMapper;
import com.moral.api.mapper.OrganizationMapper;
-
+import com.moral.api.pojo.dto.dataDisplay.HeatMapDTO;
import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
import com.moral.api.pojo.dto.dataDisplay.SensorComparisonDisplayDTO;
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
-
import com.moral.api.service.*;
import com.moral.constant.Constants;
import com.moral.constant.SeparateTableType;
import com.moral.pojo.AQI;
import com.moral.util.*;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -395,14 +392,14 @@
}
/**
- * ���������
+ * ���������������
* @param code
* @param startTime
* @param type
* @return
*/
@Override
- public ArrayList<Map<String, Object>> getHeatMapData(String code, String startTime, String type,String form) {
+ public List<HeatMapDTO> getHeatMapData(String code, String startTime, String type, String form) {
HashMap<String, Object> map = new HashMap<>();
map.put("start",startTime);
map.put("type","$."+ type);
@@ -424,8 +421,8 @@
list.add(organizationId);
}
- ArrayList<Map<String, Object>> rsHeatMap = new ArrayList<>();
-// ArrayList<HeatMapDTO> rsHeatMap = new ArrayList<>();
+// 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);
@@ -433,36 +430,44 @@
// for (Integer integer : list) {
map.put("organizationIds",list);
map.put("tableName",tableNames.get(0));
- List<Map<String, Object>> heatMap = deviceMapper.getHeatMap(map);
-// List<HeatMapDTO> heatMap = deviceMapper.getHeatMap(map);
+// List<Map<String, Object>> heatMap = deviceMapper.getHeatMap(map);
+ List<HeatMapDTO> heatMap = deviceMapper.getHeatMap(map);
rsHeatMap.addAll(heatMap);
// }
}else { //���
// for (Integer integer : list) {
map.put("organizationIds",list);
- List<Map<String, Object>> heatMap = deviceMapper.getHeatMap(map);
-// List<HeatMapDTO> heatMap = deviceMapper.getHeatMap(map);
+// List<Map<String, Object>> heatMap = deviceMapper.getHeatMap(map);
+ List<HeatMapDTO> heatMap = deviceMapper.getHeatMap(map);
rsHeatMap.addAll(heatMap);
// }
}
- //������������������
- ArrayList<Map<String, Object>> filteredList = new ArrayList<>();
- for (Map<String, Object> map1 : rsHeatMap) {
- boolean hasEmptyValue = false;
- for (Object value : map1.values()) {
- if (value == null) {
- hasEmptyValue = true;
- break;
- }
- }
- if (!hasEmptyValue) {
- filteredList.add(map1);
+ return distrinList(rsHeatMap);
+ }
+ /**
+ * ������������
+ * @param responseList
+ * @return
+ */
+ private List<HeatMapDTO> distrinList(List<HeatMapDTO> responseList){
+ List<HeatMapDTO> rsMap = new ArrayList<>();
+ Set<String> keysSet = new HashSet<String>();
+ for (HeatMapDTO heatMapDTO : responseList) {
+ String keys = String.valueOf(heatMapDTO.getMac());
+ int beforeSize = keysSet.size();
+ keysSet.add(keys);
+ int afterSize = keysSet.size();
+ if(afterSize == beforeSize + 1){
+ rsMap.add(heatMapDTO);
}
}
- log.info(filteredList.size()+"");
- return filteredList;
+ log.info(responseList.size()+"");
+ log.info(rsMap.size()+"");
+ return rsMap;
+
+
}
/**
--
Gitblit v1.8.0