From 34740ac4292cea143136d8e3719c095663d3bb2b Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Sun, 5 Apr 2020 18:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B0=8F=E7=BB=84=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/InitApplyCreatedGroupFormDTO.java | 30 +++++++++++++++++++ .../dto/group/form/InitApplyGroupFormDTO.java | 25 ++++++++++++++++ .../epmet/modules/comment/controller/.gitkeep | 0 .../com/epmet/modules/comment/entity/.gitkeep | 0 .../com/epmet/modules/comment/excel/.gitkeep | 0 .../group/controller/ResiGroupController.java | 23 +++++++++----- .../group/service/ResiGroupService.java | 9 +++--- .../service/impl/ResiGroupServiceImpl.java | 24 ++++++++------- 8 files changed, 88 insertions(+), 23 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyCreatedGroupFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/InitApplyGroupFormDTO.java delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/.gitkeep delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/entity/.gitkeep delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/excel/.gitkeep 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