对接问题修改。

This commit is contained in:
wangzhijiang
2024-03-23 19:04:56 +08:00
parent f97bf3b88e
commit bc32f17ca7
2 changed files with 9 additions and 5 deletions
@@ -8,6 +8,7 @@ import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.util.CommonUtils; import com.jero.common.util.CommonUtils;
import com.jero.common.util.DateUtils;
import com.jero.common.util.MinioUtil; import com.jero.common.util.MinioUtil;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.onlyoffice.entity.BusProcessModelHis; import com.jero.modules.onlyoffice.entity.BusProcessModelHis;
@@ -81,6 +82,9 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
@Value("${onlyOffice.previewUrl}") @Value("${onlyOffice.previewUrl}")
private String onlyOfficePreviewUrl; private String onlyOfficePreviewUrl;
@Value("${onlyOffice.previewHistoryUrl}")
private String previewHistoryUrl;
@Override @Override
public BusProcessModelHis saveEditFile(String model) { public BusProcessModelHis saveEditFile(String model) {
BusProcessModelHis modelHis = new BusProcessModelHis(); BusProcessModelHis modelHis = new BusProcessModelHis();
@@ -569,12 +573,12 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
StringBuffer downloadFileUrl = new StringBuffer(); StringBuffer downloadFileUrl = new StringBuffer();
downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath()); downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
resultSb.append(onlyOfficePreviewUrl); resultSb.append(previewHistoryUrl);
resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&"); resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
resultSb.append("fileType=").append("docx").append("&"); resultSb.append("fileType=").append("docx").append("&");
resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&"); resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&"); resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
resultSb.append("key=").append("key").append("&"); resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&"); resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
resultSb.append("fileName=").append(onlineFileLog.getFileName()); resultSb.append("fileName=").append(onlineFileLog.getFileName());
} else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) { } else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) {
@@ -585,7 +589,7 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
resultSb.append("fileType=").append("docx").append("&"); resultSb.append("fileType=").append("docx").append("&");
resultSb.append("attId=").append(busProcessModelHis.getId()).append("&"); resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&"); resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
resultSb.append("key=").append("key").append("&"); resultSb.append("key=").append(DateUtils.getCurrentTimestamp()).append("&");
resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&"); resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
resultSb.append("fileName=").append(busProcessModelHis.getFileName()); resultSb.append("fileName=").append(busProcessModelHis.getFileName());
} }
@@ -221,8 +221,8 @@ mathToImg:
# onlyOffice在线编辑页Url # onlyOffice在线编辑页Url
onlyOffice: onlyOffice:
editorUrl: http://39.98.140.126:8999/editor? editorUrl: http://39.98.140.126:8999/editor?
previewUrl: http://39.98.140.126:8889/onlyOffice? previewUrl: http://39.98.140.126:8999/onlyOffice?
previewHistoryUrl: http://39.98.140.126:8889/viewHistoryOnlyOffice? previewHistoryUrl: http://39.98.140.126:8999/viewHistoryOnlyOffice?
# 与比亚迪对接,调用的URL地址 # 与比亚迪对接,调用的URL地址
byd: byd: