BYD/structureplugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对接问题修改。

Browse Source
This commit is contained in:
wangzhijiang
2024-03-25 09:47:00 +08:00
parent bc32f17ca7
commit 43fc8e53ee
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+40 -29
View File
@@ -529,38 +529,17 @@ public class OnlyOfficeController {
// 查询总次数 // 查询总次数
int queryCount = 0; int queryCount = 0;
OnlineFileLog createTimeLatestOnlineFileLog = this.getCreateTimeLatestOnlineFileLog(fileId,now,queryCount); OnlineFileLog createTimeLatestOnlineFileLog = this.getCreateTimeLatestOnlineFileLog(fileId,now,queryCount);
OnlineFileLog createTimeLatestOnlineFileLog2 = createTimeLatestOnlineFileLog;
if (null != createTimeLatestOnlineFileLog) { if (null != createTimeLatestOnlineFileLog) {
createTimeLatestOnlineFileLog.setJxFileName(jxFileName); // createTimeLatestOnlineFileLog.setJxFileName(jxFileName);
createTimeLatestOnlineFileLog.setDataType(dataType); // createTimeLatestOnlineFileLog.setDataType(dataType);
createTimeLatestOnlineFileLog2.setJxFileName(jxFileName);
createTimeLatestOnlineFileLog2.setDataType(dataType);
logger.info("更新基线信息结束=========================================="); logger.info("更新基线信息结束==========================================");
logger.info("推送保存基线版本文件信息开始==========================================");
try {
// 推送保存基线版本文件信息
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
// 创建MultiValueMap对象，用于存储请求参数
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
params.add("fileId", createTimeLatestOnlineFileLog.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
params.add("docId", createTimeLatestOnlineFileLog.getId()); // 基线文档主键id
// 使用HttpEntity对象包装请求体和请求头
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
// 发送POST请求并获取响应
ResponseEntity<String> 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,更新到该条数据中. // 将这个文件上传至比亚迪文件系统.并将该接口返回的data中的文件id,更新到该条数据中.
logger.info("基线版本文件上传接口开始=========================================="); logger.info("基线版本文件上传接口开始==========================================");
try { try {
@@ -588,14 +567,46 @@ public class OnlyOfficeController {
JSONObject jsonObject2 = JSONObject.parseObject(body2); JSONObject jsonObject2 = JSONObject.parseObject(body2);
String data = jsonObject2.getString("data"); String data = jsonObject2.getString("data");
createTimeLatestOnlineFileLog.setBydJxFileId(data); createTimeLatestOnlineFileLog.setBydJxFileId(data);
createTimeLatestOnlineFileLog2.setId(data);
createTimeLatestOnlineFileLog2.setBydJxFileId(data);
this.onlineFileLogDao.insert(createTimeLatestOnlineFileLog2);
logger.info("基线版本文件上传接口结果:" + body2); logger.info("基线版本文件上传接口结果:" + body2);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
logger.error("基线版本文件上传失败:" + ex.getMessage()); logger.error("基线版本文件上传失败:" + ex.getMessage());
} }
logger.info("基线版本文件上传接口结束=========================================="); logger.info("基线版本文件上传接口结束==========================================");
this.onlineFileLogDao.updateById(createTimeLatestOnlineFileLog);
logger.info("推送保存基线版本文件信息开始==========================================");
try {
// 推送保存基线版本文件信息
RestTemplate restTemplate = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
// 创建MultiValueMap对象，用于存储请求参数
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
params.add("fileId", createTimeLatestOnlineFileLog2.getHisId()); // 每一次草稿的id(第一次发起文档编辑时的id)
params.add("docId", createTimeLatestOnlineFileLog2.getId()); // 基线文档主键id
// 使用HttpEntity对象包装请求体和请求头
HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
// 发送POST请求并获取响应
ResponseEntity<String> 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 { } else {
return Result.error("更新基线信息失败！"); return Result.error("更新基线信息失败！");
} }