From 43fc8e53eee921dc26995a354a93bd67273c429e Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Mon, 25 Mar 2024 09:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlyOfficeController.java | 69 +++++++++++-------- 1 file changed, 40 insertions(+), 29 deletions(-) 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 30c8d90..1d69f8d 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 @@ -529,38 +529,17 @@ public class OnlyOfficeController { // 查询总次数 int queryCount = 0; OnlineFileLog createTimeLatestOnlineFileLog = this.getCreateTimeLatestOnlineFileLog(fileId,now,queryCount); + + OnlineFileLog createTimeLatestOnlineFileLog2 = createTimeLatestOnlineFileLog; if (null != createTimeLatestOnlineFileLog) { - createTimeLatestOnlineFileLog.setJxFileName(jxFileName); - createTimeLatestOnlineFileLog.setDataType(dataType); +// createTimeLatestOnlineFileLog.setJxFileName(jxFileName); +// createTimeLatestOnlineFileLog.setDataType(dataType); + + createTimeLatestOnlineFileLog2.setJxFileName(jxFileName); + createTimeLatestOnlineFileLog2.setDataType(dataType); logger.info("更新基线信息结束=========================================="); - logger.info("推送保存基线版本文件信息开始=========================================="); - try { - // 推送保存基线版本文件信息 - RestTemplate restTemplate = new RestTemplate(); - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - - // 创建MultiValueMap对象，用于存储请求参数 - MultiValueMap params = new LinkedMultiValueMap<>(); - params.add("fileId", createTimeLatestOnlineFileLog.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id) - params.add("docId", createTimeLatestOnlineFileLog.getId()); // 基线文档主键id - - // 使用HttpEntity对象包装请求体和请求头 - HttpEntity> requestEntity = new HttpEntity<>(params, headers); - - // 发送POST请求并获取响应 - ResponseEntity responseEntity = restTemplate.postForEntity(bydSaveBaseLineDocIdUrl, requestEntity, String.class); - String body = responseEntity.getBody(); - logger.info("推送保存基线版本文件信息结果:" + body); - }catch (Exception ex){ - ex.printStackTrace(); - logger.error("推送保存基线版本文件信息失败:" + ex.getMessage()); - } - logger.info("推送保存基线版本文件信息结束=========================================="); - - // 将这个文件上传至比亚迪文件系统.并将该接口返回的data中的文件id,更新到该条数据中. logger.info("基线版本文件上传接口开始=========================================="); try { @@ -588,14 +567,46 @@ public class OnlyOfficeController { JSONObject jsonObject2 = JSONObject.parseObject(body2); String data = jsonObject2.getString("data"); createTimeLatestOnlineFileLog.setBydJxFileId(data); + createTimeLatestOnlineFileLog2.setId(data); + createTimeLatestOnlineFileLog2.setBydJxFileId(data); + + this.onlineFileLogDao.insert(createTimeLatestOnlineFileLog2); logger.info("基线版本文件上传接口结果:" + body2); + }catch (Exception ex){ ex.printStackTrace(); logger.error("基线版本文件上传失败:" + ex.getMessage()); } logger.info("基线版本文件上传接口结束=========================================="); - this.onlineFileLogDao.updateById(createTimeLatestOnlineFileLog); + + logger.info("推送保存基线版本文件信息开始=========================================="); + try { + // 推送保存基线版本文件信息 + RestTemplate restTemplate = new RestTemplate(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + + // 创建MultiValueMap对象，用于存储请求参数 + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id) + params.add("docId", createTimeLatestOnlineFileLog2.getId()); // 基线文档主键id + + // 使用HttpEntity对象包装请求体和请求头 + HttpEntity> requestEntity = new HttpEntity<>(params, headers); + + // 发送POST请求并获取响应 + ResponseEntity responseEntity = restTemplate.postForEntity(bydSaveBaseLineDocIdUrl, requestEntity, String.class); + String body = responseEntity.getBody(); + logger.info("推送保存基线版本文件信息结果:" + body); + }catch (Exception ex){ + ex.printStackTrace(); + logger.error("推送保存基线版本文件信息失败:" + ex.getMessage()); + } + logger.info("推送保存基线版本文件信息结束=========================================="); + +// this.onlineFileLogDao.updateById(createTimeLatestOnlineFileLog); + this.onlineFileLogDao.deleteById(createTimeLatestOnlineFileLog.getId()); } else { return Result.error("更新基线信息失败！"); }