From 22d2a4605d0e1301af9956da1c923be5d2921763 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 17 Nov 2025 10:35:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/web/service/common/DocumentService.java | 2 +- .../com/bonus/web/service/enterprise/TechnicalService.java | 6 ++++++ .../com/bonus/common/domain/file/vo/OnlyOfficeConfig.java | 1 + .../java/com/bonus/file/service/OnlyOfficeService2.java | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/service/common/DocumentService.java b/bonus-admin/src/main/java/com/bonus/web/service/common/DocumentService.java index 58058f2..617b214 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/common/DocumentService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/common/DocumentService.java @@ -73,7 +73,7 @@ public class DocumentService { */ public String handleCallback(Callback callback, String fileUrl, HttpServletRequest request, HttpServletResponse response) { try { - log.info("收到 OnlyOffice 回调, 状态: {}, Key: {}", callback.getStatus(), callback.getKey()); + log.info("收到 OnlyOffice 回调, 状态: {}", callback.getStatus()); log.info("callback:{}",callback); // onlyOfficeService.handleCallback(callback,response); return onlyOfficeService2.handleCallback(callback,fileUrl,request,response); diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java index 3781168..c6dbf2c 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java @@ -252,6 +252,12 @@ public class TechnicalService { */ public List getList(TechnicalDto.TechnicalDataDto dto) { List list = imdTechnicalService.getList(dto); + for (TechnicalVo.Technical technical : list) { + // 查询关联资源文件 + List fileVoList = sourceFileService.getFilesByTable(technical.getTechnicalSolutionId(),TableConstants.TB_ENTERPRISE_TECHNICAL_SOLUTION); + technical.setResourceFileVoList(fileVoList); + } + return list; } diff --git a/bonus-common/src/main/java/com/bonus/common/domain/file/vo/OnlyOfficeConfig.java b/bonus-common/src/main/java/com/bonus/common/domain/file/vo/OnlyOfficeConfig.java index b18a7d9..74316df 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/file/vo/OnlyOfficeConfig.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/file/vo/OnlyOfficeConfig.java @@ -64,6 +64,7 @@ public class OnlyOfficeConfig implements Serializable { @NoArgsConstructor public static class EditorConfig implements Serializable { private static final long serialVersionUID = 1L; + private String mode; private String callbackUrl; private String lang; private CoEditing coEditing; diff --git a/bonus-file/src/main/java/com/bonus/file/service/OnlyOfficeService2.java b/bonus-file/src/main/java/com/bonus/file/service/OnlyOfficeService2.java index dc31165..7949564 100644 --- a/bonus-file/src/main/java/com/bonus/file/service/OnlyOfficeService2.java +++ b/bonus-file/src/main/java/com/bonus/file/service/OnlyOfficeService2.java @@ -113,7 +113,7 @@ public class OnlyOfficeService2 { String encodeFileUrl = URLEncoder.encode(fileVo.getFilePath(), "UTF-8"); String newCallbackUrl = StringUtils.format("{}?fileUrl={}", callbackUrl, encodeFileUrl); editorConfig.setCallbackUrl(newCallbackUrl); - + editorConfig.setMode(mode); OnlyOfficeConfig.Config.EditorConfig.User user = editorConfig.getUser(); user.setId(String.valueOf(getCurrentUserId())); user.setName(getCurrentUserName());