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

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

@@ -128,7 +128,7 @@ public class ChinaMobileRestApiController extends BaseController {
                     jsonObject.put("key", tBoxOperation.getPrivateKey());
                     return getResult(jsonObject);
                 } else {
-                    return getFailResult("500", "您无权获取本单位机顶盒密钥");
+                    return getFailResult("400", "您无权获取本单位机顶盒密钥");
                 }
             }
             return getFailResult("500", "未查询到相关机顶盒信息");
@@ -182,7 +182,7 @@ public class ChinaMobileRestApiController extends BaseController {
                 }
                 TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId()));
                 if (operation == null || "".equals(operation.getMac())) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "用户未激活！");
                     return resultMap;
                 }
@@ -248,7 +248,7 @@ public class ChinaMobileRestApiController extends BaseController {
             TOrgan organ = organService.getById(user.getOrgId());
 
             if (null == user) {
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "用户不存在");
                 resultMap.put("data", "");
                 return resultMap;

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

@@ -140,14 +140,14 @@ public class LoginController extends BaseController {
                 }
 
                 if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "此帐号已禁用，请联系管理员！");
                     return resultMap;
                 }
 
                 if (user.getPermanent() != null && !user.getPermanent()) {
                     if (user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate().isBefore(LocalDate.now())) {
-                        resultMap.put("resultCode", "500");
+                        resultMap.put("resultCode", "4F00");
                         resultMap.put("message", "此帐号已失效，请联系管理员！");
                         return resultMap;
                     }

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

@@ -128,7 +128,7 @@ public class TBoxOperationController extends BaseController {
             if (2==tBoxOperation.getStatus()) {
                 TBoxOperation byId = tBoxOperationService.getById(tBoxOperation.getId());
                 if (byId.getMac()!=null&&!"".equals(byId.getMac())&&!byId.getMac().equals(tBoxOperation.getMac())){
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "此账号已绑定机顶盒！");
                     return resultMap;
                 }
@@ -137,7 +137,7 @@ public class TBoxOperationController extends BaseController {
                 TBoxOperation one = tBoxOperationService.getOne(wrapper);
                 if (one!=null&&!one.getOrganId().equals(tBoxOperation.getOrganId())){
                     TUser u = userService.getOne(new UpdateWrapper<TUser>().eq("org_id", one.getOrganId()).eq("type", 3).eq("is_deleted", false));
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "此mac地址已绑定"+u.getUserName()+"账号！");
                     return resultMap;
                 }

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

@@ -80,24 +80,24 @@ public class TInteractionController extends BaseController {
             }
             TUser user = userService.selectByUsername(tInteraction.getName());
             if (user == null) {
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "用户名错误");
                 return resultMap;
             }
             if (!"2".equals(user.getType())) {
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "用户不是单位管理员");
                 return resultMap;
             }
             if (user.getOrgId()!=null&&!user.getOrgId().equals(tInteraction.getOrganId())){
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "管理员账号不是本机构的单位管理员");
                 return resultMap;
             }
             byte[] salt = user.getPasswordSalt();
             if (!new String(SHA256PasswordEncryptionService.createPasswordHash(tInteraction.getPassword(), salt))
                     .equals(new String(user.getPasswordHash()))) {
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "密码错误");
                 return resultMap;
             }

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

@@ -54,26 +54,30 @@ public class TOrganController extends BaseController {
     @ApiOperation(value = "添加机构", notes = "添加机构")
     @MethodLog(operModule = OperModule.ORG, operType = OperType.ADD)
     public Map<String, Object> add(TOrgan organ) {
+        HashMap<String, Object> resultMap = new HashMap<>();
         QueryWrapper<TOrgan> ew = new QueryWrapper<>();
-        if (StringUtils.isNoneBlank(organ.getName())) {
+        if (StringUtils.isNoneBlank(organ.getName().trim())) {
             organ.setName(organ.getName().trim());
             ew.eq("is_deleted", 0);
             ew.eq("name", organ.getName());
             List<TOrgan> list = this.tOrganService.list(ew);
             if (list != null && list.size() > 0 && list.get(0) != null) {
-                HashMap<String, Object> resultMap = new HashMap<>();
-                resultMap.put("resultCode", "500");
+                resultMap.put("resultCode", "400");
                 resultMap.put("message", "机构名称不能重复！");
                 return resultMap;
             }
+        }else {
+            resultMap.put("resultCode", "400");
+            resultMap.put("message", "机构名称不能为空！");
+            return resultMap;
+
         }
         organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         organ.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         String organCode = getOrganCode(organ.getParentId());
         organ.setLevel(organCode.length() / 3);
         if (organ.getLevel() > 3) {
-            HashMap<String, Object> resultMap = new HashMap<>();
-            resultMap.put("resultCode", "500");
+            resultMap.put("resultCode", "400");
             resultMap.put("message", "不能添加4级机构！");
             return resultMap;
         }
@@ -95,6 +99,13 @@ public class TOrganController extends BaseController {
     @MethodLog(operModule = OperModule.ORG, operType = OperType.UPDATE)
     public Map<String, Object> updateTOrgan(TOrgan tOrgan) {
         try {
+            if (StringUtils.isBlank(tOrgan.getName().trim())) {
+                HashMap<String, Object> resultMap = new HashMap<>();
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "机构名称不能为空！");
+                return resultMap;
+
+            }
             TOrgan byId = tOrganService.selectById(tOrgan.getId());
             if (StringUtils.isNotBlank(tOrgan.getParentId())) {
                 if (!byId.getParentId().equals(tOrgan.getParentId())) {
@@ -104,7 +115,7 @@ public class TOrganController extends BaseController {
             if (StringUtils.isNotBlank(tOrgan.getCode())) {
                 if (byId.getChildren().size() > 0) {
                     HashMap<String, Object> map = new HashMap<>();
-                    map.put("resultCode", "500");
+                    map.put("resultCode", "400");
                     map.put("message", "机构存在下级机构，不能修改机构级别！");
                     map.put("data", "");
                     return map;
@@ -112,7 +123,7 @@ public class TOrganController extends BaseController {
                 tOrgan.setLevel(tOrgan.getCode().length() / 3);
                 if (tOrgan.getLevel() > 3) {
                     HashMap<String, Object> resultMap = new HashMap<>();
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "不能修改机构为4级！");
                     return resultMap;
                 }

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

@@ -238,7 +238,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "账号已存在！");
                     return resultMap;
                 }
@@ -336,7 +336,8 @@ public class TUserController extends BaseController {
                     ew.eq("type", "2");
                     ew.eq("org_id", user.getOrgId());
                     List<TUser> list = userService.list(ew);
-                    if (list.size() >= 3) {
+                    TUser tUser = userService.getById(user.getId());
+                    if (list.size() >= 3&&!tUser.getOrgId().equals(user.getOrgId())) {
                         resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在三个单位管理员！");
                         return resultMap;
@@ -639,7 +640,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }
@@ -652,7 +653,7 @@ public class TUserController extends BaseController {
                 ew.eq("org_id", user.getOrgId());
                 List<TUser> list = this.userService.list(ew);
                 if (list != null && list.size() > 1 && list.get(0) != null) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "该单位机顶盒账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }
@@ -790,7 +791,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "500");
+                    resultMap.put("resultCode", "400");
                     resultMap.put("message", "账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }