From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 99 +++++++++++++++++++++----------------------------
1 files changed, 43 insertions(+), 56 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 3f71e38..074a50d 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
@@ -2,8 +2,6 @@
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.controller.BaseController;
@@ -13,9 +11,8 @@
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.other.api.domain.TRoleSite;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
@@ -40,9 +37,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -73,38 +68,50 @@
private SysMenuMapper menuMapper;
@Resource
- private RoleSiteClient roleSiteClient;
+ private TokenService tokenService;
@Resource
- private SiteClient siteClient;
+ private ISysUserService sysUserService;
- @ApiOperation(value = "获取角色列表", tags = {"管理后台-系统用户管理"})
+ @ApiOperation(value = "获取角色列表", tags = {"管理后台-账号管理", "门店后台-账号管理"})
@GetMapping("/list")
public AjaxResult list() {
- List<SysRole> list = roleService.list(new LambdaQueryWrapper<SysRole>().eq(SysRole::getDelFlag, 0).eq(SysRole::getStatus, 0));
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserService.getById(userid);
+ LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>()
+ .ne(SysRole::getRoleId, 2)
+ .eq(SysRole::getDelFlag, 0)
+ .eq(SysRole::getStatus, 0);
+ if (sysUser.getRoleType() == 2) {
+ wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }else {
+ wrapper.isNull(SysRole::getShopId);
+ }
+ List<SysRole> list = roleService.list(wrapper);
return AjaxResult.success(list);
}
@ResponseBody
@GetMapping("/listPage")
- @ApiOperation(value = "获取角色列表", tags = {"管理后台-角色管理"})
+ @ApiOperation(value = "获取角色列表", tags = {"管理后台-权限管理", "门店后台-权限管理"})
public AjaxResult listPage(String name, BasePage basePage) {
PageInfo<SysRole> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<SysRole>().eq(SysRole::getStatus, 0).eq(SysRole::getDelFlag, 0);
if (StringUtils.isNotEmpty(name)) {
wrapper.like(SysRole::getRoleName, name);
}
-
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserService.getById(userid);
+ if(sysUser.getRoleType() == 2){
+ wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }else{
+ wrapper.isNull(SysRole::getShopId);
+ }
+ wrapper.ne(SysRole::getRoleId,2);//过滤门店管理员
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);
}
@@ -114,13 +121,19 @@
@ResponseBody
@PostMapping("/roleAdd")
- @ApiOperation(value = "添加角色", tags = {"管理后台-角色管理"})
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
+ @ApiOperation(value = "添加角色", tags = {"管理后台-权限管理", "门店后台-权限管理"})
public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto) {
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
- long count = roleService.count(Wrappers.lambdaQuery(SysRole.class)
- .eq(SysRole::getRoleName, dto.getRoleName()));
+ LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
+ .eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserService.getById(userid);
+ if(sysUser.getRoleType() == 2){
+ wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
+ }
+
+ long count = roleService.count(wrapper);
if (count > 0) {
return AjaxResult.error("角色已存在，请重新输入");
}
@@ -133,22 +146,17 @@
role.setRemark(dto.getRemark());
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);
+
+ if(sysUser.getRoleType() == 2){
+ role.setShopId(sysUser.getObjectId());
}
- roleSiteClient.addRoleSite(roleSites);
+ roleService.insertRole(role);
return AjaxResult.success();
}
@GetMapping("/roleInfo")
- @ApiOperation(value = "角色详情", tags = {"管理后台-角色管理"})
+ @ApiOperation(value = "角色详情", tags = {"管理后台-权限管理"})
public AjaxResult roleInfo(@RequestParam Long id) {
SysRole role = roleService.selectRoleById(id);
RoleInfoVo roleInfoVo = new RoleInfoVo();
@@ -179,20 +187,12 @@
}
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);
}
@PostMapping("/roleUpdate")
- @ApiOperation(value = "编辑角色", tags = {"管理后台-角色管理"})
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
+ @ApiOperation(value = "编辑角色", tags = {"管理后台-权限管理"})
public AjaxResult roleUpdate(@Validated @RequestBody RoleUpdateDto dto) {
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
@@ -229,19 +229,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();
}
@@ -251,7 +238,7 @@
*/
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
- @ApiOperation(value = "删除角色", tags = {"管理后台-角色管理"})
+ @ApiOperation(value = "删除角色", tags = {"管理后台-权限管理"})
public AjaxResult remove(@PathVariable Long[] roleIds) {
return toAjax(roleService.deleteRoleByIds(roleIds));
}
--
Gitblit v1.7.1