diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 42ed88cf12..9215b5283d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -22,27 +22,27 @@ public enum EpmetErrorCode { CANNOT_AUDIT_WARM(8201, "只有注册居民才可以申请热心居民,请先完成居民注册"); - private int value; - private String name; + private int code; + private String msg; - EpmetErrorCode(int value, String name) { - this.value = value; - this.name = name; + EpmetErrorCode(int code, String msg) { + this.code = code; + this.msg = msg; } - public int getValue() { - return value; + public int getCode() { + return code; } - public void setValue(int value) { - this.value = value; + public void setCode(int code) { + this.code = code; } - public String getName() { - return name; + public String getMsg() { + return msg; } - public void setName(String name) { - this.name = name; + public void setMsg(String msg) { + this.msg = msg; } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 9002ceb31a..859138663e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -137,6 +137,6 @@ public class SysSmsServiceImpl extends BaseServiceImpl e.printStackTrace(); logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", mobile, e.getMessage())); } - return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getValue(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getName()); + return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getMsg()); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index a37bf1aa7a..85c11e2858 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -290,7 +290,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO); if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) { - return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getName()); + return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()); } //2、插入一条待审核的组信息 ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO); @@ -374,7 +374,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { logger.info("居民注册信息查询失败"); - return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName()); + return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()); } return new Result(); } @@ -410,7 +410,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl(); } if (null != resiGroupMemberDTO && !LeaderFlagConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())) { - return new Result().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getValue(), - EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getName()); + return new Result().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getCode(), + EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getMsg()); } //2、审核通过(讨论中)的群才可以分享邀请连接 ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId()); @@ -282,10 +282,10 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); } if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); } ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId()); if (null == resiGroupEntity) { @@ -323,7 +323,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl message = (Map) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); if(null == message) { - result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue()); - result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); + result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); + result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); return result; } //删除旧验证码 @@ -144,8 +144,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService if (null == code) { saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); - result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); - result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); + result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); + result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()); return result; } @@ -165,8 +165,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService partyMemberInfoEntity.setConfirmResult("1"); partymemberInfoService.insert(partyMemberInfoEntity); - result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue()); - result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName()); + result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode()); + result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg()); } else { //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index ba359e48ce..9e68e887bf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -139,8 +139,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl result1 = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); if (!result1.success() || null == result1.getData()) { - result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getValue()); - result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getName()); + result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode()); + result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg()); return result; } //1:热心居民申请行为记录表新增数据 @@ -220,4 +220,4 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl map = (Map) result.getData(); if(null == map) { - result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue()); - result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); + result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); + result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); return result; } //4:删除缓存中可能存在的旧验证码