1.修复新增用户没有pushkey的问题

2.将重置pushkey改为修改pushkey

src/main/java/com/genersoft/iot/vmp/service/IUserService.java

@@ -25,5 +25,5 @@ public interface IUserService {
 
     PageInfo<User> getUsers(int page, int count);
 
-    int resetPushKey(int id);
+    int changePushKey(int id, String pushKey);
 }

src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java

@@ -75,7 +75,7 @@ public class UserServiceImpl implements IUserService {
     }
 
     @Override
-    public int resetPushKey(int id) {
-        return userMapper.resetPushKey(id);
+    public int changePushKey(int id, String pushKey) {
+        return userMapper.changePushKey(id,pushKey);
     }
 }

src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java

@@ -60,6 +60,6 @@ public interface UserMapper {
     @ResultMap(value="roleMap")
     List<User> getUsers();
 
-    @Delete("update user set pushKey=MD5(NOW()+#{id}) where id=#{id}")
-    int resetPushKey(int id);
+    @Update("update user set pushKey=#{pushKey} where id=#{id}")
+    int changePushKey(int id, String pushKey);
 }

src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java

@@ -124,7 +124,8 @@ public class UserController {
         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) {
@@ -138,6 +139,7 @@ public class UserController {
         user.setUpdateTime(DateUtil.getNow());
         int addResult = userService.addUser(user);
 
+
         result.setCode(addResult > 0 ? 0 : -1);
         result.setMsg(addResult > 0 ? "success" : "fail");
         result.setData(addResult);
@@ -196,12 +198,13 @@ public class UserController {
         return userService.getUsers(page, count);
     }
 
-    @ApiOperation("重置pushkey")
+    @ApiOperation("修改pushkey")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", required = true, value = "用户Id", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "userId", required = true, value = "用户Id", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "pushKey", required = true, value = "新的pushKey", dataTypeClass = String.class),
     })
-    @RequestMapping("/resetPushKey")
-    public ResponseEntity<WVPResult<String>> resetPushKey(@RequestParam Integer id) {
+    @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<>();
@@ -211,7 +214,7 @@ public class UserController {
             result.setMsg("用户无权限");
             return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
         }
-        int resetPushKeyResult = userService.resetPushKey(id);
+        int resetPushKeyResult = userService.changePushKey(userId,pushKey);
 
         result.setCode(resetPushKeyResult > 0 ? 0 : -1);
         result.setMsg(resetPushKeyResult > 0 ? "success" : "fail");