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 f2f209ea6e..42ed88cf12 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,7 +17,9 @@ public enum EpmetErrorCode { MOBILE_CODE_ERROR(8102, "手机验证码错误"), AUTO_CONFIRM_FAILED(8103, "自动认证失败"), MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), - MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"); + MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), + + CANNOT_AUDIT_WARM(8201, "只有注册居民才可以申请热心居民，请先完成居民注册"); private int value; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java index 29058e3247..752fb2b9fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java @@ -101,6 +101,7 @@ public class CustomerStaffGridController { **/ @PostMapping("manageaudit") public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return customerStaffGridService.manageAudit(tokenDTO, formDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java index 1574ded95c..e9d591581e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java @@ -3,6 +3,7 @@ package com.epmet.modules.resiregister.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; @@ -34,6 +35,7 @@ public class ResiRegisterController { **/ @PostMapping("init") public Result init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) { + ValidatorUtils.validateEntity(resiRegisterFormDTO); return resiRegisterService.init(tokenDTO, resiRegisterFormDTO); } @@ -44,6 +46,7 @@ public class ResiRegisterController { **/ @PostMapping("submit") public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { + ValidatorUtils.validateEntity(resiInfoSubmitFormDTO); return resiRegisterService.submit(tokenDTO, resiInfoSubmitFormDTO); } @@ -54,6 +57,7 @@ public class ResiRegisterController { **/ @PostMapping("getverificationcode") public Result getVerificationCode(@LoginUser TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return resiRegisterService.getVerificationCode(tokenDTO, formDTO); } 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 1def10010d..7b48c66926 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 @@ -35,14 +35,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { **/ @Override public Result init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) - || StringUtils.isBlank(formDTO.getGridId()) - || StringUtils.isBlank(formDTO.getVisitFrom())) { - return new Result().error(ModuleErrorCode.PARTICIPATION_EXCEPTION); - }*/ formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.init(formDTO); } @@ -54,14 +46,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { **/ @Override public Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - /*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()); @@ -78,14 +62,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { **/ @Override public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - /*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); } @@ -101,7 +77,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { * @Author sun */ private static boolean validateMobile(String mobile) { - //Pattern pattern = Pattern.compile("^[1]\\d{10}$"); Pattern pattern = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); return pattern.matcher(mobile).matches(); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java index c3150d0879..03283c179a 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java @@ -3,6 +3,7 @@ package com.epmet.modules.warmhearted.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.warmhearted.service.ResiWarmheartedService; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; @@ -31,6 +32,7 @@ public class ResiWarmheartedController { **/ @PostMapping("init") public Result init(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) { + ValidatorUtils.validateEntity(resiWarmheartedFormDTO); return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO); } @@ -41,6 +43,7 @@ public class ResiWarmheartedController { **/ @PostMapping("submit") public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return resiWarmheartedService.submit(tokenDTO, 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 0448f99547..c9e4847fa6 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 @@ -31,14 +31,6 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { **/ @Override public Result init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - /* 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); } @@ -50,15 +42,6 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { **/ @Override public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) { - if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); - } - /*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-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java index 6c35e40152..707e41f30f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedAuditFormDTO.java @@ -47,7 +47,6 @@ public class ResiWarmheartedAuditFormDTO implements Serializable { /** * 驳回理由 */ - @NotBlank(message = "驳回理由不能为空") private String refuseReason; /** @@ -59,7 +58,6 @@ public class ResiWarmheartedAuditFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java index 4c05ab5391..0b474c8bdd 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java @@ -53,7 +53,6 @@ public class ResiWarmheartedFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java index f631a278b9..38adf78eae 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java @@ -59,7 +59,6 @@ public class ResiWarmheartedSubmitFormDTO implements Serializable { /** * 用户Id */ - @NotBlank(message = "用户ID不能为空") private String userId; } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 30cb07eb4b..211ae18ba8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @dscription * @date 2020/3/30 14:51 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url="http://localhost:8087") public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index c52a1baae0..be143e7bab 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -236,6 +236,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class); userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile()); userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId()); + userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate()); + userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding()); epmetUserFeignClient.saveResiInfo(userResiInfoDTO); } } 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 a5765fa744..ba359e48ce 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 @@ -25,11 +25,14 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao; @@ -129,8 +132,19 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl init(ResiWarmheartedFormDTO formDTO) { + Result result = new Result(); + //0:先判断该用户是否是已注册居民 + UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO(); + userResiInfoFormDTO.setCustomerId(formDTO.getCustomerId()); + userResiInfoFormDTO.setUserId(formDTO.getUserId()); + Result result1 = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO); + if (!result1.success() || null == result1.getData()) { + result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getValue()); + result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getName()); + return result; + } //1:热心居民申请行为记录表新增数据 - Result result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO); + result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO); if (!result.success()) { log.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION); } @@ -187,15 +201,17 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl