diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java new file mode 100644 index 0000000000..7b6975eb89 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/GetInvitationFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.resi.group.dto.invitation.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author sun + * @Description 通知、活动分享Id查询数据-接口入参 + */ +@Data +public class GetInvitationFormDTO { + + /** + * 分享Id + */ + @NotBlank(message = "分享Id不能为空",groups = {GetInvitationFormDTO.Invitation.class}) + private String invitationRecordId; + + public interface Invitation{} +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java new file mode 100644 index 0000000000..24f2a708f2 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/GetInvitationResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.resi.group.dto.invitation.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * @Description 通知、活动分享Id查询数据-接口返参 + */ +@Data +public class GetInvitationResultDTO implements Serializable { + private static final long serialVersionUID = 6136787210623326830L; + + /** + * 客户Id + */ + private String customerId; + /** + * 网格Id + */ + private String gridId; + /** + * 小组Id + */ + private String groupId; + /** + * 通知或活动Id + */ + private String sourceId; + /** + * notice:通知 act:活动 + */ + private String sourceType; + /** + * notice:通知 act:活动 + */ + private String shareUserId; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java index c6d6cc9392..73579acfaf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java @@ -24,6 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.invitation.service.InvitationRecordService; import com.epmet.resi.group.dto.invitation.form.ShareFormDTO; import com.epmet.resi.group.dto.invitation.result.ShareResultDTO; +import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO; +import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -58,4 +60,16 @@ public class InvitationRecordController { return new Result().ok(invitationRecordService.share(formDTO)); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 通知、活动分享Id查询数据 + **/ + @PostMapping(value = "getinvitation") + public Result getInvitation(@RequestBody GetInvitationFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, GetInvitationFormDTO.Invitation.class); + return new Result().ok(invitationRecordService.getInvitation(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java index 4373554965..21ccf3580a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java @@ -19,7 +19,9 @@ package com.epmet.modules.invitation.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.invitation.entity.InvitationRecordEntity; +import com.epmet.resi.group.dto.invitation.form.GetInvitationFormDTO; import com.epmet.resi.group.dto.invitation.form.ShareFormDTO; +import com.epmet.resi.group.dto.invitation.result.GetInvitationResultDTO; import com.epmet.resi.group.dto.invitation.result.ShareResultDTO; /** @@ -37,4 +39,12 @@ public interface InvitationRecordService extends BaseService", formDTO.getInvitationRecordId())); + } + GetInvitationResultDTO resultDTO = ConvertUtils.sourceToTarget(entity, GetInvitationResultDTO.class); + return resultDTO; + } } \ No newline at end of file