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/UserLoginController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 69960f1..d5a5587 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/userLogin/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<UserLogin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,8 +41,8 @@
return R.ok(userLoginService.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("<")) {
@@ -56,10 +56,10 @@
@RequestMapping(value = "/userLogin/edit/auth")
@ManagerAuth
public R edit(UserLogin userLogin) {
- if (Cools.isEmpty(userLogin)){
+ if (Cools.isEmpty(userLogin)) {
return R.error();
}
- if (null == userLogin.getId()){
+ if (null == userLogin.getId()) {
userLoginService.insert(userLogin);
} else {
userLoginService.updateById(userLogin);
@@ -74,10 +74,10 @@
return R.ok();
}
- @RequestMapping(value = "/userLogin/update/auth")
+ @RequestMapping(value = "/userLogin/update/auth")
@ManagerAuth
- public R update(UserLogin userLogin){
- if (Cools.isEmpty(userLogin) || null==userLogin.getId()){
+ public R update(UserLogin userLogin) {
+ if (Cools.isEmpty(userLogin) || null == userLogin.getId()) {
return R.error();
}
userLoginService.updateById(userLogin);
@@ -86,8 +86,8 @@
@RequestMapping(value = "/userLogin/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
userLoginService.deleteBatchIds(Arrays.asList(ids));
@@ -96,7 +96,7 @@
@RequestMapping(value = "/userLogin/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("userLogin"));
@@ -112,7 +112,7 @@
wrapper.like("token", condition);
Page<UserLogin> page = userLoginService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (UserLogin userLogin : page.getRecords()){
+ for (UserLogin userLogin : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", userLogin.getId());
map.put("value", userLogin.getToken());
--
Gitblit v1.9.1