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/MonitorPointServiceImpl.java | 22 +++++++++++-----------
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java | 3 +++
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 7 +++++--
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
index 0db0ef6..0eefaa7 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
@@ -13,6 +13,7 @@
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -125,6 +126,8 @@
manageRoleMenuMapper.insertBatch(mapList);
}
}
+ //������token
+ TokenUtils.destoryToken(id);
List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
List manageMenuOldList = new ArrayList();
List manageMenuNewList = new ArrayList();
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 2a3ed9b..0c047cd 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -117,7 +117,7 @@
monitorPointMap.put("key",monitorPoint.getId());
monitorPointtList.add(monitorPointMap);
}
- resultMap.put("manageRoles",monitorPointtList);
+ resultMap.put("monitorPoints",monitorPointtList);
resultMap.put("totalNumber",totalNumber);
resultMap.put("current",current);
int totalPageNumber = totalNumber/size;
@@ -137,6 +137,15 @@
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
+ QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
+ wapper_id.eq("id",updateMap.get("id"));
+ wapper_id.eq("is_delete",Constants.NOT_DELETE);
+ MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
+ if (oldMonitorPoint==null){
+ resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
+ return resultMap;
+ }
if (updateMap.get("name")==null||updateMap.get("name")==""){
resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -149,15 +158,6 @@
if(monitorPoint_name!=null&&!monitorPoint_name.getId().toString().equals(updateMap.get("id").toString())){
resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getCode());
resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
- return resultMap;
- }
- QueryWrapper<MonitorPoint> wapper_id = new QueryWrapper<>();
- wapper_id.eq("id",updateMap.get("id"));
- wapper_id.eq("is_delete",Constants.NOT_DELETE);
- MonitorPoint oldMonitorPoint = monitorPointMapper.selectOne(wapper_id);
- if (oldMonitorPoint==null){
- resultMap.put("code",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getCode());
- resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
return resultMap;
}
monitorPointMapper.updateMonitorPoint(updateMap);
@@ -266,7 +266,7 @@
monitorPointMap.put("key",monitorPoint.getId());
monitorPointtList.add(monitorPointMap);
}
- resultMap.put("manageRoles",monitorPointtList);
+ resultMap.put("monitorPoints",monitorPointtList);
resultMap.put("totalNumber",totalNumber);
resultMap.put("current",current);
int totalPageNumber = totalNumber/size;
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 ed60274..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
@@ -14,6 +14,7 @@
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;
@@ -189,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;
@@ -230,6 +231,8 @@
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
//������������
refreshCache();
+ //������token
+ TokenUtils.destoryToken(Integer.parseInt(map.get("id").toString()));
return resultMap;
}
@@ -262,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