From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/system/controller/RoleController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..f3b19a6 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/role/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -61,8 +61,8 @@
return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else if (entry.getKey().endsWith("<")) {
@@ -76,10 +76,10 @@
@RequestMapping(value = "/role/edit/auth")
@ManagerAuth(memo = "瑙掕壊缂栬緫")
public R edit(Role role) {
- if (Cools.isEmpty(role)){
+ if (Cools.isEmpty(role)) {
return R.error();
}
- if (null == role.getId()){
+ if (null == role.getId()) {
roleService.insert(role);
} else {
roleService.updateById(role);
@@ -94,10 +94,10 @@
return R.ok();
}
- @RequestMapping(value = "/role/update/auth")
+ @RequestMapping(value = "/role/update/auth")
@ManagerAuth(memo = "瑙掕壊淇敼")
- public R update(Role role){
- if (Cools.isEmpty(role) || null==role.getId()){
+ public R update(Role role) {
+ if (Cools.isEmpty(role) || null == role.getId()) {
return R.error();
}
roleService.updateById(role);
@@ -106,8 +106,8 @@
@RequestMapping(value = "/role/delete/auth")
@ManagerAuth(memo = "瑙掕壊鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
roleService.deleteBatchIds(Arrays.asList(ids));
@@ -116,7 +116,7 @@
@RequestMapping(value = "/role/export/auth")
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
@@ -151,7 +151,7 @@
Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Role role : page.getRecords()){
+ for (Role role : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", role.getId());
map.put("value", role.getName());
--
Gitblit v1.9.1