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/dal/dataobject/dto/OpsOrderCancelReqDTO.java new file mode 100644 index 0000000..e10cff2 --- /dev/null +++ b/viewsh-module-ops/viewsh-module-ops-biz/src/main/java/com/viewsh/module/ops/dal/dataobject/dto/OpsOrderCancelReqDTO.java @@ -0,0 +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; + +} diff --git a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OpsOrderController.java b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OpsOrderController.java index 18c291d..03ce9e6 100644 --- a/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OpsOrderController.java +++ b/viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/OpsOrderController.java @@ -132,12 +132,9 @@ public class OpsOrderController { @PostMapping("/cancel") @Operation(summary = "取消工单") - @Parameter(name = "id", description = "工单ID", required = true) - @Parameter(name = "reason", description = "取消原因", required = true) @PreAuthorize("@ss.hasPermission('ops:order:cancel')") - public CommonResult cancelOrder(@RequestParam("id") Long id, - @RequestParam("reason") String reason) { - opsOrderService.cancelOrder(id, reason, OperatorTypeEnum.ADMIN, null); + public CommonResult cancelOrder(@Valid @RequestBody OpsOrderCancelReqDTO cancelReq) { + opsOrderService.cancelOrder(cancelReq.getId(), cancelReq.getReason(), OperatorTypeEnum.ADMIN, null); return success(true); }