From ddebb2ea352012c10ec31a9d9774b0320af4caac Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 10 Jun 2021 16:48:15 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 86 insertions(+), 11 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java index 01836ff..6a972f9 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java +++ b/screen-manage/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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,11 +23,12 @@ import com.moral.api.util.LogUtils; import com.moral.constant.Constants; -import com.moral.redis.RedisUtil; +import com.moral.constant.RedisConstants; import com.moral.util.ConvertUtils; import com.moral.util.DateUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestContextHolder; @@ -75,6 +77,49 @@ @Autowired private LogUtils logUtils; + @Autowired + private RedisTemplate redisTemplate; + + + /* + * ���redis������������������ + * */ + private Map<String, Object> getDeviceInfoFromRedis(String mac) { + Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE + mac); + return deviceInfo; + } + + /* + * ������������������redis + */ + private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) { + redisTemplate.opsForValue().set(getDeviceKey(mac), deviceInfo); + } + + /* + * ���redis������������������ + */ + private void delDeviceInfoFromRedis(String mac) { + redisTemplate.delete(getDeviceKey(mac)); + } + + /* + * ���������������������redis������key + */ + private String getDeviceKey(String mac) { + return keysConnect(RedisConstants.DEVICE, mac); + } + + //redis key������ + private String keysConnect(String... keys) { + StringBuilder key = new StringBuilder(keys[0]); + for (int i = 1; i < keys.length; i++) { + key.append("_"); + key.append(keys[i]); + } + return key.toString().toLowerCase(); + } + @Override @Transactional public void insert(Device device) { @@ -83,12 +128,15 @@ deviceMapper.insert(device); Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId()); //������������������������redis - RedisUtil.del("device_" + device.getMac()); - RedisUtil.set("device_" + device.getMac(), deviceInfo); + String mac = device.getMac(); + //���redis��������������������� + delDeviceInfoFromRedis(mac); + //������������������redis + setDeviceInfoToRedis(mac, deviceInfo); //������������������ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); StringBuilder content = new StringBuilder(); - content.append("������������������").append(device.getName()).append("���").append("mac���").append(device.getMac()); + content.append("������������������").append(device.getName()).append("���").append("mac���").append(mac); logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE); } @@ -100,8 +148,8 @@ deviceMapper.update(null, updateWrapper); Device device = deviceMapper.selectById(deviceId); String mac = device.getMac(); - //������redis - RedisUtil.del("device_" + mac); + //���redis��������������������� + delDeviceInfoFromRedis(mac); //������������������ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); StringBuilder content = new StringBuilder(); @@ -116,10 +164,11 @@ Device oldDevice = deviceMapper.selectById(deviceId); deviceMapper.updateById(device); String mac = deviceMapper.selectById(deviceId).getMac(); - //������redis - RedisUtil.del("device_" + mac); + //���redis��������������������� + delDeviceInfoFromRedis(mac); Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId); - RedisUtil.set("device_" + mac, deviceInfo); + //������������������redis + setDeviceInfoToRedis(mac, deviceInfo); //������������������ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); StringBuilder content = new StringBuilder(); @@ -249,7 +298,7 @@ @Override public Map<String, Object> selectDeviceInfoById(Integer deviceId) { String mac = deviceMapper.selectById(deviceId).getMac(); - Map<String, Object> deviceInfo = (Map<String, Object>) RedisUtil.get("device_" + mac); + Map<String, Object> deviceInfo = getDeviceInfoFromRedis(mac); //������redis������ if (deviceInfo != null) { return deviceInfo; @@ -317,7 +366,7 @@ mpInfo.put("name", monitorPoint.getName()); deviceInfo.put("monitorPoint", mpInfo); - RedisUtil.set("device_" + mac, deviceInfo); + setDeviceInfoToRedis(mac, deviceInfo); return deviceInfo; } @@ -335,4 +384,30 @@ return monitorPointMapper.selectMaps(queryWrapper); } + @Override + public Map<String, Object> getDeviceByMac(String mac) { + Map<String, Object> deviceInfo = getDeviceInfoFromRedis(mac); + if (deviceInfo == null) { + QueryWrapper<Device> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("mac", mac).eq("is_delete", Constants.NOT_DELETE); + Device device = deviceMapper.selectOne(queryWrapper); + if (device != null) { + deviceInfo = selectDeviceInfoById(device.getId()); + setDeviceInfoToRedis(mac, deviceInfo); + } + } + return deviceInfo; + } + + @Override + public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData, Map<String, Object> deviceInfo) { + return null; + } + + @Override + public Map<String, Object> judgeDeviceState(Map<String, Object> deviceData, Map<String, Object> deviceInfo) { + return null; + } + + } -- Gitblit v1.8.0