refactor(render): 重构渲染工作器列表接口和 DTO

- 更新 RenderWorkerV2Client 中的 listWorkers 和 listWorkersWithConfig 方法返回类型
- 删除 RenderWorkerV2ListResponse 和 RenderWorkerV2WithConfigListResponse 类
- 更新 CreateRenderWorkerRequest 中的导入路径- 重构 RenderWorkerIntegrationService 中的 listWorkers 和 listWorkersWithConfig 方法
This commit is contained in:
2025-09-05 12:17:44 +08:00
parent aa4a6c29c6
commit 933a1209e7
5 changed files with 11 additions and 104 deletions

View File

@@ -47,7 +47,7 @@ public interface RenderWorkerV2Client {
* 分页查询工作器列表(核心信息) * 分页查询工作器列表(核心信息)
*/ */
@GetMapping @GetMapping
PageResponse<RenderWorkerV2ListResponse> listWorkers(@RequestParam(defaultValue = "1") Integer page, CommonResponse<PageResponse<RenderWorkerV2DTO>> listWorkers(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,
@RequestParam(required = false) Integer isEnabled, @RequestParam(required = false) Integer isEnabled,
@RequestParam(required = false) String name); @RequestParam(required = false) String name);
@@ -56,7 +56,7 @@ public interface RenderWorkerV2Client {
* 分页查询工作器列表(含配置信息) * 分页查询工作器列表(含配置信息)
*/ */
@GetMapping("/with-config") @GetMapping("/with-config")
PageResponse<RenderWorkerV2WithConfigListResponse> listWorkersWithConfig( CommonResponse<PageResponse<RenderWorkerV2WithConfigDTO>> listWorkersWithConfig(
@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer pageSize, @RequestParam(defaultValue = "10") Integer pageSize,
@RequestParam(required = false) Integer isEnabled, @RequestParam(required = false) Integer isEnabled,

View File

@@ -3,7 +3,7 @@ package com.ycwl.basic.integration.render.dto.worker;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
/** /**
* 创建渲染工作器请求DTO * 创建渲染工作器请求DTO

View File

@@ -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<RenderWorkerV2DTO> list;
/**
* 总数
*/
private String total;
/**
* 当前页
*/
private Integer page;
/**
* 页大小
*/
@SuppressWarnings("unused")
private Integer pageSize;
}

View File

@@ -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<RenderWorkerV2WithConfigDTO> list;
/**
* 总数
*/
private String total;
/**
* 当前页
*/
private Integer page;
/**
* 页大小
*/
@SuppressWarnings("unused")
private Integer pageSize;
}

View File

@@ -88,39 +88,24 @@ public class RenderWorkerIntegrationService {
/** /**
* 分页查询工作器列表(核心信息)(不降级) * 分页查询工作器列表(核心信息)(不降级)
*/ */
public List<RenderWorkerV2DTO> listWorkers(Integer page, Integer pageSize, Integer isEnabled, String name) { public PageResponse<RenderWorkerV2DTO> listWorkers(Integer page, Integer pageSize, Integer isEnabled, String name) {
log.info("分页查询渲染工作器列表, page: {}, pageSize: {}, isEnabled: {}, name: {}", log.info("分页查询渲染工作器列表, page: {}, pageSize: {}, isEnabled: {}, name: {}",
page, pageSize, isEnabled, name); page, pageSize, isEnabled, name);
try { CommonResponse<PageResponse<RenderWorkerV2DTO>> response =
PageResponse<RenderWorkerV2ListResponse> response =
renderWorkerV2Client.listWorkers(page, pageSize, isEnabled, name); renderWorkerV2Client.listWorkers(page, pageSize, isEnabled, name);
RenderWorkerV2ListResponse listResponse = handlePageResponse(response, "查询渲染工作器列表失败"); return handleResponse(response, "查询渲染工作器列表失败");
return listResponse != null && listResponse.getList() != null ?
listResponse.getList() : Collections.emptyList();
} catch (Exception e) {
log.error("查询渲染工作器列表异常", e);
return Collections.emptyList();
}
} }
/** /**
* 分页查询工作器列表(含配置信息)(不降级) * 分页查询工作器列表(含配置信息)(不降级)
*/ */
public List<RenderWorkerV2WithConfigDTO> listWorkersWithConfig(Integer page, Integer pageSize, public PageResponse<RenderWorkerV2WithConfigDTO> listWorkersWithConfig(Integer page, Integer pageSize,
Integer isEnabled, String name) { Integer isEnabled, String name) {
log.info("分页查询渲染工作器列表(含配置), page: {}, pageSize: {}, isEnabled: {}, name: {}", log.info("分页查询渲染工作器列表(含配置), page: {}, pageSize: {}, isEnabled: {}, name: {}",
page, pageSize, isEnabled, name); page, pageSize, isEnabled, name);
try { CommonResponse<PageResponse<RenderWorkerV2WithConfigDTO>> response =
PageResponse<RenderWorkerV2WithConfigListResponse> response =
renderWorkerV2Client.listWorkersWithConfig(page, pageSize, isEnabled, name); renderWorkerV2Client.listWorkersWithConfig(page, pageSize, isEnabled, name);
RenderWorkerV2WithConfigListResponse listResponse = return handleResponse(response, "查询渲染工作器列表(含配置)失败");
handlePageResponse(response, "查询渲染工作器列表(含配置)失败");
return listResponse != null && listResponse.getList() != null ?
listResponse.getList() : Collections.emptyList();
} catch (Exception e) {
log.error("查询渲染工作器列表(含配置)异常", e);
return Collections.emptyList();
}
} }
/** /**
@@ -180,16 +165,4 @@ public class RenderWorkerIntegrationService {
} }
} }
/**
* 处理分页响应
*/
private <T> T handlePageResponse(PageResponse<T> 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();
}
} }