加入小组界面初始化接口修改

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;
+}

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;
+}

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);
 	}
 
 	/**

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<ResiGroupEntity> {
 	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

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<ResiGroupDao, ResiGrou
 	}
 
 	/**
-	 * @param resiUserInfoFormDTO
+	 * @param initApplyGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 加入小组界面初始化
 	 * @Date 2020/3/30 10:17
 	 **/
 	@Override
-	public Result initApplyGroup(UserResiInfoFormDTO resiUserInfoFormDTO) {
-		if (StringUtils.isBlank(resiUserInfoFormDTO.getCustomerId())) {
+	public Result initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO) {
+		if (StringUtils.isBlank(initApplyGroupFormDTO.getCustomerId())) {
 			return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL);
 		}
-		if (StringUtils.isBlank(resiUserInfoFormDTO.getUserId())) {
+		if (StringUtils.isBlank(initApplyGroupFormDTO.getUserId())) {
 			return new Result().error(ModuleConstant.USER_NOT_NULL);
 		}
+		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
+		resiUserInfoFormDTO.setUserId(initApplyGroupFormDTO.getUserId());
+		resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId());
 		Result<UserResiInfoDTO> 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<ResiGroupDao, ResiGrou
 	}
 
 	/**
-	 * @param tokenDto
-	 * @param customerId
+	 * @param initApplyCreatedGroupFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
 	 * @Description 校验用户是否是热心居民或者党员
 	 * @Date 2020/3/30 15:50
 	 **/
 	@Override
-	public Result initApplyCreatedGroup(TokenDto tokenDto, String customerId) {
-		if (StringUtils.isBlank(customerId)) {
+	public Result initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
+		if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getCustomerId())) {
 			return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL);
 		}
-		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
+		if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getUserId())) {
 			return new Result().error(ModuleConstant.USER_NOT_NULL);
 		}
-		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(tokenDto.getApp(), tokenDto.getUserId(), customerId);
+		UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(initApplyCreatedGroupFormDTO.getApp(),
+				initApplyCreatedGroupFormDTO.getUserId(),
+				initApplyCreatedGroupFormDTO.getCustomerId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
 			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue(),EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
 		}