diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index f5069b05a8..f22330be65 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -72,6 +72,12 @@ epmet-user-server 2.0.0 + + com.epmet + epmet-message-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index 0e6ecfe1bc..90b90b30e6 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -181,4 +181,8 @@ public class DemoController { return demoService.getSysUserInfoById(id); } + @GetMapping("sendSmsCaptcha/{mobile}") + public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) { + return demoService.sendSmsCaptcha(mobile); + } } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java index 612f736267..716648e837 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java @@ -155,4 +155,12 @@ public interface DemoService extends BaseService { **/ Result getSysUserInfoById(Long id); + /** + * @return com.epmet.commons.tools.utils.Result + * @param mobile + * @Author yinzuomei + * @Description 测试发送验证码 + * @Date 2020/4/3 13:41 + **/ + Result sendSmsCaptcha(String mobile); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java index 666bfb533b..f2237070f4 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.entity.DemoEntity; import com.epmet.feign.AdminFeignClient; import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.MessageFeignClient; import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.DemoRedis; import com.epmet.service.DemoService; @@ -65,6 +66,9 @@ public class DemoServiceImpl extends BaseServiceImpl implem private GovOrgFeignClient govOrgFeignClient; @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private MessageFeignClient messageFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -168,4 +172,19 @@ public class DemoServiceImpl extends BaseServiceImpl implem public Result getSysUserInfoById(Long id) { return adminFeignClient.getById(id); } + + /** + * @param mobile + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试发送验证码 + * @Date 2020/4/3 13:41 + **/ + @Override + public Result sendSmsCaptcha(String mobile) { + if(StringUtils.isBlank(mobile)){ + return new Result().error("手机号不能为空"); + } + return messageFeignClient.sendSmsCaptcha(mobile); + } } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java new file mode 100644 index 0000000000..92b65101cd --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 创建小组界面初始化 只有党员和热心居民才能创建小组 + * @Author yinzuomei + * @Date 2020/4/5 18:23 + */ +@Data +public class InitApplyCreatedGroupFormDTO implements Serializable { + + @NotBlank(message = "客户id不能为空") + private String customerId; + + /** + * 用户id TokenDto赋值 + */ + @NotBlank(message="用户id不能为空") + private String userId; + + /** + * app来源 TokenDto赋值 + */ + @NotBlank(message="app不能为空") + private String app; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyGroupFormDTO.java new file mode 100644 index 0000000000..2523637f17 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyGroupFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 加入小组界面初始化入参DTO + * @Author yinzuomei + * @Date 2020/4/5 17:48 + */ +@Data +public class InitApplyGroupFormDTO implements Serializable { + private static final long serialVersionUID = 4528129201943819421L; + + @NotBlank(message = "客户id不能为空") + private String customerId; + + /** + * 用户id TokenDto赋值 + */ + @NotBlank(message="用户id不能为空") + private String userId; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 83c7ab6054..bd0c696fe7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -152,27 +152,34 @@ public class ResiGroupController { * @Date 2020/3/30 10:11 **/ @PostMapping("initapplygroup") - public Result initApplyGroup(@LoginUser TokenDto tokenDto,@RequestParam("customerId") String customerId) { + public Result initApplyGroup(@LoginUser TokenDto tokenDto, + @RequestBody InitApplyGroupFormDTO initApplyGroupFormDTO) { if (null == tokenDto) { return new Result().error(ModuleConstant.USER_NOT_NULL); } - UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); - resiUserInfoFormDTO.setUserId(tokenDto.getUserId()); - resiUserInfoFormDTO.setCustomerId(customerId); - return resiGroupService.initApplyGroup(resiUserInfoFormDTO); + initApplyGroupFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(initApplyGroupFormDTO); + return resiGroupService.initApplyGroup(initApplyGroupFormDTO); } /** * @param tokenDto - * @param customerId + * @param initApplyCreatedGroupFormDTO * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei * @Description 创建小组界面初始化 只有党员和热心居民才能创建小组 * @Date 2020/3/30 15:44 **/ @PostMapping("initapplycreategroup") - public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto, @RequestParam("customerId") String customerId) { - return resiGroupService.initApplyCreatedGroup(tokenDto,customerId); + public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto, + @RequestBody InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) { + if (null == tokenDto) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } + initApplyCreatedGroupFormDTO.setUserId(tokenDto.getUserId()); + initApplyCreatedGroupFormDTO.setApp(tokenDto.getApp()); + ValidatorUtils.validateEntity(initApplyCreatedGroupFormDTO); + return resiGroupService.initApplyCreatedGroup(initApplyCreatedGroupFormDTO); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index f999d2ed8f..329158b9af 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -158,23 +158,22 @@ public interface ResiGroupService extends BaseService { Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO); /** - * @param resiUserInfoFormDTO + * @param initApplyGroupFormDTO * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei * @Description 加入小组界面初始化 * @Date 2020/3/30 10:17 **/ - Result initApplyGroup(UserResiInfoFormDTO resiUserInfoFormDTO); + Result initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO); /** - * @param tokenDto - * @param customerId + * @param initApplyCreatedGroupFormDTO * @return com.epmet.commons.tools.utils.Result * @Author yinzuomei * @Description 校验用户是否是热心居民或者党员 * @Date 2020/3/30 15:50 **/ - Result initApplyCreatedGroup(TokenDto tokenDto, String customerId); + Result initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO); /** * @return com.epmet.commons.tools.utils.Result 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 e4fb6a8ade..edf5bd4bb8 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 @@ -355,20 +355,23 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { logger.info("居民注册信息查询失败"); @@ -390,22 +393,23 @@ public class ResiGroupServiceImpl extends BaseServiceImpl diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index cf5dc8344a..9295571e93 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -5,7 +5,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.ListCustomerGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.feign.fallback.GovOrgFeignFallBack; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +20,7 @@ import java.util.List; * @Author wangc * @date 2020.03.17 14:29 */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) public interface GovOrgFeignClient { /** diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java similarity index 93% rename from epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java rename to epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index f616ede85c..f2370b8c32 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -18,7 +18,7 @@ import java.util.List; * @date 2020.03.17 14:29 */ @Component -public class GovOrgFeignFallBack implements GovOrgFeignClient { +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { /** * 根据地区编码获取附近网格数据 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java index 3393371ca6..51796840f4 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java @@ -74,6 +74,6 @@ public interface ResiPartymemberFeignClient { * @param partyMemberInfoDTO 参数 * @return Result */ - @PostMapping("extra") + @PostMapping("/resi/partymember/confirm/extra") Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java index 02adb2ee95..d97754ad04 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java @@ -47,7 +47,7 @@ public class PartymemberInfoRedis { public void setUserMobileCode(String userId, String mobile, String code){ String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code); - redisUtils.set(key, code); + redisUtils.set(key, code, RedisUtils.MINUTE_TEN_EXPIRE); } public String getUserMobileCode(String userId, String mobile, String code){ @@ -55,4 +55,9 @@ public class PartymemberInfoRedis { return (String) redisUtils.get(key); } + public void delUserMobileCode(String userId, String mobile, String code){ + String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code); + redisUtils.delete(key); + } + } \ No newline at end of file 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 5b061faca6..9ba74dda60 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 @@ -55,8 +55,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService @Autowired private EpmetMessageFeignClient messageFeignClient; - private final static String BENCHMARK = "110010"; - @Override @Transactional(rollbackFor = Exception.class) public Result init(PartyMemberInitFromDTO fromDto) { @@ -143,6 +141,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); return result; + } else { + partyMemberInfoRedis.delUserMobileCode(partyMemberInfoDTO.getUserId(), + partyMemberInfoDTO.getMobile(), + partyMemberInfoDTO.getCode()); } //获取党员基本信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java index cff24b48e8..0b2cb3c0ef 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.feign.fallback.MessageFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class) @@ -15,6 +16,6 @@ public interface MessageFeignClient { * @return */ @GetMapping(value = "message/sms/captcha/{mobile}") - Result sendSmsCaptcha(@RequestParam("mobile") String mobile); + Result sendSmsCaptcha(@PathVariable("mobile") String mobile); -} \ No newline at end of file +}