From 1ae1ebb771bf468db3bf178b7aadbb306b4c2314 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 28 Jan 2026 16:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=8E=BB=E7=92=83=E9=A5=BC?= =?UTF-8?q?=E8=AE=A2=E5=8D=95-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/feign/IWorkOrderClient.java | 3 ++- .../feign/IWorkOrderClientFallback.java | 3 ++- .../pojo/vo/GlassCakeOrderPageQuery.java | 23 +++++++++++++++++++ .../scheduling/feign/WorkOrderClient.java | 7 +++++- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/GlassCakeOrderPageQuery.java diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java index 6a4d3d36..56de3d57 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java @@ -3,6 +3,7 @@ package org.springblade.scheduling.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery; import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -39,5 +40,5 @@ public interface IWorkOrderClient { R initResource(); @GetMapping(GLASS_CAKE_ORDER) - R> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query); + R> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery); } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java index 43de89e3..bf70c0c5 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java @@ -28,6 +28,7 @@ package org.springblade.scheduling.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery; import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springframework.stereotype.Component; @@ -50,7 +51,7 @@ public class IWorkOrderClientFallback implements IWorkOrderClient { } @Override - public R> selectGlassCakeOrderPage(WorkOrderVO WorkOrder, Query query) { + public R> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery) { return R.fail("获取玻璃饼订单失败"); } } diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/GlassCakeOrderPageQuery.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/GlassCakeOrderPageQuery.java new file mode 100644 index 00000000..72e59328 --- /dev/null +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/vo/GlassCakeOrderPageQuery.java @@ -0,0 +1,23 @@ +package org.springblade.scheduling.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.core.mp.support.Query; + + +/** + * TODO：功能描述 + * + * @author sjx + * @version 1.0 + * @BelongsProject jonhon-mes-svr + * @BelongsPackage org.springblade.scheduling.pojo.vo + * @since 2026-01-28 16:19 + */ +@Data +public class GlassCakeOrderPageQuery { + + private Integer current; + + private Integer size; +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java index 71fb5ecd..490f17e0 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java @@ -37,6 +37,7 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.scheduling.feign.IWorkOrderClient; +import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery; import org.springblade.scheduling.pojo.vo.WorkOrderVO; import org.springblade.scheduling.scheduling.service.IEquipResourceService; import org.springblade.scheduling.scheduling.service.IPersonResourceService; @@ -83,7 +84,11 @@ public class WorkOrderClient implements IWorkOrderClient { } @Override - public R> selectGlassCakeOrderPage(WorkOrderVO workOrder, Query query) { + public R> selectGlassCakeOrderPage(GlassCakeOrderPageQuery glassCakeOrderPageQuery) { + Query query = new Query(); + query.setCurrent(glassCakeOrderPageQuery.getCurrent()); + query.setSize(glassCakeOrderPageQuery.getSize()); + WorkOrderVO workOrder = new WorkOrderVO(); return R.data(workOrderService.selectGlassCakeOrderPage(Condition.getPage(query), workOrder)); } }