From d60406e8f251a7c8343825403f5fd71de1680975 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 08 八月 2022 13:31:48 +0800
Subject: [PATCH] bug解决
---
src/main/java/com/example/jz/controller/UserController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java
index 20d0031..eb3c7ec 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -1,10 +1,10 @@
package com.example.jz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.api.ApiController;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.example.jz.modle.R;
import com.example.jz.modle.entity.User;
import com.example.jz.service.UserService;
import com.example.jz.utils.Md5Utils;
@@ -15,8 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
/**
@@ -46,7 +46,11 @@
@GetMapping
@ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
public R selectAll(Page<User> page, User user) {
- return success(this.userService.page(page, new QueryWrapper<>(user)));
+ return R.ok(this.userService.page(page, new QueryWrapper<User>()
+ .like(StringUtils.isNotBlank(user.getNickName()),"nick_name",user.getNickName())
+ .or()
+ .like(StringUtils.isNotBlank(user.getRealName()),"real_name",user.getRealName())
+ .orderByDesc("ctime")));
}
/**
@@ -58,7 +62,7 @@
@GetMapping("{id}")
@ApiOperation("閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁")
public R selectOne(@PathVariable Serializable id) {
- return success(this.userService.getById(id));
+ return R.ok(this.userService.getById(id));
}
/**
@@ -70,7 +74,7 @@
@PutMapping
@ApiOperation("淇敼鐢ㄦ埛鏁版嵁")
public R update(@RequestBody User user) {
- return success(userService.updateById(user));
+ return R.ok(userService.updateById(user));
}
/**
@@ -81,8 +85,8 @@
*/
@DeleteMapping
@ApiOperation("鍒犻櫎鐢ㄦ埛鏁版嵁")
- public R delete(@RequestParam("idList") List<Long> idList) {
- return success(this.userService.removeByIds(idList));
+ public R delete(@RequestParam("id") Integer id) {
+ return R.ok(this.userService.removeById(id));
}
/**
@@ -101,8 +105,16 @@
})
public R addAdmin(@PathVariable Serializable id, String username, String password) {
User user = userService.getById(id).setLoginUsername(username).setLoginPassword(Md5Utils.md5(password)).setRole(1);
- return success(userService.updateById(user));
+ return R.ok(userService.updateById(user));
}
+
+ @PostMapping("/add")
+ @ApiOperation("娣诲姞")
+ public R add(@RequestBody User user) {
+ user.setCtime(new Date());
+ return R.ok(userService.save(user));
+ }
+
/**
* 閲嶇疆绠＄悊鍛樺瘑鐮�
@@ -116,6 +128,6 @@
User user = userService.getById(id);
// 閲嶇疆鍒濆瀵嗙爜涓鸿韩浠借瘉鍚庡叚浣�
user.setLoginPassword(Md5Utils.md5(user.getUserIdcard().substring(user.getUserIdcard().length() - 6)));
- return success(userService.updateById(user));
+ return R.ok(userService.updateById(user));
}
}
--
Gitblit v1.8.0