From 616747c2ebad352796b21ec153e4f9590aa26c45 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 16:01:31 +0800
Subject: [PATCH] 修改获取AVG、MIN、MAX数据接口
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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..3541861 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,6 +14,7 @@
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;
@@ -20,6 +22,7 @@
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -84,7 +87,6 @@
queryWrapper.select("mac", "name").in("mac", macs);
List<Device> devices = deviceMapper.selectList(queryWrapper);
-
//������������
List<String> times = (List<String>) params.remove("times");
//������code
@@ -98,7 +100,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 +145,40 @@
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
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(queryWrapper);
+ //���redis������������������������
+ return devices.stream().map(device -> (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, device.getMac())).collect(Collectors.toList());
+ }
+
+ 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