From 4324ab67e0266fc1d70c2a05309934fd7971f872 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 二月 2024 21:14:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 17 ++++----
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityExceptionHandler.java | 22 +++++++++++
/dev/null | 32 ----------------
zy-asrs-flow/src/pages/system/role/index.jsx | 17 +++++---
4 files changed, 41 insertions(+), 47 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 77e7b12..7980197 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -8,7 +8,6 @@
import { request } from '@umijs/max';
-
/**
* 鍒犻櫎鑺傜偣
*
@@ -267,12 +266,16 @@
},
data: { ...params }
}).then((res) => {
- const result = {
- data: res.rows,
- total: res.total,
- success: true,
- };
- return result;
+ if (res.code === 200) {
+ const result = {
+ data: res.rows,
+ total: res.total,
+ success: true,
+ };
+ return result;
+ } else {
+ message.error(res.msg)
+ }
})
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityExceptionHandler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityExceptionHandler.java
new file mode 100644
index 0000000..3c48487
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/security/SecurityExceptionHandler.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.wcs.common.security;
+
+import com.zy.asrs.wcs.common.constant.Constants;
+import com.zy.asrs.wcs.utils.HttpUtils;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Created by vincent on 2/13/2024
+ */
+@RestControllerAdvice
+public class SecurityExceptionHandler {
+
+ @ExceptionHandler(AccessDeniedException.class)
+ public void accessDeniedExceptionHandler(AccessDeniedException e, HttpServletResponse response) {
+ HttpUtils.responseError(response, Constants.UNAUTHORIZED_CODE, Constants.UNAUTHORIZED_MSG, e.getMessage());
+ }
+
+}
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 ac71c19..1bb4ada 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
@@ -2,14 +2,16 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.controller.param.PageParam;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* Created by vincent on 2/13/2024
@@ -24,10 +26,9 @@
@PreAuthorize("hasAuthority('sys:role:list')")
@OperationLog
@PostMapping("/role/page")
- public R updateInfo(@RequestBody PageParam param) {
- System.out.println(param.get("condition"));
- List<Role> list = roleService.list();
- return R.ok().add(list);
+ public R updateInfo(@RequestBody BaseParam param) {
+ PageParam<Role, BaseParam> page = new PageParam<>(param);
+ return R.ok().add(roleService.page(page, page.getWrapper()));
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java
deleted file mode 100644
index 58b9d3f..0000000
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/PageParam.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.wcs.sys.controller.param;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.HashMap;
-
-/**
- * Created by vincent on 2/13/2024
- */
-@Data
-public class PageParam extends HashMap<String, Object> implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableField(exist = false)
- private Integer pageIdx;
-
- @TableField(exist = false)
- private Integer pageSize;
-
- @TableField(exist = false)
- private String timeStart;
-
- @TableField(exist = false)
- private String timeEnd;
-
- @TableField(exist = false)
- private String condition;
-
-}
--
Gitblit v1.9.1