#
luxiaotao1123
2024-02-14 86004761ed1f3cbb0bdc7cbc1cd048c60a33c9a2
#
2个文件已修改
32 ■■■■■ 已修改文件
zy-asrs-flow/src/pages/system/role/index.jsx 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/system/role/index.jsx
@@ -1,9 +1,9 @@
import React, { useState, useRef, useEffect } from 'react';
import { useIntl, FormattedMessage } from '@umijs/max';
import { Button, message, Modal, Table } from 'antd';
import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, ExportOutlined } from '@ant-design/icons';
import { Button, message, Modal } from 'antd';
import { FooterToolbar, PageContainer, ProTable } from '@ant-design/pro-components';
import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
import { getLogininforList, removeLogininfor, exportLogininfor } from '@/services/monitor/logininfor';
import Http from '@/utils/http';
import Edit from './components/edit'
@@ -50,14 +50,15 @@
    if (!rows) return true;
    const hide = message.loading('正在删除');
    try {
        const resp = await removeLogininfor(rows.map((row) => row.infoId).join(','));
        const resp = await Http.doPost('api/role/remove/' + rows.map((row) => row.id).join(','));
        hide();
        if (resp.code === 200) {
            message.success('删除成功,即将刷新');
            message.success('删除成功');
            return true;
        } else {
            message.error(resp.msg);
            return false;
        }
        return true;
    } catch (error) {
        hide();
        message.error('删除失败,请重试');
@@ -68,7 +69,7 @@
const handleExport = async () => {
    const hide = message.loading('正在导出');
    try {
        await exportLogininfor();
        await Http.doPost('api/role/export');
        hide();
        message.success('导出成功');
        return true;
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -12,7 +12,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Arrays;
/**
 * Created by vincent on 2/13/2024
@@ -25,7 +25,6 @@
    private RoleService roleService;
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @PostMapping("/role/page")
    public R page(@RequestBody BaseParam param) {
        PageParam<Role, BaseParam> page = new PageParam<>(param);
@@ -33,14 +32,12 @@
    }
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @PostMapping("/role/list")
    public R list(@RequestBody BaseParam param) {
        return R.ok().add(roleService.list());
    }
    @PreAuthorize("hasAuthority('sys:role:list')")
    @OperationLog
    @GetMapping("/role/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(roleService.getById(id));
@@ -86,12 +83,18 @@
    @PreAuthorize("hasAuthority('sys:role:remove')")
    @OperationLog("删除角色")
    @PostMapping("/role/remove")
    public R remove(@RequestBody List<Long> ids) {
        if (!roleService.removeByIds(ids)) {
    @PostMapping("/role/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!roleService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }
    @PreAuthorize("hasAuthority('sys:role:list')")
    @PostMapping("/role/export")
    public R export(@RequestBody Role role) {
        return R.ok("导出成功");
    }
}