From af819f7cecad3a63d7e7b6417a12f04f3fd6ed86 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Aug 2022 15:16:24 +0800
Subject: [PATCH] 风场模型基准信息相关代码
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 6f2cb80..396e77b 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -4,14 +4,17 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
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 com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -20,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.function.Predicate;
/**
* <p>
@@ -53,8 +57,6 @@
@Autowired(required = false)
private ManageAccountRoleMapper manageAccountRoleMapper;
- @Autowired
- LogUtils logUtils;
@Override
public Map<String,Object> getAllWithPagingQuery(Map map) {
@@ -77,6 +79,19 @@
manageRoleMap.put("updateTime",updateTime);
manageRoleMap.put("key",manageRole.getId());
manageRolesList.add(manageRoleMap);
+ }
+ //���admin��������� admin���������������
+ AccountInfoDTO accountInfo = (AccountInfoDTO) TokenUtils.getUserInfo();
+ List<ManageRole> roles = accountInfo.getRoles();
+ if(!roles.get(0).getName().equals("admin")){
+ manageRolesList.removeIf(new Predicate<Map<String, Object>>() {
+ @Override
+ public boolean test(Map<String, Object> map) {
+ if(map.get("name").equals("admin"))
+ return true;
+ return false;
+ }
+ });
}
resultMap.put("manageRoles",manageRolesList);
int totalNumber = manageRoleMapper.selectCount(wrapper);
@@ -128,7 +143,7 @@
//������������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "������������:"+manageRole.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
@@ -161,7 +176,7 @@
content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
}
}
- logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
@@ -230,13 +245,28 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
ManageRole manageRole1 = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
String content = "������������:"+manageRole1.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
+ @Override
+ public ManageRole getRoleByAccountId(Integer accountId) {
+ QueryWrapper<ManageAccountRole> queryAccountRoleWrapper = new QueryWrapper<>();
+ queryAccountRoleWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryAccountRoleWrapper.eq("account_id",accountId);
+ ManageAccountRole accountRole = manageAccountRoleMapper.selectOne(queryAccountRoleWrapper);
+ if(ObjectUtils.isEmpty(accountRole))
+ return null;
+ Integer roleId = accountRole.getRoleId();
+ QueryWrapper<ManageRole> queryRoleWrapper = new QueryWrapper();
+ queryRoleWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryRoleWrapper.eq("id", roleId);
+ return manageRoleMapper.selectOne(queryRoleWrapper);
+ }
+
/**
* @Description: ���������������
* @Param: [list, menuId]list���menuId������
--
Gitblit v1.8.0