From 72ee2e5ff4fb3d10c9cf715f300cedf4ffb5ed63 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Apr 2020 14:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E5=8F=8A=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 11 +---------- .../impl/CustomerStaffGridServiceImpl.java | 4 ++-- .../modules/exception/ModuleErrorCode.java | 6 ++++-- .../service/impl/ResiRegisterServiceImpl.java | 17 ++++++++++------- .../impl/ResiWarmheartedServiceImpl.java | 8 ++++---- .../impl/ResiWarmheartedApplyServiceImpl.java | 1 - .../epmet/dto/form/ResiInfoSubmitFormDTO.java | 5 +++++ .../epmet/dto/form/VerificationCodeFormDTO.java | 3 +++ .../constant/UserResiRegisterConstant.java | 6 +++++- .../service/impl/UserResiInfoServiceImpl.java | 3 +-- .../impl/UserResiRegisterVisitServiceImpl.java | 4 ++-- 11 files changed, 37 insertions(+), 31 deletions(-) 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 c659d19404..f2f209ea6e 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 @@ -17,16 +17,7 @@ public enum EpmetErrorCode { MOBILE_CODE_ERROR(8102, "手机验证码错误"), AUTO_CONFIRM_FAILED(8103, "自动认证失败"), MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), - MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), - - - /** - * 手机号已存在 - */ - MOBILE_EXIST(8201, "该手机号已注册居民，请使用其他手机号注册！"), - PARAMETER_EXCEPTION(8202, "必要参数存在空值或手机号输入不合规，请检查参数赋值情况！！"), - UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！"), - PARTICIPATION_EXCEPTION(8204, "参数异常，请检查所传参数是否合规！"); + MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"); private int value; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 11b01de27b..6bb2f7243f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java @@ -120,12 +120,12 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl * https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -22,4 +22,6 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { + String PARTICIPATION_EXCEPTION = "参数异常,请检查所传参数是否符合规范以及是否存在空值"; + String MOBILE_EXCEPTION = "手机号输入不符合规范，请重新输入"; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index 33922268a6..1def10010d 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java @@ -1,6 +1,5 @@ package com.epmet.modules.resiregister.service.impl; -import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; @@ -8,6 +7,7 @@ import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; +import com.epmet.modules.exception.ModuleErrorCode; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.resiregister.service.ResiRegisterService; import com.epmet.modules.utils.ModuleConstant; @@ -38,11 +38,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getVisitFrom())) { - return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName()); - } + return new Result().error(ModuleErrorCode.PARTICIPATION_EXCEPTION); + }*/ formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.init(formDTO); } @@ -57,11 +57,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId()) + /*if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId()) || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId()) || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) { return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - } + }*/ UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo(); userResiInfoDTO.setUserId(tokenDTO.getUserId()); userResiInfoDTO.setApp(tokenDTO.getApp()); @@ -81,10 +81,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getMobile()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getMobile()) || StringUtils.isBlank(formDTO.getResiVisitId()) || !validateMobile(formDTO.getMobile())) { return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); + }*/ + if (!validateMobile(formDTO.getMobile())) { + return new Result().error(ModuleErrorCode.MOBILE_EXCEPTION); } formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.getVerificationCode(formDTO); diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java index c8054780a1..0448f99547 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java @@ -34,11 +34,11 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getVisitFrom())) { return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName()); - } + }*/ formDTO.setUserId(tokenDTO.getUserId()); return resiPartymemberFeignClient.init(formDTO); } @@ -53,12 +53,12 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) + /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) || StringUtils.isBlank(formDTO.getGridId()) || StringUtils.isBlank(formDTO.getResiWarmVisitId()) || StringUtils.isBlank(formDTO.getReason())) { return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName()); - } + }*/ formDTO.setUserId(tokenDTO.getUserId()); return resiPartymemberFeignClient.submit(formDTO); } 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 221a90fc4b..a5765fa744 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 @@ -163,7 +163,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl