From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/UserController.java | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/boying/controller/UserController.java b/src/main/java/com/boying/controller/UserController.java
index 59b6f2a..c741915 100644
--- a/src/main/java/com/boying/controller/UserController.java
+++ b/src/main/java/com/boying/controller/UserController.java
@@ -9,8 +9,6 @@
import com.boying.service.ParkService;
import com.boying.service.UserService;
import com.boying.util.LngLatUtil;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,14 +25,12 @@
@RestController
@RequestMapping("/ffzf/user")
@RequiredArgsConstructor
-@Tag(description = "ffzf/user" , name = "鐢ㄦ埛鎺ュ彛" )
public class UserController{
private final UserService userService;
private final ParkService parkService;
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(User user, Page page) {
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -43,14 +39,12 @@
}
@PostMapping("/findAll")
- @Operation(summary = "鏌ヨ鎵�鏈�" , description = "鏌ヨ鎵�鏈�" )
public Object findAll() {
return R.ok(userService.list());
}
@PostMapping("/save")
- @Operation(summary = "鏂板鐢ㄦ埛" , description = "鏂板鐢ㄦ埛" )
public Object save(User user) {
if(user.getId()==null){
user.setPassword(user.getLoginName());
@@ -60,14 +54,12 @@
}
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎鐢ㄦ埛" , description = "鍒犻櫎鐢ㄦ埛" )
public Object delete(Long id) {
userService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
}
@PostMapping("/login")
- @Operation(summary = "鐧诲綍" , description = "鐧诲綍" )
public Object login(String loginName,String password,String lng,String lat) {
if(StringUtils.isBlank(loginName)||StringUtils.isBlank(password)){
return R.failed("鐢ㄦ埛鍚嶅拰瀵嗙爜蹇呭～");
@@ -98,7 +90,6 @@
}
@PostMapping("updatePassword")
- @Operation(summary = "淇敼瀵嗙爜" , description = "淇敼瀵嗙爜" )
public Object updatePassword(Long userId,String oldPassword,String newPassword) {
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.lambda()
--
Gitblit v1.9.1