From d3a61734039d827dfba22511b5da7d3eefd62de7 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Tue, 04 Jul 2023 21:11:35 +0800
Subject: [PATCH] 日期排序提交
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index d534583..a010fc9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -249,22 +249,34 @@
Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);
Map<String,Map<String,Object>> map = resultMap(historyDailyByMacAndTimeSlot);
+ Map<Integer,String> pointMap = new HashMap<>();
+ Map<String,String> sensorMap = new HashMap<>();
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.in("id",devices.stream().map(Device::getMonitorPointId).collect(Collectors.toList()));
+ monitorPointMapper.selectList(monitorPointQueryWrapper).forEach(it->pointMap.put(it.getId(),it.getName()));
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.in("code",sensorsList);
+ sensorMapper.selectList(sensorQueryWrapper).forEach(it->sensorMap.put(it.getCode(),it.getName()));
+
+
for (Device device:devices) {
- QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
- monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
- monitorPointQueryWrapper.eq("id",device.getMonitorPointId());
- MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
for (String sensor:sensorsList) {
Date ks = DateUtils.getDate(startTime,"yyyy-MM-dd");
Date js = DateUtils.getDateOfDay(DateUtils.getDate(endTime,"yyyy-MM-dd"),1);
Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
- timeValueMap.put("������������",monitorPoint.getName());
+ /*QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.in("id",device.getMonitorPointId());
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);*/
+ timeValueMap.put("������������",pointMap.get(device.getMonitorPointId()));
timeValueMap.put("name",device.getName());
- QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
sensorQueryWrapper.eq("code",sensor);
- Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
- timeValueMap.put("sensor",sensorEntity.getName());
+ Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);*/
+ timeValueMap.put("sensor",sensorMap.get(sensor));
ArrayList<Double> doubleArrayList = new ArrayList<>();
while (DateUtils.isTimeBefor(js,ks)){
String c = DateUtils.dateToDateString(ks,"yyyy-MM-dd");
--
Gitblit v1.8.0