#

luxiaotao1123

2024-02-22 b9efed08b3cf24f3f30b915b17557efd93195940

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java

@@ -4,22 +4,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.system.entity.Role;
import com.zy.asrs.wcs.system.entity.RoleMenu;
import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * Created by vincent on 2/13/2024
@@ -30,6 +31,8 @@

    @Autowired
    private RoleService roleService;
    @Autowired
    private RoleMenuService roleMenuService;

    @PreAuthorize("hasAuthority('system:role:list')")
    @PostMapping("/role/page")
@@ -63,6 +66,8 @@
                && roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getCode, role.getCode())) > 0) {
            return R.error("角色标识已存在");
        }
        role.setCreateTime(new Date());
        role.setUpdateTime(new Date());
        if (!roleService.save(role)) {
            return R.error("添加失败");
        }
@@ -83,6 +88,7 @@
                .ne(Role::getId, role.getId())) > 0) {
            return R.error("角色名称已存在");
        }
        role.setUpdateTime(new Date());
        if (!roleService.updateById(role)) {
            return R.error("修改失败");
        }
@@ -92,9 +98,15 @@
    @PreAuthorize("hasAuthority('system:role:remove')")
    @OperationLog("删除角色")
    @PostMapping("/role/remove/{ids}")
    @Transactional
    public R remove(@PathVariable Long[] ids) {
        if (!roleService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        for (Long roleId : ids) {
            if (!roleService.removeById(roleId)) {
                throw new CoolException("服务器内部错误");
            }
            if (!roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId))) {
                throw new CoolException("服务器内部错误");
            }
        }
        return R.ok("删除成功");
    }
@@ -119,4 +131,14 @@
        ExcelUtil.build(ExcelUtil.create(roleService.list(), Role.class), response);
    }

    @PreAuthorize("hasAuthority('system:role:update')")
    @OperationLog("分配权限")
    @PostMapping("/role/scope")
    public R scope(@RequestBody Role role) {

        

        return R.ok("分配成功");
    }

}