From 933a1209e7bfe4dea817a0a06eb52a2c8df466ee Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 5 Sep 2025 12:17:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(render):=20=E9=87=8D=E6=9E=84=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E5=B7=A5=E4=BD=9C=E5=99=A8=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=92=8C=20DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 RenderWorkerV2Client 中的 listWorkers 和 listWorkersWithConfig 方法返回类型 - 删除 RenderWorkerV2ListResponse 和 RenderWorkerV2WithConfigListResponse 类 - 更新 CreateRenderWorkerRequest 中的导入路径- 重构 RenderWorkerIntegrationService 中的 listWorkers 和 listWorkersWithConfig 方法 --- .../render/client/RenderWorkerV2Client.java | 4 +- .../dto/worker/CreateRenderWorkerRequest.java | 2 +- .../worker/RenderWorkerV2ListResponse.java | 33 -------------- .../RenderWorkerV2WithConfigListResponse.java | 33 -------------- .../RenderWorkerIntegrationService.java | 43 ++++--------------- 5 files changed, 11 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2ListResponse.java delete mode 100644 src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2WithConfigListResponse.java diff --git a/src/main/java/com/ycwl/basic/integration/render/client/RenderWorkerV2Client.java b/src/main/java/com/ycwl/basic/integration/render/client/RenderWorkerV2Client.java index b73df45..c6c923c 100644 --- a/src/main/java/com/ycwl/basic/integration/render/client/RenderWorkerV2Client.java +++ b/src/main/java/com/ycwl/basic/integration/render/client/RenderWorkerV2Client.java @@ -47,7 +47,7 @@ public interface RenderWorkerV2Client { * 分页查询工作器列表（核心信息） */ @GetMapping - PageResponse listWorkers(@RequestParam(defaultValue = "1") Integer page, + CommonResponse> listWorkers(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(required = false) Integer isEnabled, @RequestParam(required = false) String name); @@ -56,7 +56,7 @@ public interface RenderWorkerV2Client { * 分页查询工作器列表（含配置信息） */ @GetMapping("/with-config") - PageResponse listWorkersWithConfig( + CommonResponse> listWorkersWithConfig( @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(required = false) Integer isEnabled, diff --git a/src/main/java/com/ycwl/basic/integration/render/dto/worker/CreateRenderWorkerRequest.java b/src/main/java/com/ycwl/basic/integration/render/dto/worker/CreateRenderWorkerRequest.java index d7d3493..7947d8c 100644 --- a/src/main/java/com/ycwl/basic/integration/render/dto/worker/CreateRenderWorkerRequest.java +++ b/src/main/java/com/ycwl/basic/integration/render/dto/worker/CreateRenderWorkerRequest.java @@ -3,7 +3,7 @@ package com.ycwl.basic.integration.render.dto.worker; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 创建渲染工作器请求DTO diff --git a/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2ListResponse.java b/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2ListResponse.java deleted file mode 100644 index a70d365..0000000 --- a/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2ListResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ycwl.basic.integration.render.dto.worker; - -import lombok.Data; - -import java.util.List; - -/** - * 渲染工作器列表响应DTO - */ -@Data -public class RenderWorkerV2ListResponse { - - /** - * 工作器列表 - */ - private List list; - - /** - * 总数 - */ - private String total; - - /** - * 当前页 - */ - private Integer page; - - /** - * 页大小 - */ - @SuppressWarnings("unused") - private Integer pageSize; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2WithConfigListResponse.java b/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2WithConfigListResponse.java deleted file mode 100644 index e326742..0000000 --- a/src/main/java/com/ycwl/basic/integration/render/dto/worker/RenderWorkerV2WithConfigListResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ycwl.basic.integration.render.dto.worker; - -import lombok.Data; - -import java.util.List; - -/** - * 带配置的渲染工作器列表响应DTO - */ -@Data -public class RenderWorkerV2WithConfigListResponse { - - /** - * 工作器列表 - */ - private List list; - - /** - * 总数 - */ - private String total; - - /** - * 当前页 - */ - private Integer page; - - /** - * 页大小 - */ - @SuppressWarnings("unused") - private Integer pageSize; -} \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/integration/render/service/RenderWorkerIntegrationService.java b/src/main/java/com/ycwl/basic/integration/render/service/RenderWorkerIntegrationService.java index e33920a..5bd1700 100644 --- a/src/main/java/com/ycwl/basic/integration/render/service/RenderWorkerIntegrationService.java +++ b/src/main/java/com/ycwl/basic/integration/render/service/RenderWorkerIntegrationService.java @@ -88,39 +88,24 @@ public class RenderWorkerIntegrationService { /** * 分页查询工作器列表（核心信息）（不降级） */ - public List listWorkers(Integer page, Integer pageSize, Integer isEnabled, String name) { + public PageResponse listWorkers(Integer page, Integer pageSize, Integer isEnabled, String name) { log.info("分页查询渲染工作器列表, page: {}, pageSize: {}, isEnabled: {}, name: {}", page, pageSize, isEnabled, name); - try { - PageResponse response = - renderWorkerV2Client.listWorkers(page, pageSize, isEnabled, name); - RenderWorkerV2ListResponse listResponse = handlePageResponse(response, "查询渲染工作器列表失败"); - return listResponse != null && listResponse.getList() != null ? - listResponse.getList() : Collections.emptyList(); - } catch (Exception e) { - log.error("查询渲染工作器列表异常", e); - return Collections.emptyList(); - } + CommonResponse> response = + renderWorkerV2Client.listWorkers(page, pageSize, isEnabled, name); + return handleResponse(response, "查询渲染工作器列表失败"); } /** * 分页查询工作器列表（含配置信息）（不降级） */ - public List listWorkersWithConfig(Integer page, Integer pageSize, + public PageResponse listWorkersWithConfig(Integer page, Integer pageSize, Integer isEnabled, String name) { log.info("分页查询渲染工作器列表(含配置), page: {}, pageSize: {}, isEnabled: {}, name: {}", page, pageSize, isEnabled, name); - try { - PageResponse response = - renderWorkerV2Client.listWorkersWithConfig(page, pageSize, isEnabled, name); - RenderWorkerV2WithConfigListResponse listResponse = - handlePageResponse(response, "查询渲染工作器列表(含配置)失败"); - return listResponse != null && listResponse.getList() != null ? - listResponse.getList() : Collections.emptyList(); - } catch (Exception e) { - log.error("查询渲染工作器列表(含配置)异常", e); - return Collections.emptyList(); - } + CommonResponse> response = + renderWorkerV2Client.listWorkersWithConfig(page, pageSize, isEnabled, name); + return handleResponse(response, "查询渲染工作器列表(含配置)失败"); } /** @@ -180,16 +165,4 @@ public class RenderWorkerIntegrationService { } } - /** - * 处理分页响应 - */ - private T handlePageResponse(PageResponse response, String errorMessage) { - if (response == null || !response.getSuccess()) { - String msg = response != null && response.getMessage() != null ? - response.getMessage() : errorMessage; - Integer code = response != null ? response.getCode() : 5000; - throw new IntegrationException(code, msg, SERVICE_NAME); - } - return response.getData(); - } } \ No newline at end of file