From 3b1672c22fe83d442e81092a6efac71b284cf4a7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 19:11:27 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java | 7 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 13 +++++++++++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java | 25 +++++++++++++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
index 00e0b7c..25769f8 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Map;
/**
* Created by vincent on 2/13/2024
@@ -28,4 +29,28 @@
@TableField(exist = false)
private String condition;
+ @TableField(exist = false)
+ private Map<String, Object> map;
+
+ public static BaseParam build(Map<String, Object> map) {
+ BaseParam param = new BaseParam();
+ if (null == map) {
+ return param;
+ }
+ if (null != map.get("current")) {
+ param.setCurrent(Integer.parseInt(String.valueOf(map.get("current"))));
+ map.remove("current");
+ }
+ if (null != map.get("pageSize")) {
+ param.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize"))));
+ map.remove("pageSize");
+ }
+ if (null != map.get("condition")) {
+ param.setCondition(String.valueOf(map.get("condition")));
+ map.remove("condition");
+ }
+ param.setMap(map);
+ return param;
+ }
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
index 4bbfd32..f03595c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java
@@ -1,8 +1,11 @@
package com.zy.asrs.wcs.sys.controller;
+import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.sys.entity.User;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.Map;
/**
* Created by vincent on 1/30/2024
@@ -29,4 +32,8 @@
return loginUser == null ? null : loginUser.getId();
}
+ public BaseParam getBaseParam(Map<String, Object> map) {
+ return BaseParam.build(map);
+ }
+
}
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 0aadef7..50fe5c6 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.Map;
/**
* Created by vincent on 2/13/2024
@@ -24,10 +25,18 @@
@Autowired
private RoleService roleService;
+// @PreAuthorize("hasAuthority('sys:role:list')")
+// @PostMapping("/role/page")
+// public R page(@RequestBody BaseParam param) {
+// PageParam<Role, BaseParam> page = new PageParam<>(param);
+// return R.ok().add(roleService.page(page, page.getWrapper()));
+// }
+
@PreAuthorize("hasAuthority('sys:role:list')")
@PostMapping("/role/page")
- public R page(@RequestBody BaseParam param) {
- PageParam<Role, BaseParam> page = new PageParam<>(param);
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = getBaseParam(map);
+ PageParam<Role, BaseParam> page = new PageParam<>(baseParam);
return R.ok().add(roleService.page(page, page.getWrapper()));
}
--
Gitblit v1.9.1