From 2c565c60fabc3a9273cde9c3cf70ecd52ddf663d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 26 Mar 2024 16:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlyOfficeController.java | 39 ++++++++++++++++++- .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) 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 b63abff..f4dba96 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 @@ -108,6 +108,10 @@ public class OnlyOfficeController { @Value("${byd.uploadFileUrl}") private String bydUploadFileUrl; + @Value("${byd.unlockUrl}") + private String unlockUrl; + + @ApiOperation(value = "分页查询") @GetMapping("/pageList") public Result> pageList(HttpServletRequest req, BusProcessModelHis processModelHis, @@ -521,6 +525,8 @@ public class OnlyOfficeController { public Result updateOnlineFileLogJxInfo(@RequestBody JSONObject json){ String jxFileName = json.getString("jxFileName"); String fileId = json.getString("fileId"); + String appId = json.getString("appId"); + String token = json.getString("Authorization"); String dataType = "1"; Date now = new Date(); @@ -547,7 +553,8 @@ public class OnlyOfficeController { HttpHeaders headers2 = new HttpHeaders(); headers2.setContentType(MediaType.MULTIPART_FORM_DATA); - + headers2.add("appId",appId); + headers2.add("Authorization",token); // 创建MultiValueMap对象，用于存储请求参数 MultiValueMap params2 = new LinkedMultiValueMap<>(); @@ -577,6 +584,7 @@ public class OnlyOfficeController { }catch (Exception ex){ ex.printStackTrace(); logger.error("基线版本文件上传失败:" + ex.getMessage()); + return Result.error("更新基线信息失败！"); } logger.info("基线版本文件上传接口结束=========================================="); @@ -587,6 +595,8 @@ public class OnlyOfficeController { RestTemplate restTemplate = new RestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); + headers.add("appId",appId); + headers.add("Authorization",token); // 创建MultiValueMap对象，用于存储请求参数 MultiValueMap params = new LinkedMultiValueMap<>(); @@ -603,6 +613,7 @@ public class OnlyOfficeController { }catch (Exception ex){ ex.printStackTrace(); logger.error("推送保存基线版本文件信息失败:" + ex.getMessage()); + return Result.error("更新基线信息失败！"); } logger.info("推送保存基线版本文件信息结束=========================================="); @@ -653,6 +664,32 @@ public class OnlyOfficeController { return result; } + @ApiOperation(value = "关闭页面回调接口") + @GetMapping("/onlyOfficeCloseTab") + public Result onlyOfficeCloseTab(String fileId, String appId, String Authorization, 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); + headers.add("appId",appId); + headers.add("Authorization",token); + // 创建MultiValueMap对象，用于存储请求参数 + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("fileId", fileId); + // 使用HttpEntity对象包装请求体和请求头 + HttpEntity> requestEntity = new HttpEntity<>(params, headers); + // 发送POST请求并获取响应 + ResponseEntity responseEntity = restTemplate.postForEntity(unlockUrl, requestEntity, String.class); + String body = responseEntity.getBody(); + logger.info("关闭页面回调接口:" + body); + }catch (Exception ex){ + ex.printStackTrace(); + } + return Result.OK(); + } @ApiOperation(value = "|File|在线编辑下载docx文件") @GetMapping("/onlyOfficeDownloadDocxFile") diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml index 314fc1f..e0b4416 100644 --- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml +++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml @@ -236,4 +236,5 @@ byd: saveBaseLineDocIdUrl: http://127.0.0.1:9998/saveBaseLineDocIdUrl splitResultUrl: http://127.0.0.1:9998/splitResultUrl downLoadFileUrl: http://127.0.0.1:9998/downLoadFileUrl + unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml index e60367b..11366fe 100644 --- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml +++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-prod.yml @@ -220,3 +220,4 @@ byd: saveBaseLineDocIdUrl: http://127.0.0.1:9998/api/qbp/organization/saveBaseLineDocId splitResultUrl: http://127.0.0.1:9998/api/qbp/library/structured downLoadFileUrl: http://127.0.0.1:9998/ipd-files/file/downLoad + unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock diff --git a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml index 14244c7..8373fe7 100644 --- a/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml +++ b/byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-test.yml @@ -232,3 +232,4 @@ byd: saveBaseLineDocIdUrl: http://127.0.0.1:9998/saveBaseLineDocIdUrl splitResultUrl: http://127.0.0.1:9998/splitResultUrl downLoadFileUrl: http://127.0.0.1:9998/downLoadFileUrl + unlockUrl: http://127.0.0.1:9998/api/qbp/document/unlock