From d671f1e6611902e2e4d59443f556c421dfc999d7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Jun 2021 11:36:49 +0800
Subject: [PATCH] screen-manage 更新后台账号更新角色日志逻辑
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 123 ++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 14 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index fae31a5..b003f5f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -5,13 +5,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageRole;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SysDictData;
+import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SysDictDataMapper;
+import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.TokenUtils;
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.util.ObjectUtils;
@@ -40,8 +47,17 @@
@Autowired(required = false)
private SensorMapper sensorMapper;
+ @Autowired(required = false)
+ private VersionSensorUnitMapper versionSensorUnitMapper;
+
+ @Autowired(required = false)
+ private SysDictDataMapper sysDictDataMapper;
+
@Autowired
LogUtils logUtils;
+
+ @Autowired
+ RedisTemplate redisTemplate;
@Override
@Transactional
@@ -75,6 +91,8 @@
logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
return resultMap;
}
@@ -116,19 +134,36 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+oldSensor.getName()+";";
for (Object key:updateSensorMap.keySet()) {
- if (key.toString().equals("name")){
- content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
+ if (key.toString().equals("name")&&updateSensorMap.get(key)!=null){
+ content = content+"���������:"+oldSensor.getName()+"->"+updateSensorMap.get(key)+";";
}
- if (key.toString().equals("code")){
+ if (key.toString().equals("code")&&updateSensorMap.get(key)!=null){
+ /*QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
+ wrapper_Version.eq("sensor_code",oldSensor.getCode());
+ wrapper_Version.eq("is_delete","0");
+ VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
+ versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
+ versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);*/
content = content+"������:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&updateSensorMap.get(key)!=null){
content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
+ if (key.toString().equals("upper")&&updateSensorMap.get(key)!=null){
+ content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
+ if (key.toString().equals("lower")&&updateSensorMap.get(key)!=null){
+ content = content+"������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
+ }
+ if (key.toString().equals("default_unit_key")&&updateSensorMap.get(key)!=null){
+ content = content+"������������:"+oldSensor.getDesc()+"->"+updateSensorMap.get(key)+";";
}
}
logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
return resultMap;
}
@@ -141,11 +176,13 @@
QueryWrapper<Sensor> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
int totleNum = sensorMapper.selectCount(wrapper);
- String orderType = map.get("orderType").toString();
- if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
- }else {
- wrapper.orderByDesc("create_time");
+ if (!ObjectUtils.isEmpty(map.get("orderType"))){
+ String orderType = map.get("orderType").toString();
+ if (orderType.equals(Constants.ORDER_DESC)){
+ wrapper.orderByDesc("update_time");
+ }else {
+ wrapper.orderByAsc("update_time");
+ }
}
Page resultPage = sensorMapper.selectPage(page,wrapper);
List<Sensor> sensors = resultPage.getRecords();
@@ -158,9 +195,18 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ if (!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU))&&!ObjectUtils.isEmpty(sysDictDataMapper.selectOne(wrapper_VSU).getDataValue())){
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
+ }
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
@@ -185,14 +231,24 @@
return resultMap;
}
Sensor deleteSensor = new Sensor();
- deleteSensor.setIsDelete("1");
+ deleteSensor.setIsDelete(Constants.DELETE);
sensorMapper.update(deleteSensor,wrapper);
+ QueryWrapper<VersionSensorUnit> wrapper_Version = new QueryWrapper<>();
+ wrapper_Version.eq("sensor_id",sensor.getId());
+ wrapper_Version.eq("is_delete","0");
+ VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
+ versionSensorUnit.setIsDelete(Constants.DELETE);
+ versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+sensor.getName()+";";
logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ //������������
+ refreshCache();
+ //������token
+ TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
return resultMap;
}
@@ -208,9 +264,9 @@
int totleNum = sensorMapper.selectCount(wrapper);
String orderType = map.get("orderType").toString();
if (orderType.equals(Constants.ORDER_ASC)){
- wrapper.orderByAsc("create_time");
+ wrapper.orderByAsc("update_time");
}else {
- wrapper.orderByDesc("create_time");
+ wrapper.orderByDesc("update_time");
}
Page resultPage = sensorMapper.selectPage(page,wrapper);
List<Sensor> sensors = resultPage.getRecords();
@@ -223,9 +279,16 @@
sensorMap.put("createTime",createTime);
sensorMap.put("updateTime",updateTime);
sensorMap.put("key",sensor.getId());
+ if (sensor.getDefaultUnitKey()!=null&&sensor.getDefaultUnitKey()!=""){
+ QueryWrapper<SysDictData> wrapper_VSU = new QueryWrapper();
+ wrapper_VSU.eq("is_delete",0);
+ wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
+ wrapper_VSU.eq("dict_type_id",14);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
+ }
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
@@ -235,4 +298,36 @@
resultMap.put("totalPageNumber",totalPageNumber);
return resultMap;
}
+
+ public Map<String,Sensor> getAllSensorFromCache(){
+ Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
+ if(ObjectUtils.isEmpty(sensors))
+ sensors = getAllSensorFromDB();
+ //������������
+ refreshCache(sensors);
+ return sensors;
+ }
+
+ private Map<String,Sensor> getAllSensorFromDB(){
+ QueryWrapper<Sensor> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Sensor> sensors = sensorMapper.selectList(wrapper);
+ Map<String,Sensor> result = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ result.put(sensor.getCode(),sensor);
+ }
+ return result;
+ }
+
+ private void refreshCache(){
+ Map<String, Sensor> sensors = getAllSensorFromDB();
+ refreshCache(sensors);
+ }
+
+ private void refreshCache(Map<String,Sensor> sensors){
+ //������������
+ redisTemplate.delete(RedisConstants.SENSOR_KEY);
+ //������������
+ redisTemplate.opsForHash().putAll(RedisConstants.SENSOR_KEY,sensors);
+ }
}
--
Gitblit v1.8.0