From 1192312f85c2ae52ece1695602e2a971364d46cb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 19:28:42 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/BaseController.java | 11 +++++++++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java | 17 +++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/BaseParam.java | 14 ++++++--------
4 files changed, 33 insertions(+), 11 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 25769f8..9edf118 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
@@ -32,25 +32,23 @@
@TableField(exist = false)
private Map<String, Object> map;
- public static BaseParam build(Map<String, Object> map) {
- BaseParam param = new BaseParam();
+ public void syncMap(Map<String, Object> map) {
if (null == map) {
- return param;
+ return;
}
if (null != map.get("current")) {
- param.setCurrent(Integer.parseInt(String.valueOf(map.get("current"))));
+ this.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"))));
+ this.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize"))));
map.remove("pageSize");
}
if (null != map.get("condition")) {
- param.setCondition(String.valueOf(map.get("condition")));
+ this.setCondition(String.valueOf(map.get("condition")));
map.remove("condition");
}
- param.setMap(map);
- return param;
+ this.setMap(map);
}
}
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 f03595c..c81716a 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
@@ -32,8 +32,15 @@
return loginUser == null ? null : loginUser.getId();
}
- public BaseParam getBaseParam(Map<String, Object> map) {
- return BaseParam.build(map);
+ public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
+ T t = null;
+ try {
+ t = clz.getDeclaredConstructor().newInstance();
+ t.syncMap(map);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return t;
}
}
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 50fe5c6..9348f58 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
@@ -35,7 +35,7 @@
@PreAuthorize("hasAuthority('sys:role:list')")
@PostMapping("/role/page")
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = getBaseParam(map);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Role, BaseParam> page = new PageParam<>(baseParam);
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/RoleParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java
new file mode 100644
index 0000000..829d670
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/param/RoleParam.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.wcs.sys.controller.param;
+
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Created by vincent on 2/16/2024
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class RoleParam extends BaseParam {
+
+ private String name;
+
+
+}
--
Gitblit v1.9.1