From 16500ff805484fb876ff9736d21021b242f1d7cd Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 09:03:55 +0800
Subject: [PATCH] screen-manage 添加websocket实时界面
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index e22c1ea..5a343e6 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -85,11 +85,11 @@
resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
return resultMap;
}
- //deviceAdjustValueMapper.insert(deviceAdjustValue);
+ deviceAdjustValueMapper.insert(deviceAdjustValue);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
- //logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache(deviceAdjustValue.getMac());
resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
@@ -241,6 +241,26 @@
return resultMap;
}
+ @Override
+ public Map<String, Object> refreshRedis() {
+ Map<String,Object> resultMap = new HashMap<>();
+ QueryWrapper<DeviceAdjustValue> wrapper_mac = new QueryWrapper<>();
+ wrapper_mac.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_mac.select("DISTINCT mac");
+ List<DeviceAdjustValue> deviceAdjustValues = deviceAdjustValueMapper.selectList(wrapper_mac);
+ for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
+ //������������
+ refreshCache(deviceAdjustValue.getMac());
+ }
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+ public void refreshRedisAll(){
+ refreshRedis();
+ }
+
private Map<String,Object> getDeviceAdjustValueFromDB(String mac){
QueryWrapper<DeviceAdjustValue> wapper_redis = new QueryWrapper<>();
wapper_redis.eq("mac",mac);
@@ -276,7 +296,9 @@
//������������
redisTemplate.delete("adjust_"+mac);
//������������
- redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
+ if (!ObjectUtils.isEmpty(deviceAdjustValueMap)){
+ redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
+ }
}
}
--
Gitblit v1.8.0