From 1d429b7c98f8f15c63a6dba03ff90dae7a984e58 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 十一月 2024 10:32:33 +0800
Subject: [PATCH] 修改配置文件
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 50 --------------------------------------------------
1 files changed, 0 insertions(+), 50 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index ebe7214..595f775 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -1,25 +1,16 @@
package com.ruoyi.system.controller;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import javax.management.relation.Role;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.other.api.domain.TRoleSite;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.system.api.model.GetSysRoleByIds;
import com.ruoyi.system.domain.SysMenus;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -79,12 +70,6 @@
@Resource
private SysMenuMapper menuMapper;
- @Resource
- private RoleSiteClient roleSiteClient;
-
- @Resource
- private SiteClient siteClient;
-
@ApiOperation(value = "获取角色列表", tags = {"管理后台-系统用户管理"})
@GetMapping("/list")
@@ -106,12 +91,6 @@
PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
for (SysRole record : page.getRecords()) {
- List<Integer> data = roleSiteClient.getSiteIds(record.getRoleId()).getData();
- List<Site> sites = siteClient.getSiteByIds(data).getData();
- if (null != sites) {
- List<String> collect = sites.stream().map(Site::getName).collect(Collectors.toList());
- record.setSiteNames(collect);
- }
long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
record.setNumber(count);
}
@@ -141,15 +120,6 @@
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
roleService.insertRole(role);
- //添加站点权限
- List<TRoleSite> roleSites = new ArrayList<>();
- for (Integer siteId : dto.getSiteIds()) {
- TRoleSite roleSite = new TRoleSite();
- roleSite.setRoleId(role.getRoleId().intValue());
- roleSite.setSiteId(siteId);
- roleSites.add(roleSite);
- }
- roleSiteClient.addRoleSite(roleSites);
return AjaxResult.success();
}
@@ -186,13 +156,6 @@
}
roleInfoVo.setMenus(menusId);
roleInfoVo.setRemark(role.getRemark());
- List<Integer> siteIds = roleSiteClient.getSiteIds(role.getRoleId()).getData();
- if (null != siteIds && siteIds.size() > 0) {
- List<Site> sites = siteClient.getSiteByIds(siteIds).getData();
- List<String> siteNames = sites.stream().map(Site::getName).collect(Collectors.toList());
- roleInfoVo.setSiteNames(siteNames);
- roleInfoVo.setSiteIds(siteIds);
- }
return AjaxResult.success(roleInfoVo);
}
@@ -236,19 +199,6 @@
sysRoleMenus.add(sysRoleMenu);
}
sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
- //删除旧站点数据
- roleSiteClient.delRoleSite(dto.getRoleId());
- //添加站点权限
- List<TRoleSite> roleSites = new ArrayList<>();
- if(null != dto.getSiteIds()){
- for (Integer siteId : dto.getSiteIds()) {
- TRoleSite roleSite = new TRoleSite();
- roleSite.setRoleId(role.getRoleId().intValue());
- roleSite.setSiteId(siteId);
- roleSites.add(roleSite);
- }
- }
- roleSiteClient.addRoleSite(roleSites);
return AjaxResult.success();
}
--
Gitblit v1.7.1