XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ops): 迁移 ops-biz 公共层 DTO 至 service/order/dto 包

Browse Source 
将 11 个工单 DTO 从 dal.dataobject.dto 包迁移至 service.order.dto 包，
DTO 属于业务契约而非数据库实体，放在 service 层更符合分层规范。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
lzh
2026-03-19 09:31:59 +08:00
parent c20a42f68a
commit 55e9003142
14 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderService.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/OpsOrderServiceImpl.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderAssignReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderAssignReqDTO.java
View File

@@ -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;

84
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogRespDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogRespDTO.java
View File

@@ -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<String, Object> 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<String, Object> extra;
}

46
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderBusinessLogsRespDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderBusinessLogsRespDTO.java
View File

@@ -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<OpsOrderBusinessLogRespDTO> 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<OpsOrderBusinessLogRespDTO> logs;
}

50
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCancelReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCancelReqDTO.java
View File

@@ -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;
}

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCompleteReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCompleteReqDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCreateReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderCreateReqDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderDetailRespDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderDetailRespDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderEventRespDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderEventRespDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderPageReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderPageReqDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderRespDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderRespDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderUpdateReqDTO.java → viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/service/order/dto/OpsOrderUpdateReqDTO.java
View File

@@ -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;

2
viewsh-module-ops/viewsh-module-ops-biz/src/test/java/com/viewsh/module/ops/service/order/OpsOrderServiceTest.java
View File

@@ -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;