From 3cf84aa99a0bb5acddf63eeea9d5d84810105c1e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 Jan 2022 10:12:19 +0800
Subject: [PATCH] 添加边界接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 4 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 23efdd1..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,5 +1,6 @@
package com.moral.api.service.impl;
+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;
@@ -13,11 +14,14 @@
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.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -48,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<>();
@@ -65,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
@@ -83,7 +109,6 @@
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");
@@ -98,7 +123,8 @@
for (String start : times) {
if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
- timeUnits = "hourly";
+ 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);
@@ -142,5 +168,62 @@
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