Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -93,10 +93,10 @@ public class TUserController extends BaseController {
         }
         if (StringUtils.isNotBlank(type)) {
             user.setType(type);
-            if (user1.getRoleList().size()>0&&!user1.getRoleList().contains("1")) {
+            if (user1.getRoleList().size() > 0 && !user1.getRoleList().contains("1")) {
                 //设置用户数据权限
                 user.setOrgCode(user1.getOrgCode());
-                if (user1.getRoleList().contains("3")){
+                if (user1.getRoleList().contains("3")) {
                     user.setOrgCode(null);
                 }
             }
@@ -141,7 +141,7 @@ public class TUserController extends BaseController {
         try {
             if (StringUtils.isNotBlank(type)) {
                 user.setType(type);
-                if (user1.getRoleList().size()>0&&!user1.getRoleList().contains("1")) {
+                if (user1.getRoleList().size() > 0 && !user1.getRoleList().contains("1")) {
                     //设置用户数据权限
                     user.setOrgCode(user1.getOrgCode());
                 }
@@ -172,7 +172,7 @@ public class TUserController extends BaseController {
         try {
             TUser tUser = userService.selectById(id);
             List<Role> list = roleService.selectRoleByUserId(id);
-            if (list != null && list.size()>0&&list.get(0) != null) {
+            if (list != null && list.size() > 0 && list.get(0) != null) {
                 List<String> list1 = new ArrayList<>();
                 list.forEach(r -> list1.add(r.getId()));
                 tUser.setRoleList(list1);
@@ -337,7 +337,7 @@ public class TUserController extends BaseController {
                     ew.eq("org_id", user.getOrgId());
                     List<TUser> list = userService.list(ew);
                     TUser tUser = userService.getById(user.getId());
-                    if (list.size() >= 3&&!tUser.getOrgId().equals(user.getOrgId())) {
+                    if (list.size() >= 3 && !tUser.getOrgId().equals(user.getOrgId())) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在三个单位管理员！");
                         return resultMap;
@@ -398,13 +398,13 @@ public class TUserController extends BaseController {
     @DeleteMapping(value = "/delete")
     @RequiresAuthentication  //@RequiresPermissions("/user/delete")
     @MethodLog(operModule = OperModule.USER, operType = OperType.DELETE)
-    public ResponseEntity<Map<String, Object>> delete(String userId) {
+    public Map<String, Object> delete(String userId) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if ("1".equals(userId)) {
                 resultMap.put("status", "400");
                 resultMap.put("message", "该账号不能被删除");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
             TUser entity = new TUser();
             entity.setId(userId);
@@ -419,15 +419,15 @@ public class TUserController extends BaseController {
             if (!ret1 || !ret2) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "删除失败");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "删除成功");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             logger.error("删除用户出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
     @OperationLog("禁用成员")
@@ -435,7 +435,7 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/disable", method = RequestMethod.PUT)
     @RequiresAuthentication  //@RequiresPermissions("/user/disable")
     @MethodLog(operModule = OperModule.USER, operType = OperType.DISABLE)
-    public ResponseEntity<Map<String, Object>> disableTUser(String userId) {
+    public Map<String, Object> disableTUser(String userId) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             TUser entity = new TUser();
@@ -470,15 +470,15 @@ public class TUserController extends BaseController {
             if (!ret) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "禁用失败");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "禁用成功");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             logger.error("禁用用户出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 //
 //    @PutMapping("/updateAuditStatus")
@@ -515,7 +515,7 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/enable", method = RequestMethod.PUT)
     @RequiresAuthentication  //@RequiresPermissions("/user/enable")
     @MethodLog(operModule = OperModule.USER, operType = OperType.ENABLE)
-    public ResponseEntity<Map<String, Object>> enableUser(String userId) {
+    public Map<String, Object> enableUser(String userId) {
         try {
             Map<String, Object> map = new HashMap<>();
 
@@ -528,15 +528,15 @@ public class TUserController extends BaseController {
             if (!ret) {
                 map.put("resultCode", "500");
                 map.put("message", "服务器错误");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(map);
+                return map;
             }
             map.put("resultCode", "200");
             map.put("message", "启用成功");
-            return ResponseEntity.ok(map);
+            return map;
         } catch (Exception e) {
             logger.error("用户启用出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
     @OperationLog("修改密码")
@@ -544,13 +544,17 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/editPwd", method = RequestMethod.PUT)
     @RequiresAuthentication  //@RequiresAuthentication  //@RequiresPermissions("/user/editPwd")
     @MethodLog(operModule = OperModule.CHANGEPWD, operType = OperType.CHANGE_PASSWORD)
-    public ResponseEntity<Map<String, Object>> editPwd(@RequestParam(value = "oldPassWord") String oldPassWord,
-                                                       @RequestParam(value = "password") String password) {
+    public Map<String, Object> editPwd(@RequestParam(value = "oldPassWord") String oldPassWord,
+                                       @RequestParam(value = "password") String password) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             boolean ret = false;
             TUser user = this.userService.getById(this.getUserId());
             byte[] salt = user.getPasswordSalt();
+            if (StringUtils.isBlank(password.trim())) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "旧密码不正确");
+            }
             if (new String(SHA256PasswordEncryptionService.createPasswordHash(oldPassWord, salt))
                     .equals(new String(user.getPasswordHash()))) {
                 salt = SecureRandomSaltService.generateSalt();
@@ -563,24 +567,24 @@ public class TUserController extends BaseController {
                 logger.error("旧密码不正确");
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "旧密码不正确");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
             if (!ret) {
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "修改失败");
                 // 更新失败, 500
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "修改成功");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             logger.error("更新密码错误！", e);
         }
         // 500
         resultMap.put("resultCode", "500");
         resultMap.put("message", "修改失败");
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return resultMap;
     }
 
     @OperationLog("重置密码")
@@ -588,9 +592,9 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/resetPassword", method = RequestMethod.PUT)
     @RequiresAuthentication//@RequiresPermissions("/user/resetPassword")
     @MethodLog(operModule = OperModule.USER, operType = OperType.RESET_PASSWORD)
-    public ResponseEntity<Map<Object, Object>> resetPassword(String userId) {
+    public Map<String, Object> resetPassword(String userId) {
         try {
-            Map<Object, Object> map = new LinkedHashMap<>();
+            Map<String, Object> map = new LinkedHashMap<>();
             TUser user = new TUser();
             user.setId(userId);
             String newPassword = "123456";
@@ -602,17 +606,17 @@ public class TUserController extends BaseController {
             user.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             boolean ret = userService.updateById(user);
             if (!ret) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+                return getFailResult();
             }
             stringRedisTemplate.delete(SHIRO_IS_LOCK + userService.getById(userId).getUserName());
             map.put("resultCode", "200");
             map.put("message", "重置密码成功");
             map.put("data", newPassword);
-            return ResponseEntity.ok(map);
+            return map;
         } catch (Exception e) {
             logger.error("重置密码出错!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        return getFailResult();
     }
 
     @OperationLog("新增机顶盒账号")
@@ -620,13 +624,13 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/boxAdd", method = RequestMethod.POST)
     @RequiresAuthentication  //@RequiresPermissions("/user/boxAdd")
     @MethodLog(operModule = OperModule.STBBASE, operType = OperType.ADD)
-    public ResponseEntity<Map<String, Object>> BoxAdd(TUser user) {
+    public Map<String, Object> BoxAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             if (StringUtils.isBlank(user.getUserName())) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "账号不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             } else {
                 user.setUserName(StringUtils.trimToNull(user.getUserName()));
             }
@@ -642,7 +646,7 @@ public class TUserController extends BaseController {
                 if (one != null) {
                     resultMap.put("resultCode", "400");
                     resultMap.put("message", "账号已存在！");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                    return resultMap;
                 }
             }
 
@@ -655,7 +659,7 @@ public class TUserController extends BaseController {
                 if (list != null && list.size() > 1 && list.get(0) != null) {
                     resultMap.put("resultCode", "400");
                     resultMap.put("message", "该单位机顶盒账号已存在！");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                    return resultMap;
                 }
             }
             TOrgan byId = organService.getById(user.getOrgId());
@@ -679,20 +683,19 @@ public class TUserController extends BaseController {
                 // 新增失败, 500
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "服务器忙");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "添加成功");
             resultMap.put("data", user.getPassword());
             // 201
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             resultMap.put("resultCode", "500");
             resultMap.put("message", "服务器忙");
             logger.error("新增成员错误!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return resultMap;
     }
 
     @OperationLog("新增运维账号")
@@ -700,13 +703,13 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/operationAdd", method = RequestMethod.POST)
     @RequiresAuthentication   //@RequiresPermissions("/user/operationAdd")
     @MethodLog(operModule = OperModule.STBACCOUNT, operType = OperType.ADD)
-    public ResponseEntity<Map<String, Object>> operationAdd(TUser user) {
+    public Map<String, Object> operationAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             if (StringUtils.isBlank(user.getUserName())) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "账号不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             } else {
                 user.setUserName(StringUtils.trimToNull(user.getUserName()));
             }
@@ -722,7 +725,7 @@ public class TUserController extends BaseController {
                 if (one != null) {
                     resultMap.put("resultCode", "500");
                     resultMap.put("message", "账号已存在！");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                    return resultMap;
                 }
             }
 
@@ -750,20 +753,19 @@ public class TUserController extends BaseController {
                 // 新增失败, 500
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "服务器忙");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "添加成功");
             resultMap.put("data", user.getPassword());
             // 201
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             resultMap.put("resultCode", "500");
             resultMap.put("message", "服务器忙");
             logger.error("新增成员错误!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return resultMap;
     }
 
     @OperationLog("新增统计账号")
@@ -771,13 +773,13 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/statisticsAdd", method = RequestMethod.POST)
     @RequiresAuthentication  //@RequiresPermissions("/user/statisticsAdd")
     @MethodLog(operModule = OperModule.STATISTICALUSER, operType = OperType.ADD)
-    public ResponseEntity<Map<String, Object>> statisticsAdd(TUser user) {
+    public Map<String, Object> statisticsAdd(TUser user) {
         Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
         try {
             if (StringUtils.isBlank(user.getUserName())) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "账号不能为空！");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             } else {
                 user.setUserName(StringUtils.trimToNull(user.getUserName()));
             }
@@ -793,7 +795,7 @@ public class TUserController extends BaseController {
                 if (one != null) {
                     resultMap.put("resultCode", "400");
                     resultMap.put("message", "账号已存在！");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                    return resultMap;
                 }
             }
 
@@ -822,20 +824,19 @@ public class TUserController extends BaseController {
                 // 新增失败, 500
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "服务器忙");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(resultMap);
+                return resultMap;
             }
             resultMap.put("resultCode", "200");
             resultMap.put("message", "添加成功");
             resultMap.put("data", user.getPassword());
             // 201
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             resultMap.put("resultCode", "500");
             resultMap.put("message", "服务器忙");
             logger.error("新增成员错误!", e);
         }
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+        return resultMap;
     }
 
     @OperationLog("修改成员信息")