From cd9bd7628fadabef5fee2b373b178eb7ecdcc196 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 12 Apr 2025 12:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=AD=A5=E3=80=91BOOT=20?= =?UTF-8?q?=E5=92=8C=20CLOUD=20=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WddPptApi.java => WenDuoDuoPptApi.java} | 122 +++-- .../{XunfeiPptApi.java => XunFeiPptApi.java} | 431 ++++-------------- .../codegen/CodegenServiceImplTest.java | 3 +- 3 files changed, 158 insertions(+), 398 deletions(-) rename yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/{WddPptApi.java => WenDuoDuoPptApi.java} (76%) rename yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/{XunfeiPptApi.java => XunFeiPptApi.java} (53%) diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java similarity index 76% rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java index c3757a73c..7622ce563 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WddPptApi.java +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/wenduoduo/api/WenDuoDuoPptApi.java @@ -8,6 +8,7 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; +import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; @@ -24,18 +25,17 @@ import java.util.Objects; import java.util.function.Function; import java.util.function.Predicate; -// TODO @新：要不改成 WenDuoDuoPptApi /** * 文多多 API * - * @see PPT 生成 API - * * @author xiaoxin + * @see PPT 生成 API */ @Slf4j -public class WddPptApi { +public class WenDuoDuoPptApi { public static final String BASE_URL = "https://docmee.cn"; + public static final String TOKEN_NAME = "token"; private final WebClient webClient; @@ -44,17 +44,19 @@ public class WddPptApi { private final Function>> EXCEPTION_FUNCTION = reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> { HttpRequest request = response.request(); - log.error("[wdd-api] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]", + log.error("[WenDuoDuoPptApi] 调用失败！请求方式:[{}]，请求地址:[{}]，请求参数:[{}]，响应数据: [{}]", request.getMethod(), request.getURI(), reqParam, responseBody); - sink.error(new IllegalStateException("[wdd-api] 调用失败！")); + sink.error(new IllegalStateException("[WenDuoDuoPptApi] 调用失败！")); }); - // TODO @新：是不是不用 baseUrl 哈 - public WddPptApi(String baseUrl) { + public WenDuoDuoPptApi(String token) { + Assert.hasText(token, "token 不能为空"); this.webClient = WebClient.builder() - .baseUrl(baseUrl) - // TODO @新：建议，token 作为 defaultHeader - .defaultHeaders((headers) -> headers.setContentType(MediaType.APPLICATION_JSON)) + .baseUrl(BASE_URL) + .defaultHeaders((headers) -> { + headers.setContentType(MediaType.APPLICATION_JSON); + headers.add(TOKEN_NAME, token); + }) .build(); } @@ -82,37 +84,16 @@ public class WddPptApi { .block(); } - // TODO @xin：是不是给个 API 连接，这样 type、content、files 都不用写注释太细了 /** * 创建任务 * * @param type 类型 - * 1.智能生成（主题、要求） - * 2.上传文件生成 - * 3.上传思维导图生成 - * 4.通过word精准转ppt - * 5.通过网页链接生成 - * 6.粘贴文本内容生成 - * 7.Markdown大纲生成 * @param content 内容 - * type=1 用户输入主题或要求（不超过1000字符） - * type=2、4 不传 - * type=3 幕布等分享链接 - * type=5 网页链接地址（http/https） - * type=6 粘贴文本内容（不超过20000字符） - * type=7 大纲内容（markdown） * @param files 文件列表 - * 文件列表（文件数不超过5个，总大小不超过50M）： - * type=1 上传参考文件（非必传，支持多个） - * type=2 上传文件（支持多个） - * type=3 上传思维导图（xmind/mm/md）（仅支持一个） - * type=4 上传word文件（仅支持一个） - * type=5、6、7 不传 - *

- * 支持格式：doc/docx/pdf/ppt/pptx/txt/md/xls/xlsx/csv/html/epub/mobi/xmind/mm - * @return 任务ID + * @return 任务 ID + * @see 创建任务 */ - public ApiResponse createTask(String token, Integer type, String content, List files) { + public ApiResponse createTask(Integer type, String content, List files) { MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("type", type); if (content != null) { @@ -125,7 +106,6 @@ public class WddPptApi { } return this.webClient.post() .uri("/api/ppt/v2/createTask") - .header("token", token) .contentType(MediaType.MULTIPART_FORM_DATA) .body(BodyInserters.fromMultipartData(formData)) .retrieve() @@ -168,10 +148,9 @@ public class WddPptApi { * @param request 请求体 * @return 模板列表 */ - public PagePptTemplateInfo getTemplatePage(String token, TemplateQueryRequest request) { + public PagePptTemplateInfo getTemplatePage(TemplateQueryRequest request) { return this.webClient.post() .uri("/api/ppt/templates") - .header("token", token) .bodyValue(request) .retrieve() .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request)) @@ -185,10 +164,9 @@ public class WddPptApi { * * @return 大纲内容流 */ - public Flux> createOutline(String token, CreateOutlineRequest request) { + public Flux> createOutline(CreateOutlineRequest request) { return this.webClient.post() .uri("/api/ppt/v2/generateContent") - .header("token", token) .body(Mono.just(request), CreateOutlineRequest.class) .retrieve() .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request)) @@ -202,10 +180,9 @@ public class WddPptApi { * @param request 请求体 * @return 大纲内容流 */ - public Flux> updateOutline(String token, UpdateOutlineRequest request) { + public Flux> updateOutline(UpdateOutlineRequest request) { return this.webClient.post() .uri("/api/ppt/v2/updateContent") - .header("token", token) .body(Mono.just(request), UpdateOutlineRequest.class) .retrieve() .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request)) @@ -218,11 +195,10 @@ public class WddPptApi { * * @return PPT信息 */ - public PptInfo create(String token, CreatePptRequest request) { + public PptInfo create(PptCreateRequest request) { return this.webClient.post() .uri("/api/ppt/v2/generatePptx") - .header("token", token) - .body(Mono.just(request), CreatePptRequest.class) + .body(Mono.just(request), PptCreateRequest.class) .retrieve() .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(request)) .bodyToMono(ApiResponse.class) @@ -236,7 +212,9 @@ public class WddPptApi { .block(); } - + /** + * 创建 Token 请求参数 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record CreateTokenRequest( String apiKey, @@ -258,7 +236,8 @@ public class WddPptApi { Integer code, String message, Map data - ) { } + ) { + } /** * 创建任务 @@ -268,7 +247,8 @@ public class WddPptApi { Integer type, String content, List files - ) { } + ) { + } /** * 生成大纲内容请求 @@ -281,7 +261,8 @@ public class WddPptApi { String audience, String lang, String prompt - ) { } + ) { + } /** * 修改大纲内容请求 @@ -291,20 +272,23 @@ public class WddPptApi { String id, String markdown, String question - ) { } + ) { + } /** - * 生成 PPT 请求 + * 生成 PPT 请求参数 */ - // TODO @新：要不按照 PptCreateRequest 这样的风格 @JsonInclude(value = JsonInclude.Include.NON_NULL) - public record CreatePptRequest( + public record PptCreateRequest( String id, String templateId, String markdown - ) { } + ) { + } - // TODO @新：要不写下类注释 + /** + * PPT 信息 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record PptInfo( String id, @@ -323,9 +307,12 @@ public class WddPptApi { LocalDateTime createTime, String createUser, String updateUser - ) { } + ) { + } - // TODO @新：要不写下类注释 + /** + * 模板查询请求参数 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record TemplateQueryRequest( int page, @@ -333,25 +320,33 @@ public class WddPptApi { Filter filters ) { + /** + * 模板查询过滤条件 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record Filter( int type, String category, String style, String themeColor - ) { } + ) { + } } - // TODO @新：要不写下类注释 + /** + * PPT模板分页信息 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record PagePptTemplateInfo( List data, String total - ) {} + ) { + } - - // TODO @新：要不写下类注释 + /** + * PPT模板信息 + */ @JsonInclude(value = JsonInclude.Include.NON_NULL) public record PptTemplateInfo( String id, @@ -380,6 +375,7 @@ public class WddPptApi { LocalDateTime createTime, String createUser, String updateUser - ) { } + ) { + } } \ No newline at end of file diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java similarity index 53% rename from yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java rename to yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java index c3320ef21..9c31269e5 100644 --- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunfeiPptApi.java +++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/xinghuo/api/XunFeiPptApi.java @@ -1,45 +1,44 @@ package cn.iocoder.yudao.framework.ai.core.model.xinghuo.api; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.digest.HmacAlgorithm; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.InvalidKeyException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; import java.util.function.Predicate; -// TODO @新：要不改成 XunFeiPptApi /** * 讯飞智能 PPT 生成 API * - * @see 智能 PPT 生成 API - * * @author xiaoxin + * @see 智能 PPT 生成 API */ @Slf4j -public class XunfeiPptApi { +public class XunFeiPptApi { public static final String BASE_URL = "https://zwapi.xfyun.cn/api/ppt/v2"; + private static final String HEADER_APP_ID = "appId"; + private static final String HEADER_TIMESTAMP = "timestamp"; + private static final String HEADER_SIGNATURE = "signature"; private final WebClient webClient; private final String appId; @@ -49,18 +48,21 @@ public class XunfeiPptApi { private final Function>> EXCEPTION_FUNCTION = reqParam -> response -> response.bodyToMono(String.class).handle((responseBody, sink) -> { - log.error("[xunfei-ppt-api] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody); - sink.error(new IllegalStateException("[xunfei-ppt-api] 调用失败！")); + log.error("[XunFeiPptApi] 调用失败！请求参数:[{}]，响应数据: [{}]", reqParam, responseBody); + sink.error(new IllegalStateException("[XunFeiPptApi] 调用失败！")); }); - // TODO @新：是不是不用 baseUrl 哈 - public XunfeiPptApi(String baseUrl, String appId, String apiSecret) { - // TODO @新：建议，增加 defaultheaders，例如说 appid 之类的；或者每个请求，通过 headers customer 处理。 - this.webClient = WebClient.builder() - .baseUrl(baseUrl) - .build(); + public XunFeiPptApi(String appId, String apiSecret) { this.appId = appId; this.apiSecret = apiSecret; + this.webClient = WebClient.builder() + .baseUrl(BASE_URL) + .defaultHeaders((headers) -> { + headers.setContentType(MediaType.APPLICATION_JSON); + headers.add(HEADER_APP_ID, appId); + }) + .build(); + } /** @@ -72,7 +74,7 @@ public class XunfeiPptApi { long timestamp = System.currentTimeMillis() / 1000; String ts = String.valueOf(timestamp); String signature = generateSignature(appId, apiSecret, timestamp); - return new SignatureInfo(appId, ts, signature); + return new SignatureInfo(ts, signature); } /** @@ -84,43 +86,8 @@ public class XunfeiPptApi { * @return 签名 */ private String generateSignature(String appId, String apiSecret, long timestamp) { - try { - // TODO @新：使用 hutool 简化 - String auth = md5(appId + timestamp); - return hmacSHA1Encrypt(auth, apiSecret); - } catch (NoSuchAlgorithmException | InvalidKeyException e) { - log.error("[xunfei-ppt-api] 生成签名失败", e); - throw new IllegalStateException("[xunfei-ppt-api] 生成签名失败"); - } - } - - /** - * HMAC SHA1 加密 - */ - private String hmacSHA1Encrypt(String encryptText, String encryptKey) - throws NoSuchAlgorithmException, InvalidKeyException { - SecretKeySpec keySpec = new SecretKeySpec( - encryptKey.getBytes(StandardCharsets.UTF_8), "HmacSHA1"); - - Mac mac = Mac.getInstance("HmacSHA1"); - mac.init(keySpec); - byte[] result = mac.doFinal(encryptText.getBytes(StandardCharsets.UTF_8)); - - return Base64.getEncoder().encodeToString(result); - } - - /** - * MD5 哈希 - */ - private String md5(String text) throws NoSuchAlgorithmException { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] digest = md.digest(text.getBytes(StandardCharsets.UTF_8)); - - StringBuilder sb = new StringBuilder(); - for (byte b : digest) { - sb.append(String.format("%02x", b)); - } - return sb.toString(); + String auth = SecureUtil.md5(appId + timestamp); + return SecureUtil.hmac(HmacAlgorithm.HmacSHA1, apiSecret).digestBase64(auth, false); } /** @@ -134,13 +101,11 @@ public class XunfeiPptApi { SignatureInfo signInfo = getSignature(); Map requestBody = new HashMap<>(); requestBody.put("style", style); - // TODO @新：可以使用 ObjUtil.defaultIfNull - requestBody.put("pageSize", pageSize != null ? pageSize : 10); + requestBody.put("pageSize", ObjUtil.defaultIfNull(pageSize, 20)); return this.webClient.post() .uri("/template/list") - .header("appId", signInfo.appId) - .header("timestamp", signInfo.timestamp) - .header("signature", signInfo.signature) + .header(HEADER_TIMESTAMP, signInfo.timestamp) + .header(HEADER_SIGNATURE, signInfo.signature) .contentType(MediaType.APPLICATION_JSON) .bodyValue(requestBody) .retrieve() @@ -161,9 +126,8 @@ public class XunfeiPptApi { formData.add("query", query); return this.webClient.post() .uri("/createOutline") - .header("appId", signInfo.appId) - .header("timestamp", signInfo.timestamp) - .header("signature", signInfo.signature) + .header(HEADER_TIMESTAMP, signInfo.timestamp) + .header(HEADER_SIGNATURE, signInfo.signature) .contentType(MediaType.MULTIPART_FORM_DATA) .body(BodyInserters.fromMultipartData(formData)) .retrieve() @@ -207,12 +171,11 @@ public class XunfeiPptApi { */ public CreateResponse create(CreatePptRequest request) { SignatureInfo signInfo = getSignature(); - MultiValueMap formData = buildCreateFormData(request); + MultiValueMap formData = buildCreatePptFormData(request); return this.webClient.post() .uri("/create") - .header("appId", signInfo.appId) - .header("timestamp", signInfo.timestamp) - .header("signature", signInfo.signature) + .header(HEADER_TIMESTAMP, signInfo.timestamp) + .header(HEADER_SIGNATURE, signInfo.signature) .contentType(MediaType.MULTIPART_FORM_DATA) .body(BodyInserters.fromMultipartData(formData)) .retrieve() @@ -247,9 +210,8 @@ public class XunfeiPptApi { SignatureInfo signInfo = getSignature(); return this.webClient.post() .uri("/createPptByOutline") - .header("appId", signInfo.appId) - .header("timestamp", signInfo.timestamp) - .header("signature", signInfo.signature) + .header(HEADER_TIMESTAMP, signInfo.timestamp) + .header(HEADER_SIGNATURE, signInfo.signature) .contentType(MediaType.APPLICATION_JSON) .bodyValue(request) .retrieve() @@ -271,9 +233,8 @@ public class XunfeiPptApi { .path("/progress") .queryParam("sid", sid) .build()) - .header("appId", signInfo.appId) - .header("timestamp", signInfo.timestamp) - .header("signature", signInfo.signature) + .header(HEADER_TIMESTAMP, signInfo.timestamp) + .header(HEADER_SIGNATURE, signInfo.signature) .retrieve() .onStatus(STATUS_PREDICATE, EXCEPTION_FUNCTION.apply(sid)) .bodyToMono(ProgressResponse.class) @@ -285,10 +246,10 @@ public class XunfeiPptApi { */ @JsonInclude(value = JsonInclude.Include.NON_NULL) private record SignatureInfo( - String appId, String timestamp, String signature - ) { } + ) { + } /** * 模板列表响应 @@ -300,7 +261,8 @@ public class XunfeiPptApi { String desc, Integer count, TemplatePageData data - ) { } + ) { + } /** * 模板列表数据 @@ -310,7 +272,8 @@ public class XunfeiPptApi { String total, List records, Integer pageNum - ) { } + ) { + } /** * 模板信息 @@ -324,7 +287,8 @@ public class XunfeiPptApi { String industry, String style, String detailImage - ) { } + ) { + } /** * 创建响应 @@ -336,7 +300,8 @@ public class XunfeiPptApi { String desc, Integer count, CreateResponseData data - ) { } + ) { + } /** * 创建响应数据 @@ -348,7 +313,8 @@ public class XunfeiPptApi { String title, String subTitle, OutlineData outline - ) { } + ) { + } /** * 大纲数据结构 @@ -375,7 +341,8 @@ public class XunfeiPptApi { @JsonInclude(value = JsonInclude.Include.NON_NULL) public record ChapterContent( String chapterTitle - ) { } + ) { + } } @@ -397,7 +364,8 @@ public class XunfeiPptApi { int code, String desc, ProgressResponseData data - ) { } + ) { + } /** * 进度响应数据 @@ -407,13 +375,12 @@ public class XunfeiPptApi { int process, String pptId, String pptUrl, - // TODO @新：字段注释，去掉 - String pptStatus, // PPT构建状态：building（构建中），done（已完成），build_failed（生成失败） - String aiImageStatus, // ai配图状态：building（构建中），done（已完成） - String cardNoteStatus, // 演讲备注状态：building（构建中），done（已完成） - String errMsg, // 生成PPT的失败信息 - Integer totalPages, // 生成PPT的总页数 - Integer donePages // 生成PPT的完成页数 + String pptStatus, + String aiImageStatus, + String cardNoteStatus, + String errMsg, + Integer totalPages, + Integer donePages ) { /** @@ -454,6 +421,7 @@ public class XunfeiPptApi { * 通过大纲创建 PPT 请求参数 */ @JsonInclude(value = JsonInclude.Include.NON_NULL) + @Builder public record CreatePptByOutlineRequest( String query, // 用户生成PPT要求（最多8000字） String outlineSid, // 已生成大纲后，响应返回的请求大纲唯一id @@ -469,122 +437,17 @@ public class XunfeiPptApi { Boolean isFigure, // 是否自动配图 String aiImage // ai配图类型：normal、advanced ) { - - /** - * 创建构建器 - * - * @return 构建器 - */ - public static Builder builder() { - return new Builder(); - } - - // TODO @新：这个可以用 lombok 简化么？ - /** - * 构建器类 - */ - public static class Builder { - - private String query; - private String outlineSid; - private OutlineData outline; - private String templateId; - private String businessId; - private String author; - private Boolean isCardNote; - private Boolean search; - private String language; - private String fileUrl; - private String fileName; - private Boolean isFigure; - private String aiImage; - - public Builder query(String query) { - this.query = query; - return this; - } - - public Builder outlineSid(String outlineSid) { - this.outlineSid = outlineSid; - return this; - } - - public Builder outline(OutlineData outline) { - this.outline = outline; - return this; - } - - public Builder templateId(String templateId) { - this.templateId = templateId; - return this; - } - - public Builder businessId(String businessId) { - this.businessId = businessId; - return this; - } - - public Builder author(String author) { - this.author = author; - return this; - } - - public Builder isCardNote(Boolean isCardNote) { - this.isCardNote = isCardNote; - return this; - } - - public Builder search(Boolean search) { - this.search = search; - return this; - } - - public Builder language(String language) { - this.language = language; - return this; - } - - public Builder fileUrl(String fileUrl) { - this.fileUrl = fileUrl; - return this; - } - - public Builder fileName(String fileName) { - this.fileName = fileName; - return this; - } - - public Builder isFigure(Boolean isFigure) { - this.isFigure = isFigure; - return this; - } - - public Builder aiImage(String aiImage) { - this.aiImage = aiImage; - return this; - } - - public CreatePptByOutlineRequest build() { - return new CreatePptByOutlineRequest( - query, outlineSid, outline, templateId, businessId, author, - isCardNote, search, language, fileUrl, fileName, isFigure, aiImage - ); - } - } } + /** * 构建创建 PPT 的表单数据 * * @param request 请求参数 * @return 表单数据 */ - private MultiValueMap buildCreateFormData(CreatePptRequest request) { + private MultiValueMap buildCreatePptFormData(CreatePptRequest request) { MultiValueMap formData = new LinkedMultiValueMap<>(); - // 添加请求参数 - if (request.query() != null) { - formData.add("query", request.query()); - } if (request.file() != null) { try { formData.add("file", new ByteArrayResource(request.file().getBytes()) { @@ -594,48 +457,51 @@ public class XunfeiPptApi { } }); } catch (IOException e) { - log.error("[xunfei-ppt-api] 文件处理失败", e); - throw new IllegalStateException("[xunfei-ppt-api] 文件处理失败", e); + log.error("[XunFeiPptApi] 文件处理失败", e); + throw new IllegalStateException("[XunFeiPptApi] 文件处理失败", e); } } - // TODO @新：要不搞个 MapUtil.addIfPresent 方法？ - if (request.fileUrl() != null) { - formData.add("fileUrl", request.fileUrl()); - } - if (request.fileName() != null) { - formData.add("fileName", request.fileName()); - } - if (request.templateId() != null) { - formData.add("templateId", request.templateId()); - } - if (request.businessId() != null) { - formData.add("businessId", request.businessId()); - } - if (request.author() != null) { - formData.add("author", request.author()); - } - if (request.isCardNote() != null) { - formData.add("isCardNote", request.isCardNote().toString()); - } - if (request.search() != null) { - formData.add("search", request.search().toString()); - } - if (request.language() != null) { - formData.add("language", request.language()); - } - if (request.isFigure() != null) { - formData.add("isFigure", request.isFigure().toString()); - } - if (request.aiImage() != null) { - formData.add("aiImage", request.aiImage()); - } + Map param = new HashMap<>(); + addIfPresent(param, "query", request.query()); + addIfPresent(param, "fileUrl", request.fileUrl()); + addIfPresent(param, "fileName", request.fileName()); + addIfPresent(param, "templateId", request.templateId()); + addIfPresent(param, "businessId", request.businessId()); + addIfPresent(param, "author", request.author()); + addIfPresent(param, "isCardNote", request.isCardNote()); + addIfPresent(param, "search", request.search()); + addIfPresent(param, "language", request.language()); + addIfPresent(param, "isFigure", request.isFigure()); + addIfPresent(param, "aiImage", request.aiImage()); + param.forEach(formData::add); return formData; } + public static void addIfPresent(Map map, K key, V value) { + if (ObjUtil.isNull(key) || ObjUtil.isNull(map)) { + return; + } + + boolean isPresent = false; + if (ObjUtil.isNotNull(value)) { + if (value instanceof String) { + // 字符串：需要有实际内容 + isPresent = StringUtils.hasText((String) value); + } else { + // 其他类型：非 null 即视为存在 + isPresent = true; + } + } + if (isPresent) { + map.put(key, value); + } + } + /** * 直接生成PPT请求参数 */ @JsonInclude(value = JsonInclude.Include.NON_NULL) + @Builder public record CreatePptRequest( String query, // 用户生成PPT要求（最多8000字） MultipartFile file, // 上传文件 @@ -651,109 +517,6 @@ public class XunfeiPptApi { String aiImage // ai配图类型：normal、advanced ) { - /** - * 创建构建器 - * - * @return 构建器 - */ - public static Builder builder() { - return new Builder(); - } - - /** - * 构建器类 - */ - public static class Builder { - - private String query; - private MultipartFile file; - private String fileUrl; - private String fileName; - private String templateId; - private String businessId; - private String author; - private Boolean isCardNote; - private Boolean search; - private String language; - private Boolean isFigure; - private String aiImage; - - // TODO @新：这个可以用 lombok 简化么？ - - public Builder query(String query) { - this.query = query; - return this; - } - - public Builder file(MultipartFile file) { - this.file = file; - return this; - } - - public Builder fileUrl(String fileUrl) { - this.fileUrl = fileUrl; - return this; - } - - public Builder fileName(String fileName) { - this.fileName = fileName; - return this; - } - - public Builder templateId(String templateId) { - this.templateId = templateId; - return this; - } - - public Builder businessId(String businessId) { - this.businessId = businessId; - return this; - } - - public Builder author(String author) { - this.author = author; - return this; - } - - public Builder isCardNote(Boolean isCardNote) { - this.isCardNote = isCardNote; - return this; - } - - public Builder search(Boolean search) { - this.search = search; - return this; - } - - public Builder language(String language) { - this.language = language; - return this; - } - - public Builder isFigure(Boolean isFigure) { - this.isFigure = isFigure; - return this; - } - - public Builder aiImage(String aiImage) { - this.aiImage = aiImage; - return this; - } - - public CreatePptRequest build() { - // 验证参数 - if (query == null && file == null && fileUrl == null) { - throw new IllegalArgumentException("query、file、fileUrl必填其一"); - } - if ((file != null || fileUrl != null) && fileName == null) { - throw new IllegalArgumentException("如果传file或者fileUrl，fileName必填"); - } - return new CreatePptRequest( - query, file, fileUrl, fileName, templateId, businessId, author, - isCardNote, search, language, isFigure, aiImage - ); - } - } } } \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java index dbc0842c6..ca0c576c1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime; import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime; import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; @@ -99,7 +100,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest { when(codegenBuilder.buildTable(same(tableInfo))).thenReturn(table); // mock 方法（AdminUserRespDTO） AdminUserRespDTO user = randomPojo(AdminUserRespDTO.class, o -> o.setNickname("芋头")); - when(userApi.getUser(eq(userId))).thenReturn(user); + when(userApi.getUser(eq(userId))).thenReturn(success(user)); // mock 方法（CodegenColumnDO） List columns = randomPojoList(CodegenColumnDO.class); when(codegenBuilder.buildColumns(eq(table.getId()), same(fields)))