From 48e498136c8784ee79a698da2c852ca3aa0549ab Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Dec 2021 15:10:41 +0800
Subject: [PATCH] 行业贡献率，区域贡献率
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 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 98bffb3..b289309 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
@@ -86,7 +86,6 @@
queryWrapper.select("mac", "name").in("mac", macs);
List<Device> devices = deviceMapper.selectList(queryWrapper);
-
//������������
List<String> times = (List<String>) params.remove("times");
//������code
@@ -100,7 +99,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);
@@ -146,26 +146,58 @@
@Override
public Device getDeviceByMac(String mac) {
- Map<String,Object> deviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,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");
+ 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)){
+ if (ObjectUtils.isEmpty(device)) {
return getDeviceByMacFromDB(mac);
}
return device;
}
- private Device getDeviceByMacFromDB(String mac){
+ @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);
+ wrapper.eq("mac", mac);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
return deviceMapper.selectOne(wrapper);
}
--
Gitblit v1.8.0