From 0eba7c40c34d92c93448f39793726e02b0e3cd12 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 十二月 2021 08:56:42 +0800
Subject: [PATCH] 修复录像下载
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 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 de40c2c..17fe2fb 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
@@ -2,7 +2,9 @@
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.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
@@ -14,12 +16,11 @@
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.security.sasl.AuthenticationException;
-import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
@Api(tags = "鐢ㄦ埛绠＄悊")
@@ -34,6 +35,9 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private IRoleService roleService;
+
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ApiOperation("鐧诲綍")
@@ -42,19 +46,25 @@
@ApiImplicitParam(name = "password", required = true, value = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", dataTypeClass = String.class),
})
@GetMapping("/login")
- public String login(@RequestParam String username, @RequestParam String password){
- LoginUser user;
+ public WVPResult<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();
- return "fail";
+ result.setCode(-1);
+ result.setMsg("fail");
}
if (user != null) {
- return "success";
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(user);
}else {
- return "fail";
+ result.setCode(-1);
+ result.setMsg("fail");
}
+ return result;
}
@ApiOperation("淇敼瀵嗙爜")
@@ -66,7 +76,11 @@
@PostMapping("/changePassword")
public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- String username = SecurityUtils.getUserInfo().getUsername();
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo== null) {
+ return "fail";
+ }
+ String username = userInfo.getUsername();
LoginUser user = null;
try {
user = SecurityUtils.login(username, oldPassword, authenticationManager);
@@ -93,21 +107,38 @@
@PostMapping("/add")
public ResponseEntity<WVPResult<Integer>> add(@RequestParam String username,
@RequestParam String password,
- @RequestParam int roleId){
+ @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);
+ }
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- int currenRoleId = SecurityUtils.getUserInfo().getRoleId();
- if (currenRoleId != 0) {
- // 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
- return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);
+ int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
+ if (currenRoleId != 1) {
+ // 鍙敤瑙掕壊id涓�1鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ result.setCode(-1);
+ result.setMsg("鐢ㄦ埛鏃犳潈闄�");
+ return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
}
User user = new User();
user.setUsername(username);
user.setPassword(DigestUtils.md5DigestAsHex(password.getBytes()));
- user.setRoleId(roleId);
+
+ Role role = roleService.getRoleById(roleId);
+
+ if (role == null) {
+ result.setCode(-1);
+ result.setMsg("roleId is not found");
+ // 瑙掕壊涓嶅瓨鍦�
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ user.setRole(role);
user.setCreateTime(format.format(System.currentTimeMillis()));
user.setUpdateTime(format.format(System.currentTimeMillis()));
int addResult = userService.addUser(user);
- WVPResult<Integer> result = new WVPResult<>();
+
result.setCode(addResult > 0 ? 0 : -1);
result.setMsg(addResult > 0 ? "success" : "fail");
result.setData(addResult);
@@ -121,13 +152,16 @@
@DeleteMapping("/delete")
public ResponseEntity<WVPResult<String>> delete(@RequestParam Integer id){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- int currenRoleId = SecurityUtils.getUserInfo().getRoleId();
- if (currenRoleId != 0) {
+ int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
+ WVPResult<String> result = new WVPResult<>();
+ if (currenRoleId != 1) {
// 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
- return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);
+ result.setCode(-1);
+ result.setMsg("鐢ㄦ埛鏃犳潈闄�");
+ return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
}
int deleteResult = userService.deleteUser(id);
- WVPResult<String> result = new WVPResult<>();
+
result.setCode(deleteResult>0? 0 : -1);
result.setMsg(deleteResult>0? "success" : "fail");
return new ResponseEntity<>(result, HttpStatus.OK);
--
Gitblit v1.8.0