From 3aa1c0763c9932c4eff39d11c632fd4451c52b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 29 Mar 2024 16:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/docking/controller/DockingController.java | 3 ++- .../documenttool/controller/DocumentSplitController.java | 2 +- .../modules/documenttool/service/IDocumentSplitService.java | 2 +- .../documenttool/service/impl/DocumentSplitServiceImpl.java | 4 ++-- .../modules/onlyoffice/controller/OnlyOfficeController.java | 1 + .../com/jero/modules/split/service/impl/FileSpiltService.java | 4 +++- .../split/service/impl/SarFileSplitInfoServiceImpl.java | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java index f9e11f1..bc67309 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/docking/controller/DockingController.java @@ -68,6 +68,7 @@ public class DockingController { String docId = json.getString("docId"); String filePath = json.getString("filePath"); String token = json.getString("token"); + String appId = json.getString("appId"); SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); sarFileSplitInfoEO.setFileName(fileName); @@ -76,7 +77,7 @@ public class DockingController { sarFileSplitInfoEO.setTitle(title); sarFileSplitInfoEO.setId(docId); sarFileSplitInfoEO.setFilePath(filePath); - documentSplitService.add(token,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2); + documentSplitService.add(token,appId,sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2); Map resultMap = new HashMap<>(); resultMap.put("infoId",docId); diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java index 3409945..aeb1c16 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/controller/DocumentSplitController.java @@ -140,7 +140,7 @@ public class DocumentSplitController { @PostMapping(value = "/split") @ApiOperationSupport(order = 6) public Result split(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { - documentSplitService.add("",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1); + documentSplitService.add("","",sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_1); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java index 2329e4f..4ff9178 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/IDocumentSplitService.java @@ -66,7 +66,7 @@ public interface IDocumentSplitService { * 文档拆分-拆分 * @param sarFileSplitInfoEO */ - void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource); + void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource); /** * 拆分文档保存 diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java index 615aafe..d16b2ad 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -312,7 +312,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } @Override - public void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) { + public void add(String token,String appId,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) { // 唯一校验 uniqueCheck(sarFileSplitInfoEO); // 保存文本拆分数据 @@ -323,7 +323,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { //拆分 int count = -1; try{ - count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource); + count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT,splitSource,token,appId); }catch (Exception e){ log.error("拆分标准失败:" + e.getMessage()); } diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java index b82df16..410312f 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java @@ -603,6 +603,7 @@ public class OnlyOfficeController { Map params = new HashMap<>(); params.put("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id) params.put("docId", createTimeLatestOnlineFileLog2.getId()); // 基线文档主键id + params.put("jxFileName", jxFileName); // 基线文档名称 // 使用HttpEntity对象包装请求体和请求头 HttpEntity> requestEntity = new HttpEntity<>(params, headers); diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 62391d2..8dfef8b 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -141,7 +141,7 @@ public class FileSpiltService { * @param enumByValue * @return */ - public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource) { + public int fileCHN(SarFileSplitInfoEO sarFileSplitInfoEO, SplitFileTypeTypeEnum enumByValue,String splitSource,String token,String appId) { if (sarFileSplitInfoEO.getStopNumber() <= 0) { sarFileSplitInfoEO.setStopNumber(200); } @@ -223,6 +223,8 @@ public class FileSpiltService { RestTemplate restTemplate = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); + headers.add("Authorization",token); + headers.add("appId",appId); // 创建MultiValueMap对象，用于存储请求参数 Map params = new HashMap<>(); diff --git a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 7166ed5..b5e42c1 100644 --- a/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -96,7 +96,7 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl