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 c3f3b67..f9e11f1 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 @@ -67,6 +67,7 @@ public class DockingController { String title = json.getString("title"); String docId = json.getString("docId"); String filePath = json.getString("filePath"); + String token = json.getString("token"); SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); sarFileSplitInfoEO.setFileName(fileName); @@ -75,7 +76,7 @@ public class DockingController { sarFileSplitInfoEO.setTitle(title); sarFileSplitInfoEO.setId(docId); sarFileSplitInfoEO.setFilePath(filePath); - documentSplitService.add(sarFileSplitInfoEO, CommonConstant.SPLIT_SOURCE_2); + documentSplitService.add(token,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 02e4426..3409945 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 4578637..2329e4f 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(SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource); + void add(String token,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 dc59cb1..2d16910 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,9 +312,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } @Override - public void add(SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) { -// // 企标权限校验 -// enterpriseCheck(sarFileSplitInfoEO); + public void add(String token,SarFileSplitInfoEO sarFileSplitInfoEO,String splitSource) { // 唯一校验 uniqueCheck(sarFileSplitInfoEO); // 保存文本拆分数据 @@ -338,6 +336,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { RestTemplate restTemplate = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); + headers.add("Authorization",token); // 创建MultiValueMap对象,用于存储请求参数 MultiValueMap params = new LinkedMultiValueMap<>(); @@ -368,7 +367,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } }); thread.start(); - } @Override 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 f4dba96..7037b21 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 @@ -526,7 +526,7 @@ public class OnlyOfficeController { String jxFileName = json.getString("jxFileName"); String fileId = json.getString("fileId"); String appId = json.getString("appId"); - String token = json.getString("Authorization"); + String token = json.getString("token"); String dataType = "1"; Date now = new Date(); @@ -610,6 +610,11 @@ public class OnlyOfficeController { ResponseEntity responseEntity = restTemplate.postForEntity(bydSaveBaseLineDocIdUrl, requestEntity, String.class); String body = responseEntity.getBody(); logger.info("推送保存基线版本文件信息结果:" + body); + JSONObject jres = JSONObject.parseObject(body); + String code = jres.getString("code"); + if(!"000000".equals(code)){ + return Result.error(jres.getString("mesg")); + } }catch (Exception ex){ ex.printStackTrace(); logger.error("推送保存基线版本文件信息失败:" + ex.getMessage()); @@ -666,11 +671,8 @@ public class OnlyOfficeController { @ApiOperation(value = "关闭页面回调接口") @GetMapping("/onlyOfficeCloseTab") - public Result onlyOfficeCloseTab(String fileId, String appId, String Authorization, HttpServletResponse response, HttpServletRequest request) { + public Result onlyOfficeCloseTab(String fileId, String appId, String token, HttpServletResponse response, HttpServletRequest request) { try { -// String appId = request.getParameter("appId"); -// String token = request.getParameter("Authorization"); - String token = Authorization; RestTemplate restTemplate = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON);