From 9b790d284324a54bd54de12a336e488e748a2b61 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 12 Aug 2021 14:57:15 +0800
Subject: [PATCH] 监测因子趋势图时间精简
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 33 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 8c3dc7e..23efdd1 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -6,7 +6,6 @@
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.HistoryHourlyService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@@ -16,7 +15,9 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+
import java.util.HashMap;
+
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@
public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
@Autowired
- DeviceMapper deviceMapper;
+ private DeviceMapper deviceMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -40,51 +41,106 @@
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
QueryWrapper<Device> wrapper = new QueryWrapper();
- wrapper.eq("is_delete", Constants.NOT_DELETE);
wrapper.eq("monitor_point_id", monitorPointId);
- List<Device> devices = deviceMapper.selectList(wrapper);
- return devices;
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ return deviceMapper.selectList(wrapper);
}
@Override
- public Map<String, Object> getSensorsByMac(String mac) {
- //���redis���������������������������
- Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
- List<Sensor> sensors = device.getVersion().getSensors();
- Map<String, Object> result = new HashMap<>();
- for (Sensor sensor : sensors) {
- String sensorCode = sensor.getCode();
- String name = sensor.getName();
- result.put(sensorCode, name);
+ public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
+ //������mac
+ List<String> macs = (List<String>) params.remove("macs");
+ List<Map<String, Object>> elementLists = new ArrayList<>();
+
+ for (String mac : macs) {
+ //���redis���������������������������
+ Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
+ List<Sensor> sensors = device.getVersion().getSensors();
+ Map<String, Object> map = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ String sensorCode = sensor.getCode();
+ String name = sensor.getName();
+ map.put(sensorCode, name);
+ }
+ elementLists.add(map);
}
- return result;
+
+ Map<String, Object> map = elementLists.parallelStream()
+ .filter(elementList -> elementList.size() != 0)
+ .reduce((a, b) -> {
+ a.keySet().retainAll(b.keySet());
+ return a;
+ }).orElse(new HashMap<>());
+ return map;
}
@Override
public List<Map<String, Object>> getTrendChartData(Map<String, Object> params) {
Object type = params.get("type");
- String start = params.remove("time").toString();
+ //������mac
+ List<String> macs = (List<String>) params.remove("macs");
+
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac", "name").in("mac", macs);
+ List<Device> devices = deviceMapper.selectList(queryWrapper);
+
+
+ //������������
+ List<String> times = (List<String>) params.remove("times");
+ //������code
+ String sensorCode = params.get("sensorCode").toString();
String end;
String timeUnits;
String dateFormat;
- if ("day".equals(type)) {
- end = DateUtils.getDateAddDay(start, 1);
- timeUnits = "hourly";
- dateFormat = "%H";
- } else if ("month".equals(type)) {
- end = DateUtils.getDateAddMonth(start, 1);
- timeUnits = "daily";
- dateFormat = "%d";
- } else {
- end = DateUtils.getDateAddYear(start, 1);
- timeUnits = "monthly";
- dateFormat = "%m";
+ //���������������,time=data
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ for (String start : times) {
+ if ("hour".equals(type)) {
+ end = DateUtils.getDateAddDay(start, 1);
+ timeUnits = "hourly";
+ dateFormat = "%Y-%m-%d %H";
+ } else if ("day".equals(type)) {
+ end = DateUtils.getDateAddMonth(start, 1);
+ timeUnits = "daily";
+ dateFormat = "%Y-%m-%d";
+ } else {
+ end = DateUtils.getDateAddYear(start, 1);
+ timeUnits = "monthly";
+ dateFormat = "%Y-%m";
+ }
+ params.put("timeUnits", timeUnits);
+ params.put("start", start);
+ params.put("end", end);
+ params.put("macs", macs);
+ params.put("dateFormat", dateFormat);
+ //���������������������������������
+ List<Map<String, Object>> list = deviceMapper.getTrendChartData(params);
+
+ for (String s : DateUtils.getTimeLag(start)) {
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("time", s);
+ List<Map<String, Object>> deviceData = new ArrayList<>();
+ for (Device device : devices) {
+ Map<String, Object> valueMap = new HashMap<>();
+ valueMap.put("name", device.getName());
+ valueMap.put("sensorValue", "");
+ for (Map<String, Object> map : list) {
+ Object time = map.get("time");
+ Object sensorValue = map.get(sensorCode);
+ Object mac = map.get("mac");
+ if (s.equals(time) && device.getMac().equals(mac)) {
+ valueMap.put("sensorValue", sensorValue);
+ }
+ }
+ deviceData.add(valueMap);
+ }
+ resultMap.put("deviceData", deviceData);
+ result.add(resultMap);
+ }
}
- params.put("dateFormat", dateFormat);
- params.put("timeUnits", timeUnits);
- params.put("start", start);
- params.put("end", end);
- return deviceMapper.getTrendChartData(params);
+ return result;
}
+
}
--
Gitblit v1.8.0