From 22441ad5a130b1802af2c5ebe5083e8297edb682 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:23:46 +0800
Subject: [PATCH] Merge pull request #643 from XiaoQiTong/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 200 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 167 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index 4fd7b96..6ebb756 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -1,69 +1,203 @@
package com.genersoft.iot.vmp.vmanager.user;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
+import com.genersoft.iot.vmp.service.IRoleService;
import com.genersoft.iot.vmp.service.IUserService;
+import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.util.DigestUtils;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.security.sasl.AuthenticationException;
+import java.util.List;
-@Api(tags = "鐢ㄦ埛绠＄悊")
+@Tag(name = "鐢ㄦ埛绠＄悊")
@CrossOrigin
@RestController
@RequestMapping("/api/user")
public class UserController {
@Autowired
- AuthenticationManager authenticationManager;
+ private AuthenticationManager authenticationManager;
@Autowired
- IUserService userService;
+ private IUserService userService;
- @ApiOperation("鐧诲綍")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", dataTypeClass = String.class),
- })
+ @Autowired
+ private IRoleService roleService;
+
@GetMapping("/login")
- public String login(String username, String password){
+ @PostMapping("/login")
+ @Operation(summary = "鐧诲綍")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "password", description = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", required = true)
+ public LoginUser login(@RequestParam String username, @RequestParam String password){
LoginUser user = null;
try {
user = SecurityUtils.login(username, password, authenticationManager);
} catch (AuthenticationException e) {
- e.printStackTrace();
- return "fail";
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- if (user != null) {
- return "success";
- }else {
- return "fail";
+ if (user == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
+ }
+ return user;
+ }
+
+ @PostMapping("/changePassword")
+ @Operation(summary = "淇敼瀵嗙爜")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "oldpassword", description = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ @Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ public void changePassword(@RequestParam String oldPassword, @RequestParam String password){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo== null) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ String username = userInfo.getUsername();
+ LoginUser user = null;
+ try {
+ user = SecurityUtils.login(username, oldPassword, authenticationManager);
+ if (user == null) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ int userId = SecurityUtils.getUserId();
+ boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
+ if (!result) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ } catch (AuthenticationException e) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
}
- @ApiOperation("淇敼瀵嗙爜")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
- })
- @PostMapping("/changePassword")
- public String changePassword(String password){
+
+ @PostMapping("/add")
+ @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+ @Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
+ @Parameter(name = "password", description = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ @Parameter(name = "roleId", description = "瑙掕壊ID", required = true)
+ public void add(@RequestParam String username,
+ @RequestParam String password,
+ @RequestParam Integer roleId){
+ if (ObjectUtils.isEmpty(username) || ObjectUtils.isEmpty(password) || roleId == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鍙傛暟涓嶅彲涓虹┖");
+ }
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- int userId = SecurityUtils.getUserId();
- boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
- if (result) {
- return "success";
- }else {
- return "fail";
+ int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
+ if (currenRoleId != 1) {
+ // 鍙敤瑙掕壊id涓�1鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鐢ㄦ埛鏃犳潈闄�");
+ }
+ User user = new User();
+ user.setUsername(username);
+ user.setPassword(DigestUtils.md5DigestAsHex(password.getBytes()));
+ //鏂板鐢ㄦ埛鐨刾ushKey鐨勭敓鎴愯鍒欎负md5(鏃堕棿鎴�+鐢ㄦ埛鍚�)
+ user.setPushKey(DigestUtils.md5DigestAsHex((System.currentTimeMillis()+password).getBytes()));
+ Role role = roleService.getRoleById(roleId);
+
+ if (role == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "瑙掕壊涓嶅瓨鍦�");
+ }
+ user.setRole(role);
+ user.setCreateTime(DateUtil.getNow());
+ user.setUpdateTime(DateUtil.getNow());
+ int addResult = userService.addUser(user);
+ if (addResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛")
+ @Parameter(name = "id", description = "鐢ㄦ埛Id", required = true)
+ public void delete(@RequestParam Integer id){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
+ if (currenRoleId != 1) {
+ // 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鐢ㄦ埛鏃犳潈闄�");
+ }
+ int deleteResult = userService.deleteUser(id);
+ if (deleteResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ }
+
+ @GetMapping("/all")
+ @Operation(summary = "鏌ヨ鐢ㄦ埛")
+ public List<User> all(){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ return userService.getAllUsers();
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ鐢ㄦ埛
+ *
+ * @param page 褰撳墠椤�
+ * @param count 姣忛〉鏌ヨ鏁伴噺
+ * @return 鍒嗛〉鐢ㄦ埛鍒楄〃
+ */
+ @GetMapping("/users")
+ @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Parameter(name = "page", description = "褰撳墠椤�", required = true)
+ @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
+ public PageInfo<User> users(int page, int count) {
+ return userService.getUsers(page, count);
+ }
+
+ @RequestMapping("/changePushKey")
+ @Operation(summary = "淇敼pushkey")
+ @Parameter(name = "userId", description = "鐢ㄦ埛Id", required = true)
+ @Parameter(name = "pushKey", description = "鏂扮殑pushKey", required = true)
+ public void changePushKey(@RequestParam Integer userId,@RequestParam String pushKey) {
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
+ WVPResult<String> result = new WVPResult<>();
+ if (currenRoleId != 1) {
+ // 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "鐢ㄦ埛鏃犳潈闄�");
+ }
+ int resetPushKeyResult = userService.changePushKey(userId,pushKey);
+ if (resetPushKeyResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ }
+
+ @PostMapping("/changePasswordForAdmin")
+ @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
+ @Parameter(name = "adminId", description = "绠＄悊鍛榠d", required = true)
+ @Parameter(name = "userId", description = "鐢ㄦ埛id", required = true)
+ @Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
+ public void changePasswordForAdmin(@RequestParam int userId, @RequestParam String password) {
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo == null) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
+ Role role = userInfo.getRole();
+ if (role != null && role.getId() == 1) {
+ boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
+ if (!result) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
}
}
--
Gitblit v1.8.0