From e702400b2e1bfd27f6176ea95a5c4d130417a1a4 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Jun 2021 11:20:05 +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/DeviceAdjustValueServiceImpl.java | 8 +++++---
1 files changed, 5 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..9623c9c 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());
@@ -276,7 +276,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