From 93fe0b66e85e95e3a7e77a28504d6d289b6906b9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 08 Oct 2021 13:11:22 +0800
Subject: [PATCH] screen-manage screen-api 更改拦截器逻辑，记录token无效的请求IP以及URL。 manage记录到数据库日志中 api记录在日志文件中
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 5 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 089fde6..e4350df 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
@@ -7,15 +7,18 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.DeviceAdjustValueMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.DeviceAdjustValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
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;
@@ -46,10 +49,13 @@
private DeviceMapper deviceMapper;
@Autowired(required = false)
+ private SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired(required = false)
private SensorMapper sensorMapper;
@Autowired
- LogUtils logUtils;
+ RedisTemplate redisTemplate;
@Override
@Transactional
@@ -68,7 +74,10 @@
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
wrapper_device.eq("is_delete",Constants.NOT_DELETE);
wrapper_device.eq("mac",deviceAdjustValue.getMac());
- if (deviceMapper.selectCount(wrapper_device)==0){
+ QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+ wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDevice.eq("mac",deviceAdjustValue.getMac());
+ if (deviceMapper.selectCount(wrapper_device)==0 && specialDeviceMapper.selectCount(wrapper_specialDevice)==0){
resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
return resultMap;
@@ -85,7 +94,9 @@
//������������������
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());
resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
@@ -161,7 +172,9 @@
content = content+"������������:"+deviceAdjustValueOld.getValue()+"->"+map.get(key)+";";
}
}
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ //������������
+ refreshCache(deviceAdjustValueOld.getMac());
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
@@ -191,7 +204,9 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ //������������
+ refreshCache(deviceAdjustValue.getMac());
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
@@ -222,6 +237,7 @@
}
for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
Map timeSlotMap = new HashMap();
+ timeSlotMap.put("id",deviceAdjustValue.getId());
timeSlotMap.put("startTime",deviceAdjustValue.getStartTime());
timeSlotMap.put("endTime",deviceAdjustValue.getEndTime());
timeSlotList.add(timeSlotMap);
@@ -230,4 +246,64 @@
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);
+ wapper_redis.eq("is_delete",Constants.NOT_DELETE);
+ List<DeviceAdjustValue> deviceAdjustValueList = deviceAdjustValueMapper.selectList(wapper_redis);
+ if (deviceAdjustValueList.size()==0){
+ return null;
+ }
+ Map<String, Object> deviceAdjustValueMap = new HashMap<>();
+ for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValueList) {
+ String sensor_code = deviceAdjustValue.getSensorCode();
+ List<DeviceAdjustValue> timeSlotValueList = new ArrayList<>();
+ for (DeviceAdjustValue deviceAdjustValueIn:deviceAdjustValueList) {
+ if (deviceAdjustValueIn.getSensorCode().equals(sensor_code)){
+ Map<String, Object> timeSlot_value = new HashMap<>();
+ timeSlot_value.put("start_time",deviceAdjustValue.getStartTime());
+ timeSlot_value.put("end_time",deviceAdjustValue.getEndTime());
+ timeSlot_value.put("value",deviceAdjustValue.getValue());
+ timeSlotValueList.add(deviceAdjustValueIn);
+ }
+ }
+ deviceAdjustValueMap.put(sensor_code,timeSlotValueList);
+ }
+ return deviceAdjustValueMap;
+ }
+
+ private void refreshCache(String mac){
+ Map<String, Object> deviceAdjustValueMap = getDeviceAdjustValueFromDB(mac);
+ refreshCache(deviceAdjustValueMap,mac);
+ }
+
+ private void refreshCache(Map<String,Object> deviceAdjustValueMap,String mac){
+ //������������
+ redisTemplate.delete("adjust_"+mac);
+ //������������
+ if (!ObjectUtils.isEmpty(deviceAdjustValueMap)){
+ redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
+ }
+ }
+
}
--
Gitblit v1.8.0