elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

异常修改v2

dev_shibei_match
yinzuomei 5 years ago
parent
859bdd65a0
commit
f8759c58c9
8 changed files with 110 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  2. 19
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
  3. 10
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java
  4. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
  5. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
  6. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
  7. 24
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  8. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

24
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
View File

@ -6,30 +6,6 @@ package com.epmet.commons.tools.exception;
* @Description:
*/
public enum EpmetErrorCode {
/*****************以下是框架自带的异常编码s****************************************************/
INTERNAL_SERVER_ERROR (500,"服务器内部异常"),
UNAUTHORIZED (401,"未授权"),
FORBIDDEN (403,"拒绝访问，没有权限"),
NOT_NULL (10001,"{0}不能为空"),
DB_RECORD_EXISTS ( 10002,"数据库中已存在该记录"),
PARAMS_GET_ERROR ( 10003,"获取参数失败"),
ACCOUNT_PASSWORD_ERROR ( 10004,"账号或密码错误"),
ACCOUNT_DISABLE (10005,"账号已被停用"),
IDENTIFIER_NOT_NULL (10006,"唯一标识不能为空"),
CAPTCHA_ERROR (10007,"验证码不正确"),
SUB_MENU_EXIST (10008,"先删除子菜单或按钮"),
PASSWORD_ERROR (10009,"原密码不正确"),
ACCOUNT_NOT_EXIST (10010,"账号不存在"),
SUPERIOR_DEPT_ERROR ( 10011,"上级部门选择错误"),
SUPERIOR_MENU_ERROR (10012,"上级菜单不能为自身"),
DATA_SCOPE_PARAMS_ERROR (10013,"数据权限接口，只能是Map类型参数"),
DEPT_SUB_DELETE_ERROR (10014,"请先删除下级部门"),
DEPT_USER_DELETE_ERROR (10015,"请先删除部门下的用户"),
JSON_FORMAT_ERROR (10016,"参数格式不正确，请使用JSON格式"),
SUPERIOR_REGION_ERROR (10017,"上级区域选择错误"),
REGION_SUB_DELETE_ERROR (10018,"请先删除下级区域"),
/*****************以上是框架自带的错误编码****************************************************/
SERVER_ERROR(8000, "服务器开小差了..."),
CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),

19
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
View File

@ -1,14 +1,15 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* <p>
* https://www.renren.io
*
* <p>
* 版权所有，侵权必究！
*/
package com.epmet.commons.tools.exception;
import com.epmet.commons.tools.utils.MessageUtils;
import org.apache.commons.lang3.StringUtils;
/**
@ -25,17 +26,26 @@ public class RenException extends RuntimeException {
public RenException(int code) {
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code);
}
}
public RenException(int code, String... params) {
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code, params);
}
}
public RenException(int code, Throwable e) {
super(e);
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code);
}
}
public RenException(int code, Throwable e, String... params) {
@ -48,6 +58,9 @@ public class RenException extends RuntimeException {
this.code = code;
if (StringUtils.isBlank(msg)) {
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code, msg);
}
} else {
this.msg = msg;
}
@ -56,12 +69,14 @@ public class RenException extends RuntimeException {
public RenException(String msg) {
super(msg);
// this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = msg;
}
public RenException(String msg, Throwable e) {
super(msg, e);
// this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = msg;
}

10
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java
View File

@ -9,8 +9,10 @@
package com.epmet.commons.tools.utils;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ErrorCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
@ -56,6 +58,9 @@ public class Result<T> implements Serializable {
public Result<T> error() {
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
}
return this;
}
@ -65,6 +70,9 @@ public class Result<T> implements Serializable {
public Result<T> error(int code) {
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
}
return this;
}
@ -87,7 +95,7 @@ public class Result<T> implements Serializable {
*/
@Deprecated
public Result<T> error(String msg) {
this.code = EpmetErrorCode.INTERNAL_SERVER_ERROR.getCode();
this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.msg = msg;
return this;
}

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
View File

@ -13,8 +13,4 @@ import com.epmet.commons.tools.exception.ErrorCode;
*/
public interface ModuleErrorCode extends ErrorCode {
int ARGS_NOT_ALLOW_NULL_ERROR = 100019001;
int NOT_STANDARD_AREA_CODE_ERROR = 100019002;
}

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
View File

@ -22,10 +22,4 @@ import com.epmet.commons.tools.exception.ErrorCode;
*/
public interface ModuleErrorCode extends ErrorCode {
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_FAILED = "组成员删除失败";
String SLIENT_FAILED = "组成员禁言失败";
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
View File

@ -129,8 +129,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
Result result = new Result();
ResiGroupStatisticalEntity entity = baseDao.selectByResiGroupId(resiGroupMemberEntity.getResiGroupId());
if (null == entity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
//成员总数
entity.setTotalMembers(entity.getTotalMembers() - NumConstant.ONE);
@ -139,8 +139,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
//1:根据组Id查询客户Id
ResiGroupEntity resiGroupEntity = resiGroupServiceImpl.selectById(entity.getResiGroupId());
if (null == resiGroupEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
//2:根据客户Id、用户Id查询被删除成员角色
UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
@ -149,8 +149,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
userRoleFormDTO.setUserId(resiGroupMemberEntity.getCustomerUserId());
Result<List<UserRoleResultDTO>> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
if (!resultList.success()) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
for (UserRoleResultDTO userRole : resultList.getData()) {
if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) {

24
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
View File

@ -444,17 +444,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
//2、group_member_operation新增一条记录
ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(removeMemberFormDTO.getMemberId());
if (null == resiGroupMemberEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleErrorCode.DELETE_FAILED);
throw new RenException(ModuleErrorCode.DELETE_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DELETE_FAILED);
throw new RenException(ModuleConstant.DELETE_FAILED);
}
groupMemeberOperationService.saveMemberOperation(removeMemberFormDTO.getUserId(), MemberStateConstant.REMOVED, resiGroupMemberEntity);
//3、修改resi_group_statistical表数据:成员总数-1,普通居民总数-1，热心居民或者党员数根据被删除的用户身份来判断
result = resiGroupStatisticalService.upGroupStatistical(removeMemberFormDTO, resiGroupMemberEntity);
if (!result.success()) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleErrorCode.DELETE_FAILED);
throw new RenException(ModuleErrorCode.DELETE_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DELETE_FAILED);
throw new RenException(ModuleConstant.DELETE_FAILED);
}
//4、之前这个人发布的话题根据前端传过来的屏蔽标志更新话题状态(移除一条话题在话题操作日志表添加一条日志)
if (removeMemberFormDTO.getHideFlag().equals(NumConstant.ONE_STR)) {
@ -483,17 +483,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
//2:组成员出入群记录(group_memeber_operation)表新增记录
ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(slientMemberFormDTO.getMemberId());
if (null == resiGroupMemberEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleErrorCode.SLIENT_FAILED);
throw new RenException(ModuleErrorCode.SLIENT_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.SLIENT_FAILED);
throw new RenException(ModuleConstant.SLIENT_FAILED);
}
groupMemeberOperationService.saveMemberOperation(slientMemberFormDTO.getUserId(), MemberStateConstant.SILENT, resiGroupMemberEntity);
//3:用户消息(user_message)表新增消息数据
ResiGroupEntity resiGroupEntity = resiGroupService.selectById(resiGroupMemberEntity.getResiGroupId());
if (null == resiGroupEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
logger.error(ModuleErrorCode.SLIENT_FAILED);
throw new RenException(ModuleErrorCode.SLIENT_FAILED);
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.SLIENT_FAILED);
throw new RenException(ModuleConstant.SLIENT_FAILED);
}
UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
userMessageFormDTO.setCustomerId(resiGroupEntity.getCustomerId());

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
View File

@ -152,4 +152,10 @@ public interface ModuleConstant extends Constant {
* 没有找到用户列表信息
* */
String USER_INFO_LIST_NOT_FOUND = "没有找到用户列表信息";
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_FAILED = "组成员删除失败";
String SLIENT_FAILED = "组成员禁言失败";
}

Write Preview
Loading…
Cancel
Save