From fe709ee47cb21e089f709f7314fcc02b68dbc993 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 29 Dec 2021 15:36:35 +0800 Subject: [PATCH] screen-api 更新获取柱状图数据前端实体 --- screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 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 1c1b45b..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 @@ -162,6 +162,38 @@ 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); -- Gitblit v1.8.0