diff --git a/viewsh-module-ops/viewsh-module-environment-biz/pom.xml b/viewsh-module-ops/viewsh-module-environment-biz/pom.xml index 9e94a54..62bca9f 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/pom.xml +++ b/viewsh-module-ops/viewsh-module-environment-biz/pom.xml @@ -31,6 +31,13 @@ ${revision} + + + com.viewsh + viewsh-module-iot-api + ${revision} + + com.viewsh @@ -61,5 +68,12 @@ rocketmq-spring-boot-starter true + + + + com.viewsh + viewsh-spring-boot-starter-test + test + diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/service/cleanorder/CleanOrderExtQueryHandlerTest.java b/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/service/cleanorder/CleanOrderExtQueryHandlerTest.java index 5bd5faa..576d08a 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/service/cleanorder/CleanOrderExtQueryHandlerTest.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/test/java/com/viewsh/module/ops/environment/service/cleanorder/CleanOrderExtQueryHandlerTest.java @@ -1,8 +1,8 @@ package com.viewsh.module.ops.environment.service.cleanorder; import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO; -import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderCleanExtDO; -import com.viewsh.module.ops.dal.mysql.workorder.OpsOrderCleanExtMapper; +import com.viewsh.module.ops.environment.dal.dataobject.workorder.OpsOrderCleanExtDO; +import com.viewsh.module.ops.environment.dal.mysql.workorder.OpsOrderCleanExtMapper; import com.viewsh.module.ops.enums.PriorityEnum; import com.viewsh.module.ops.enums.WorkOrderStatusEnum; import com.viewsh.module.ops.service.OrderDetailVO; @@ -48,8 +48,8 @@ class CleanOrderExtQueryHandlerTest { .priority(PriorityEnum.P2.getPriority()) .areaId(100L) .location("2楼电梯厅") - .createTime(LocalDateTime.now()) .build(); + // createTime 字段在 BaseDO 父类中,builder 无法直接设置 // 初始化测试扩展信息 testCleanExt = OpsOrderCleanExtDO.builder() diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OrderCenterController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OrderCenterController.java index 12527a1..0a3ab97 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OrderCenterController.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OrderCenterController.java @@ -57,8 +57,8 @@ public class OrderCenterController { @RequestParam(value = "title", required = false) String title) { OrderQueryService.OrderQuery query = OrderQueryService.OrderQuery.builder() - .withPage(page) - .withSize(size) + .withPageNo(page) + .withPageSize(size) .withOrderType(orderType) .withStatus(status) .withPriority(priority) diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/test/java/com/viewsh/module/ops/controller/admin/OrderCenterControllerTest.java b/viewsh-module-ops/viewsh-module-ops-server/src/test/java/com/viewsh/module/ops/controller/admin/OrderCenterControllerTest.java index 13c8432..d3a197e 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/test/java/com/viewsh/module/ops/controller/admin/OrderCenterControllerTest.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/test/java/com/viewsh/module/ops/controller/admin/OrderCenterControllerTest.java @@ -195,7 +195,7 @@ class OrderCenterControllerTest { // Then: 应该使用默认值 verify(orderQueryService, times(1)).queryPage(argThat(query -> - query.getPage() == 1 && query.getSize() == 20 + query.getPageNo() == 1 && query.getPageSize() == 20 )); } }