From 38125c756f9f3139bed2939e9d3ba7801f0ebb64 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 09:51:30 +0800
Subject: [PATCH] 修改返回数据集合名称；角色变更时刷新缓存，注销token
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 6ed59ca..845f996 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,16 @@
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.VersionSensorUnit;
import com.moral.api.mapper.SensorMapper;
+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;
@@ -41,6 +44,9 @@
@Autowired(required = false)
private SensorMapper sensorMapper;
+
+ @Autowired(required = false)
+ private VersionSensorUnitMapper versionSensorUnitMapper;
@Autowired
LogUtils logUtils;
@@ -123,14 +129,29 @@
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);
@@ -169,7 +190,7 @@
sensorMap.put("key",sensor.getId());
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
@@ -194,8 +215,14 @@
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_code",sensor.getCode());
+ 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()+";";
@@ -204,6 +231,8 @@
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
+ //������token
+ TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
return resultMap;
}
@@ -236,7 +265,7 @@
sensorMap.put("key",sensor.getId());
sensorList.add(sensorMap);
}
- resultMap.put("manageRoles",sensorList);
+ resultMap.put("sensors",sensorList);
resultMap.put("totalNumber",totleNum);
resultMap.put("current",current);
int totalPageNumber = totleNum/size;
--
Gitblit v1.8.0