From 48e1a3658117ebda9270d87092cfb0d31a634b92 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 21 七月 2022 15:07:00 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/example/jz/controller/UserController.java | 70 ++++++++--------------------------
1 files changed, 17 insertions(+), 53 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..6b2c106 100644
--- a/src/main/java/com/example/jz/controller/UserController.java
+++ b/src/main/java/com/example/jz/controller/UserController.java
@@ -3,16 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.entity.User;
import com.example.jz.service.UserService;
-import com.example.jz.utils.Md5Utils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -22,19 +15,17 @@
/**
* 鐢ㄦ埛琛�(User)琛ㄦ帶鍒跺眰
*
- * @author 瀹夌懢鐒�
+ * @author makejava
* @since 2022-07-11 16:35:57
*/
@RestController
@RequestMapping("user")
-@Api(tags = "鐢ㄦ埛绠＄悊")
public class UserController extends ApiController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
private UserService userService;
-
- @Autowired
- public void setUserService(UserService userService) {
- this.userService = userService;
- }
/**
* 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
@@ -44,7 +35,6 @@
* @return 鎵�鏈夋暟鎹�
*/
@GetMapping
- @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�")
public R selectAll(Page<User> page, User user) {
return success(this.userService.page(page, new QueryWrapper<>(user)));
}
@@ -56,9 +46,19 @@
* @return 鍗曟潯鏁版嵁
*/
@GetMapping("{id}")
- @ApiOperation("閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁")
public R selectOne(@PathVariable Serializable id) {
return success(this.userService.getById(id));
+ }
+
+ /**
+ * 鏂板鏁版嵁
+ *
+ * @param user 瀹炰綋瀵硅薄
+ * @return 鏂板缁撴灉
+ */
+ @PostMapping
+ public R insert(@RequestBody User user) {
+ return success(this.userService.save(user));
}
/**
@@ -68,9 +68,8 @@
* @return 淇敼缁撴灉
*/
@PutMapping
- @ApiOperation("淇敼鐢ㄦ埛鏁版嵁")
public R update(@RequestBody User user) {
- return success(userService.updateById(user));
+ return success(this.userService.updateById(user));
}
/**
@@ -80,42 +79,7 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping
- @ApiOperation("鍒犻櫎鐢ㄦ埛鏁版嵁")
public R delete(@RequestParam("idList") List<Long> idList) {
return success(this.userService.removeByIds(idList));
- }
-
- /**
- * 娣诲姞绠＄悊鍛�
- *
- * @param id 鐢ㄦ埛id
- * @param username 绠＄悊鍛樼敤鎴峰悕
- * @param password 绠＄悊鍛樺瘑鐮�
- * @return
- */
- @PostMapping("/addAdmin/{id}")
- @ApiOperation("娣诲姞绠＄悊鍛�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "password", value = "瀵嗙爜", required = true, dataType = "String"),
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", required = true, dataType = "String")
- })
- 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));
- }
-
- /**
- * 閲嶇疆绠＄悊鍛樺瘑鐮�
- *
- * @param id 鐢ㄦ埛id
- * @return
- */
- @GetMapping("/resetPassword/{id}")
- @ApiOperation("閲嶇疆绠＄悊鍛樺瘑鐮�")
- public R resetPassword(@PathVariable Serializable id) {
- User user = userService.getById(id);
- // 閲嶇疆鍒濆瀵嗙爜涓鸿韩浠借瘉鍚庡叚浣�
- user.setLoginPassword(Md5Utils.md5(user.getUserIdcard().substring(user.getUserIdcard().length() - 6)));
- return success(userService.updateById(user));
}
}
--
Gitblit v1.8.0