diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/word/WordTemplateController.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/word/WordTemplateController.java index 0e20b09..eb36dcc 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/word/WordTemplateController.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/controller/admin/word/WordTemplateController.java @@ -1,6 +1,6 @@ package com.wmyun.module.infra.controller.admin.word; -import com.wmyun.framework.common.exception.ErrorCode; +import com.wmyun.farmwork.word.core.model.gen.TagsGenDataModel; import com.wmyun.framework.common.pojo.CommonResult; import com.wmyun.module.infra.service.file.WordTemplateTagService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Description: TODO * @Date: 2025/3/1 10:31 @@ -25,7 +27,7 @@ public class WordTemplateController { private WordTemplateTagService wordService; @PostMapping("file/{fileId}") - public CommonResult requestAllTags(@PathVariable("fileId") String fileId) { + public CommonResult> requestAllTags(@PathVariable("fileId") String fileId) { try { return CommonResult.success(wordService.queryAllTag(fileId)); } catch (Exception e) { diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagService.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagService.java index 8898892..93d665b 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagService.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagService.java @@ -1,5 +1,9 @@ package com.wmyun.module.infra.service.file; +import com.wmyun.farmwork.word.core.model.gen.TagsGenDataModel; + +import java.util.List; + /** * @Classname WordTemplateTagService * @Description TODO @@ -9,5 +13,5 @@ package com.wmyun.module.infra.service.file; public interface WordTemplateTagService { - Object queryAllTag(String fileId) throws Exception; + List queryAllTag(String fileId) throws Exception; } diff --git a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagServiceImpl.java b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagServiceImpl.java index 8051bd4..27db6ed 100644 --- a/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagServiceImpl.java +++ b/wmyun-module-infra/wmyun-module-infra-biz/src/main/java/com/wmyun/module/infra/service/file/WordTemplateTagServiceImpl.java @@ -33,7 +33,7 @@ public class WordTemplateTagServiceImpl implements WordTemplateTagService { private FileConfigService fileConfigService; @Override - public Object queryAllTag(String fileId) throws Exception { + public List queryAllTag(String fileId) throws Exception { FileDO file = previewService.queryFileInfoByFileId(fileId); FileClient client = fileConfigService.getFileClient(file.getConfigId()); byte[] content = client.getContent(file.getPath());