diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderService.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderService.java index 98c130c4..88dbbfc3 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderService.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderService.java @@ -1,7 +1,7 @@ package com.viewsh.module.ops.service.order; import com.viewsh.framework.common.pojo.PageResult; -import com.viewsh.module.ops.dal.dataobject.dto.*; +import com.viewsh.module.ops.service.order.dto.*; import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO; import com.viewsh.module.ops.enums.OperatorTypeEnum; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderServiceImpl.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderServiceImpl.java index 23cd956e..98a6ce5d 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderServiceImpl.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderServiceImpl.java @@ -4,7 +4,7 @@ import com.viewsh.framework.common.exception.ServiceException; import com.viewsh.framework.common.pojo.PageResult; import com.viewsh.framework.common.util.object.BeanUtils; import com.viewsh.module.ops.core.lifecycle.OrderLifecycleManager; -import com.viewsh.module.ops.dal.dataobject.dto.*; +import com.viewsh.module.ops.service.order.dto.*; import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO; import com.viewsh.module.ops.dal.mysql.workorder.OpsOrderMapper; import com.viewsh.module.ops.enums.OperatorTypeEnum; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderAssignReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderAssignReqDTO.java similarity index 94% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderAssignReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderAssignReqDTO.java index 9a57043b..dc39befb 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderAssignReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderAssignReqDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogRespDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogRespDTO.java similarity index 93% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogRespDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogRespDTO.java index 927bf119..deb9d279 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogRespDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogRespDTO.java @@ -1,42 +1,42 @@ -package com.viewsh.module.ops.dal.dataobject.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.Map; - -/** - * 工单业务日志响应 DTO - * - * @author lzh - */ -@Schema(description = "管理后台 - 工单业务日志 Response DTO") -@Data -public class OpsOrderBusinessLogRespDTO { - - @Schema(description = "日志ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Long id; - - @Schema(description = "日志类型(system=系统/user=用户)", requiredMode = Schema.RequiredMode.REQUIRED, example = "system") - private String type; - - @Schema(description = "日志标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "工单自动创建") - private String title; - - @Schema(description = "日志内容", example = "蓝牙信标触发自动创建保洁工单") - private String content; - - @Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED, example = "系统") - private String operator; - - @Schema(description = "日志时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2026-01-23 14:30:25") - private LocalDateTime time; - - @Schema(description = "工单状态", example = "PENDING") - private String status; - - @Schema(description = "扩展数据", example = "{}") - private Map extra; - -} +package com.viewsh.module.ops.service.order.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Map; + +/** + * 工单业务日志响应 DTO + * + * @author lzh + */ +@Schema(description = "管理后台 - 工单业务日志 Response DTO") +@Data +public class OpsOrderBusinessLogRespDTO { + + @Schema(description = "日志ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long id; + + @Schema(description = "日志类型(system=系统/user=用户)", requiredMode = Schema.RequiredMode.REQUIRED, example = "system") + private String type; + + @Schema(description = "日志标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "工单自动创建") + private String title; + + @Schema(description = "日志内容", example = "蓝牙信标触发自动创建保洁工单") + private String content; + + @Schema(description = "操作人", requiredMode = Schema.RequiredMode.REQUIRED, example = "系统") + private String operator; + + @Schema(description = "日志时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2026-01-23 14:30:25") + private LocalDateTime time; + + @Schema(description = "工单状态", example = "PENDING") + private String status; + + @Schema(description = "扩展数据", example = "{}") + private Map extra; + +} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogsRespDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogsRespDTO.java similarity index 88% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogsRespDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogsRespDTO.java index a2b63cf8..0b40b4ca 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogsRespDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogsRespDTO.java @@ -1,23 +1,23 @@ -package com.viewsh.module.ops.dal.dataobject.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -/** - * 工单业务日志列表响应 DTO - * - * @author lzh - */ -@Schema(description = "管理后台 - 工单业务日志列表 Response DTO") -@Data -public class OpsOrderBusinessLogsRespDTO { - - @Schema(description = "工单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10001") - private Long orderId; - - @Schema(description = "日志列表", requiredMode = Schema.RequiredMode.REQUIRED) - private List logs; - -} +package com.viewsh.module.ops.service.order.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 工单业务日志列表响应 DTO + * + * @author lzh + */ +@Schema(description = "管理后台 - 工单业务日志列表 Response DTO") +@Data +public class OpsOrderBusinessLogsRespDTO { + + @Schema(description = "工单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10001") + private Long orderId; + + @Schema(description = "日志列表", requiredMode = Schema.RequiredMode.REQUIRED) + private List logs; + +} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCancelReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCancelReqDTO.java similarity index 90% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCancelReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCancelReqDTO.java index e10cff24..daae9d6e 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCancelReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCancelReqDTO.java @@ -1,25 +1,25 @@ -package com.viewsh.module.ops.dal.dataobject.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 工单取消请求 DTO - * - * @author lzh - */ -@Schema(description = "管理后台 - 工单取消 Request DTO") -@Data -public class OpsOrderCancelReqDTO { - - @Schema(description = "工单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") - @NotNull(message = "工单ID不能为空") - private Long id; - - @Schema(description = "取消原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "客户要求取消") - @NotBlank(message = "取消原因不能为空") - private String reason; - -} +package com.viewsh.module.ops.service.order.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * 工单取消请求 DTO + * + * @author lzh + */ +@Schema(description = "管理后台 - 工单取消 Request DTO") +@Data +public class OpsOrderCancelReqDTO { + + @Schema(description = "工单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") + @NotNull(message = "工单ID不能为空") + private Long id; + + @Schema(description = "取消原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "客户要求取消") + @NotBlank(message = "取消原因不能为空") + private String reason; + +} diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCompleteReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCompleteReqDTO.java similarity index 91% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCompleteReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCompleteReqDTO.java index 79d86368..09dc23f8 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCompleteReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCompleteReqDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCreateReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCreateReqDTO.java similarity index 97% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCreateReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCreateReqDTO.java index 0485e75f..d164d1d3 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCreateReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCreateReqDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import com.viewsh.framework.common.validation.InEnum; import com.viewsh.module.ops.enums.PriorityEnum; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderDetailRespDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderDetailRespDTO.java similarity index 96% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderDetailRespDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderDetailRespDTO.java index 926bb260..f446e6d0 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderDetailRespDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderDetailRespDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderEventRespDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderEventRespDTO.java similarity index 96% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderEventRespDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderEventRespDTO.java index 930585a8..c6400cce 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderEventRespDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderEventRespDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderPageReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderPageReqDTO.java similarity index 96% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderPageReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderPageReqDTO.java index 010660ed..8d5c14ff 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderPageReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderPageReqDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import com.viewsh.framework.common.pojo.PageParam; import com.viewsh.framework.common.validation.InEnum; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderRespDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderRespDTO.java similarity index 98% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderRespDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderRespDTO.java index 102e5ba9..f972afcd 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderRespDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderRespDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderUpdateReqDTO.java b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderUpdateReqDTO.java similarity index 94% rename from viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderUpdateReqDTO.java rename to viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderUpdateReqDTO.java index 04b5447d..83586b67 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderUpdateReqDTO.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderUpdateReqDTO.java @@ -1,4 +1,4 @@ -package com.viewsh.module.ops.dal.dataobject.dto; +package com.viewsh.module.ops.service.order.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/service/order/OpsOrderServiceTest.java b/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/service/order/OpsOrderServiceTest.java index 130eb4f8..6d6c78db 100644 --- a/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/service/order/OpsOrderServiceTest.java +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/service/order/OpsOrderServiceTest.java @@ -2,7 +2,7 @@ package com.viewsh.module.ops.service.order; import com.viewsh.framework.common.pojo.PageResult; import com.viewsh.module.ops.core.lifecycle.OrderLifecycleManager; -import com.viewsh.module.ops.dal.dataobject.dto.*; +import com.viewsh.module.ops.service.order.dto.*; import com.viewsh.module.ops.dal.dataobject.workorder.OpsOrderDO; import com.viewsh.module.ops.dal.mysql.workorder.OpsOrderMapper; import com.viewsh.module.ops.enums.OperatorTypeEnum;