diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java index cd296e26..4ad34644 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java @@ -17,8 +17,11 @@ import cn.axzo.msg.center.service.pending.response.PushPendingMessageDTO; import cn.azxo.framework.common.model.CommonResponse; import cn.azxo.framework.common.model.Page; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import javax.validation.Valid; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -58,11 +61,6 @@ public class PendingMessageNewController implements PendingMessageClient { return CommonResponse.success(pendingMessageNewService.pageQuery(request)); } - @Override - public CommonResponse> getPendingMessageByAppWorker(PendingMessageFixedTemplatePageRequest request) { - return CommonResponse.success(pendingMessageNewService.getPendingMessageByAppWorker(request)); - } - @Override public CommonResponse> compatiblePageQuery(PendingMessagePageRequest request) { return CommonResponse.success(pendingMessageNewService.compatiblePageQuery(request)); @@ -112,4 +110,15 @@ public class PendingMessageNewController implements PendingMessageClient { public CommonResponse revokeByTemplateCodeBizCode(CompletePendingMessageRequest param) { return CommonResponse.success(pendingMessageNewService.revokeByTemplateCodeBizCode(param)); } + + /** + * 指定几种代办模型列表分页查询 + * + * @param request 分页查询相关参数 + * @return 代办列表 + */ + @PostMapping("/pending-message/getPendingMessageByAppWorker") + public CommonResponse> getPendingMessageByAppWorker(@Valid @RequestBody PendingMessageFixedTemplatePageRequest request) { + return CommonResponse.success(pendingMessageNewService.getPendingMessageByAppWorker(request)); + } } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java index 49e7e3cc..d3fe686d 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java @@ -61,15 +61,6 @@ public interface PendingMessageClient { @PostMapping(value = "/pending-message/record/page", produces = {MediaType.APPLICATION_JSON_VALUE}) CommonResponse> pageQuery(@RequestBody @Valid PendingMessagePageRequest request); - /** - * 指定几种代办模型列表分页查询 - * - * @param request 分页查询相关参数 - * @return 代办列表 - */ - @PostMapping(value = "/pending-message/getPendingMessageByAppWorker", produces = {MediaType.APPLICATION_JSON_VALUE}) - CommonResponse> getPendingMessageByAppWorker(@RequestBody @Valid PendingMessageFixedTemplatePageRequest request); - /** * 代办列表分页查询 * diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java index d89fe899..713d1bd8 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/fallback/PendingMessageClientFallback.java @@ -44,12 +44,6 @@ public class PendingMessageClientFallback implements PendingMessageClient { return CommonResponse.error("fall back while page querying pending message"); } - @Override - public CommonResponse> getPendingMessageByAppWorker(PendingMessageFixedTemplatePageRequest request) { - log.error("fall back while page queryByTemplateCodes pending message. req:{}", request); - return CommonResponse.error("fall back while page queryByTemplateCodes pending message"); - } - @Override public CommonResponse> compatiblePageQuery(PendingMessagePageRequest request) { log.error("fall back while page querying pending message. req:{}", request);