From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 205 ++++++++++++++++++++++++++++-----------------------
1 files changed, 113 insertions(+), 92 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 17fe2fb..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,29 +1,33 @@
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 com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+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.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.text.SimpleDateFormat;
import java.util.List;
-@Api(tags = "用户管理")
+@Tag(name = "用户管理")
@CrossOrigin
@RestController
@RequestMapping("/api/user")
@@ -38,145 +42,162 @@
@Autowired
private IRoleService roleService;
- private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @ApiOperation("登录")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "用户名", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "密码（32位md5加密）", dataTypeClass = String.class),
- })
@GetMapping("/login")
- public WVPResult<LoginUser> login(@RequestParam String username, @RequestParam String password){
+ @PostMapping("/login")
+ @Operation(summary = "登录")
+ @Parameter(name = "username", description = "用户名", required = true)
+ @Parameter(name = "password", description = "密码（32位md5加密）", required = true)
+ public LoginUser login(@RequestParam String username, @RequestParam String password){
LoginUser user = null;
- WVPResult<LoginUser> result = new WVPResult<>();
try {
user = SecurityUtils.login(username, password, authenticationManager);
} catch (AuthenticationException e) {
- e.printStackTrace();
- result.setCode(-1);
- result.setMsg("fail");
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- if (user != null) {
- result.setCode(0);
- result.setMsg("success");
- result.setData(user);
- }else {
- result.setCode(-1);
- result.setMsg("fail");
+ if (user == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "用户名或密码错误");
}
- return result;
+ return user;
}
- @ApiOperation("修改密码")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "用户名", dataTypeClass = String.class),
- @ApiImplicitParam(name = "oldpassword", required = true, value = "旧密码（已md5加密的密码）", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "新密码（未md5加密的密码）", dataTypeClass = String.class),
- })
@PostMapping("/changePassword")
- public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
+ @Operation(summary = "修改密码")
+ @Parameter(name = "username", description = "用户名", required = true)
+ @Parameter(name = "oldpassword", description = "旧密码（已md5加密的密码）", required = true)
+ @Parameter(name = "password", description = "新密码（未md5加密的密码）", required = true)
+ public void changePassword(@RequestParam String oldPassword, @RequestParam String password){
// 获取当前登录用户id
LoginUser userInfo = SecurityUtils.getUserInfo();
if (userInfo== null) {
- return "fail";
+ throw new ControllerException(ErrorCode.ERROR100);
}
String username = userInfo.getUsername();
LoginUser user = null;
try {
user = SecurityUtils.login(username, oldPassword, authenticationManager);
- if (user != null) {
- int userId = SecurityUtils.getUserId();
- boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
- if (result) {
- return "success";
- }
+ 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) {
- e.printStackTrace();
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
}
- return "fail";
}
- @ApiOperation("添加用户")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "username", required = true, value = "用户名", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", required = true, value = "密码（未md5加密的密码）", dataTypeClass = String.class),
- @ApiImplicitParam(name = "roleId", required = true, value = "角色ID", dataTypeClass = String.class),
- })
@PostMapping("/add")
- public ResponseEntity<WVPResult<Integer>> add(@RequestParam String username,
+ @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){
- WVPResult<Integer> result = new WVPResult<>();
- if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password) || roleId == null) {
- result.setCode(-1);
- result.setMsg("参数不可为空");
- return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
+ if (ObjectUtils.isEmpty(username) || ObjectUtils.isEmpty(password) || roleId == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "参数不可为空");
}
// 获取当前登录用户id
int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
if (currenRoleId != 1) {
// 只用角色id为1才可以删除和添加用户
- result.setCode(-1);
- result.setMsg("用户无权限");
- return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "用户无权限");
}
User user = new User();
user.setUsername(username);
user.setPassword(DigestUtils.md5DigestAsHex(password.getBytes()));
-
+ //新增用户的pushKey的生成规则为md5(时间戳+用户名)
+ user.setPushKey(DigestUtils.md5DigestAsHex((System.currentTimeMillis()+password).getBytes()));
Role role = roleService.getRoleById(roleId);
if (role == null) {
- result.setCode(-1);
- result.setMsg("roleId is not found");
- // 角色不存在
- return new ResponseEntity<>(result, HttpStatus.OK);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "角色不存在");
}
user.setRole(role);
- user.setCreateTime(format.format(System.currentTimeMillis()));
- user.setUpdateTime(format.format(System.currentTimeMillis()));
+ user.setCreateTime(DateUtil.getNow());
+ user.setUpdateTime(DateUtil.getNow());
int addResult = userService.addUser(user);
-
- result.setCode(addResult > 0 ? 0 : -1);
- result.setMsg(addResult > 0 ? "success" : "fail");
- result.setData(addResult);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ if (addResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
- @ApiOperation("删除用户")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", required = true, value = "用户Id", dataTypeClass = Integer.class),
- })
@DeleteMapping("/delete")
- public ResponseEntity<WVPResult<String>> delete(@RequestParam Integer id){
+ @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才可以删除和添加用户
- result.setCode(-1);
- result.setMsg("用户无权限");
- return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "用户无权限");
}
- int deleteResult = userService.deleteUser(id);
-
- result.setCode(deleteResult>0? 0 : -1);
- result.setMsg(deleteResult>0? "success" : "fail");
- return new ResponseEntity<>(result, HttpStatus.OK);
+ int resetPushKeyResult = userService.changePushKey(userId,pushKey);
+ if (resetPushKeyResult <= 0) {
+ throw new ControllerException(ErrorCode.ERROR100);
+ }
}
- @ApiOperation("查询用户")
- @ApiImplicitParams({})
- @GetMapping("/all")
- public ResponseEntity<WVPResult<List<User>>> all(){
+ @PostMapping("/changePasswordForAdmin")
+ @Operation(summary = "管理员修改普通用户密码")
+ @Parameter(name = "adminId", description = "管理员id", required = true)
+ @Parameter(name = "userId", description = "用户id", required = true)
+ @Parameter(name = "password", description = "新密码（未md5加密的密码）", required = true)
+ public void changePasswordForAdmin(@RequestParam int userId, @RequestParam String password) {
// 获取当前登录用户id
- List<User> allUsers = userService.getAllUsers();
- WVPResult<List<User>> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- result.setData(allUsers);
- return new ResponseEntity<>(result, HttpStatus.OK);
+ 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.9.3