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 | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 3541861..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
@@ -22,7 +22,6 @@
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* <p>
@@ -166,11 +165,33 @@
@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);
+ List macs = getMacsByOrganizationId(orgId);
//���redis������������������������
- return devices.stream().map(device -> (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, device.getMac())).collect(Collectors.toList());
+ 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) {
--
Gitblit v1.8.0