From 86004761ed1f3cbb0bdc7cbc1cd048c60a33c9a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 二月 2024 23:50:45 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 17 ++++++++++-------
zy-asrs-flow/src/pages/system/role/index.jsx | 15 ++++++++-------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index d78fa07..265bbed 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/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;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index e64ed8a..0aadef7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/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("瀵煎嚭鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1