From a59095db0c240987028d4d05ab561665ed8fe7ea Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期五, 29 七月 2022 15:16:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 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 152122d..442832b 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
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.storager.dao.dto.User;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -123,7 +124,8 @@
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) {
@@ -136,6 +138,7 @@
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");
@@ -177,4 +180,68 @@
result.setData(allUsers);
return new ResponseEntity<>(result, HttpStatus.OK);
}
+
+ /**
+ * 鍒嗛〉鏌ヨ鐢ㄦ埛
+ *
+ * @param page 褰撳墠椤�
+ * @param count 姣忛〉鏌ヨ鏁伴噺
+ * @return 鍒嗛〉鐢ㄦ埛鍒楄〃
+ */
+ @ApiOperation("鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
+ })
+ @GetMapping("/users")
+ public PageInfo<User> users(int page, int count) {
+ return userService.getUsers(page, count);
+ }
+
+ @ApiOperation("淇敼pushkey")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "userId", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "pushKey", required = true, value = "鏂扮殑pushKey", dataTypeClass = String.class),
+ })
+ @RequestMapping("/changePushKey")
+ public ResponseEntity<WVPResult<String>> 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);
+ }
+ int resetPushKeyResult = userService.changePushKey(userId,pushKey);
+
+ result.setCode(resetPushKeyResult > 0 ? 0 : -1);
+ result.setMsg(resetPushKeyResult > 0 ? "success" : "fail");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
+ @ApiOperation("绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "adminId", required = true, value = "绠＄悊鍛榠d", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "userId", required = true, value = "鐢ㄦ埛id", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", required = true, value = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ })
+ @PostMapping("/changePasswordForAdmin")
+ public String changePasswordForAdmin(@RequestParam int userId, @RequestParam String password) {
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo == null) {
+ return "fail";
+ }
+ Role role = userInfo.getRole();
+ if (role != null && role.getId() == 1) {
+ boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
+ if (result) {
+ return "success";
+ }
+ }
+
+ return "fail";
+ }
}
--
Gitblit v1.8.0