From 979f2505861b77b8702604739486b62f1e339e76 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 07 十月 2025 08:44:11 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/system/controller/UserController.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 3367332..3a76d06 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Role;
import com.zy.system.entity.User;
@@ -24,6 +26,8 @@
private UserService userService;
@Autowired
private RoleService roleService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
@@ -63,26 +67,15 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- public static void main(String[] args) {
- String s = "2020-06-11 00:00:00 - 2020-07-15 00:00:00";
- if (s.contains(" - ")) {
- String[] split = s.split(" - ");
- for (String s1 : split) {
- System.out.println(s1);
- }
- }
- }
-
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (String.valueOf(entry.getValue()).contains(RANGE_TIME_LINK)){
- wrapper.ge(entry.getKey(), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -94,6 +87,8 @@
return R.error();
}
if (null == user.getId()){
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
} else {
userService.updateById(user);
@@ -104,6 +99,8 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
return R.ok();
}
@@ -130,11 +127,10 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ userService.deleteById(id);
}
- userService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@@ -152,14 +148,14 @@
@RequestMapping(value = "/userQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<User> wrapper = new EntityWrapper<>();
- wrapper.like("username", condition);
- Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.like("matnr", condition);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 100000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (Mat mat : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", user.getId());
- map.put("value", user.getUsername());
+ map.put("id", mat.getId());
+ map.put("value", mat.getMaktx());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1