From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Jan 2022 14:40:28 +0800
Subject: [PATCH] 贡献率数据格式修改
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 166 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 118 insertions(+), 48 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 e4439d4..3a68890 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
@@ -1,7 +1,6 @@
package com.moral.api.service.impl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
import com.moral.api.entity.Sensor;
@@ -15,20 +14,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
+
import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
+
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
/**
* <p>
@@ -42,7 +37,7 @@
public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements DeviceService {
@Autowired
- DeviceMapper deviceMapper;
+ private DeviceMapper deviceMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -57,6 +52,20 @@
@Override
public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
+ List<String> sensorCodes = Arrays.asList(Constants.SENSOR_CODE_PM25
+ , Constants.SENSOR_CODE_PM10
+ , Constants.SENSOR_CODE_SO2
+ , Constants.SENSOR_CODE_NO2
+ , Constants.SENSOR_CODE_CO
+ , Constants.SENSOR_CODE_O3
+ , Constants.SENSOR_CODE_TEMP
+ , "a01002"
+ , Constants.SENSOR_CODE_WIND_SPEED
+ , Constants.SENSOR_CODE_WIND_DIR
+ , "a01006"
+ , "a00e12"
+ );
+
//������mac
List<String> macs = (List<String>) params.remove("macs");
List<Map<String, Object>> elementLists = new ArrayList<>();
@@ -74,13 +83,21 @@
elementLists.add(map);
}
- Map<String, Object> map = elementLists.parallelStream()
+ Map<String, Object> map = elementLists.stream()
.filter(elementList -> elementList.size() != 0)
.reduce((a, b) -> {
a.keySet().retainAll(b.keySet());
return a;
}).orElse(new HashMap<>());
- return map;
+ Map<String, Object> result = new LinkedHashMap<>();
+ sensorCodes.forEach(sensorCode -> {
+ Object o = map.remove(sensorCode);
+ if (o != null) {
+ result.put(sensorCode, o);
+ }
+ });
+ result.putAll(map);
+ return result;
}
@Override
@@ -88,6 +105,11 @@
Object type = params.get("type");
//������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
@@ -95,65 +117,113 @@
String end;
String timeUnits;
String dateFormat;
-
//���������������,time=data
List<Map<String, Object>> result = new ArrayList<>();
for (String start : times) {
- Map<String, Object> resultMap = new HashMap<>();
-
- if ("day".equals(type)) {
+ if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
- timeUnits = "hourly";
- dateFormat = "%k";
- } else if ("month".equals(type)) {
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.getDate(start, DateUtils.yyyy_MM_dd_EN), DateUtils.yyyyMM_EN);
+ timeUnits = "hourly_" + yearAndMonth;
+ dateFormat = "%Y-%m-%d %H";
+ } else if ("day".equals(type)) {
end = DateUtils.getDateAddMonth(start, 1);
timeUnits = "daily";
- dateFormat = "%e";
+ dateFormat = "%Y-%m-%d";
} else {
end = DateUtils.getDateAddYear(start, 1);
timeUnits = "monthly";
- dateFormat = "%c";
+ dateFormat = "%Y-%m";
}
params.put("timeUnits", timeUnits);
- params.put("dateFormat", dateFormat);
params.put("start", start);
params.put("end", end);
params.put("macs", macs);
+ params.put("dateFormat", dateFormat);
//���������������������������������
List<Map<String, Object>> list = deviceMapper.getTrendChartData(params);
- //���time������
- Map<String, List<Map<String, Object>>> data = list.parallelStream()
- .collect(Collectors.groupingBy(o -> o.get("time").toString()));
-
- //TreeMap<String, List<Map<String, Object>>> data = new TreeMap<>(listMap);
-
- for (Map.Entry<String, List<Map<String, Object>>> entry : data.entrySet()) {
- List<Object> values = new ArrayList<>();
- String time = entry.getKey();
- List<Map<String, Object>> value = entry.getValue();
- if (value.isEmpty()) {
- continue;
- }
- for (String mac : macs) {
- boolean flag = false;
- for (Map<String, Object> map : value) {
- if (mac.equals(map.get("mac"))) {
- Object o = map.get(sensorCode);
- values.add(o);
- flag = true;
- break;
+ 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);
}
}
- if (!flag) {
- values.add("");
- }
+ deviceData.add(valueMap);
}
- resultMap.put(time, values);
+ resultMap.put("deviceData", deviceData);
+ result.add(resultMap);
}
- result.add(resultMap);
}
return result;
}
+
+ @Override
+ public Device getDeviceByMac(String mac) {
+ Map<String, Object> deviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
+ Device device = JSON.parseObject(JSON.toJSONString(deviceMap), Device.class);
+ //���map������organizationId���monitorPointId������versionId
+ Map<String, Object> organizationMap = (Map<String, Object>) deviceMap.get("organization");
+ Map<String, Object> monitorPointMap = (Map<String, Object>) deviceMap.get("monitorPoint");
+ Map<String, Object> versionMap = (Map<String, Object>) deviceMap.get("version");
+ device.setDeviceVersionId((Integer) versionMap.get("id"));
+ device.setOrganizationId((Integer) organizationMap.get("id"));
+ device.setMonitorPointId((Integer) monitorPointMap.get("id"));
+ //������������������������������������
+ if (ObjectUtils.isEmpty(device)) {
+ return getDeviceByMacFromDB(mac);
+ }
+ return device;
+ }
+
+ @Override
+ public List<Map<String, Object>> getDevicesByOrganizationId(Integer orgId) {
+ //������������������mac
+ List macs = getMacsByOrganizationId(orgId);
+ //���redis������������������������
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Object mac : macs) {
+ Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac.toString());
+ result.add(map);
+ }
+ return result;
+ }
+
+ @Override
+ public List getMacsByOrganizationId(Integer organizationId) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac")
+ .eq("organization_id", organizationId)
+ .eq("is_delete", Constants.NOT_DELETE);
+ return deviceMapper.selectObjs(queryWrapper);
+ }
+
+ @Override
+ public List getMacsByOrgIdAndRegionCode(Integer organizationId, Integer regionCode) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac")
+ .eq("organization_id", organizationId)
+ .eq("is_delete", Constants.NOT_DELETE)
+ .eq("town_code", regionCode);
+ return deviceMapper.selectObjs(queryWrapper);
+ }
+
+ private Device getDeviceByMacFromDB(String mac) {
+ QueryWrapper<Device> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac", mac);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+ return deviceMapper.selectOne(wrapper);
+ }
+
+
}
--
Gitblit v1.8.0