diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandRelFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandRelFormDTO.java new file mode 100644 index 0000000000..82182b2440 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/UserDemandRelFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form.demand; + + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 当前用户与需求消息的关系 + */ +@Data +public class UserDemandRelFormDTO implements Serializable { + private static final long serialVersionUID = 948510931204329428L; + + public interface AddInternalGroup { + } + @NotBlank(message = "需求id不能为空",groups = AddInternalGroup.class) + private String demandRecId; + + @NotBlank(message = "userId不能为空",groups = AddInternalGroup.class) + private String userId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/UserDemandRelResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/UserDemandRelResDTO.java new file mode 100644 index 0000000000..9c7808dd81 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/UserDemandRelResDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result.demand; + + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +/** + * 当前用户与需求消息的关系 + */ +@AllArgsConstructor +@Data +public class UserDemandRelResDTO implements Serializable { + private static final long serialVersionUID = -9007483306143283653L; + // 需求发布人:publisher ;服务人:server + private String identity; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java index 39692daa96..9b4cf5ee00 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/UserDemandConstant.java @@ -73,4 +73,7 @@ public interface UserDemandConstant { */ String DEMAND_EVALUATED=" 您收到来自%s的评价,请查看。"; String DEMAND_CANCELED=" %s的需求已取消,请查看。"; + + String DEMAND_PUBLISHER="publisher"; + String DEMAND_SERVER="server"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java index 48ff8d7585..329d03d55e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiDemandController.java @@ -202,4 +202,18 @@ public class ResiDemandController { return new Result().ok(icUserDemandRecService.saveOrUpdateDemand(formDTO)); } + /** + * 当前用户与需求消息的关系 + * 需求发布人:publisher ;服务人:server + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("user-demand-rel") + public Result queryUserDemandRel(@LoginUser TokenDto tokenDto, @RequestBody UserDemandRelFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, UserDemandRelFormDTO.AddInternalGroup.class); + return new Result().ok(icUserDemandRecService.queryUserDemandRel(formDTO)); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index b2801abd64..e912a301db 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -204,4 +204,12 @@ public interface IcUserDemandRecService extends BaseService