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-23 17:35:13 +08:00
parent f0c37a3a04
commit f97bf3b88e
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
byd-structuredplugins-serve/laws-base/laws-base-core/src/main/java/com/jero/common/constant/CommonConstant.java
+8
View File
@@ -346,4 +346,12 @@ public class CommonConstant {
*/
public static final String SPLIT_SOURCE_1 = "1";
public static final String SPLIT_SOURCE_2 = "2";
/**
* 在线编辑-查询类型
*/
// 查询基线版本、历史信息
public static final String ONLIOFFICE_QUERY_TYPE_1 = "1";
// 查询在线编辑文件表
public static final String ONLIOFFICE_QUERY_TYPE_2 = "2";
}
byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
+27 -9
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.exception.JeroBootException;
import com.jero.common.util.CommonUtils;
import com.jero.common.util.MinioUtil;
@@ -561,16 +562,33 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
String fileId = json.getString("fileId");
String watermark = json.getString("watermark");
BusProcessModelHis busProcessModelHis = this.processEditFile(fileId);
// 查询历史信息：1 是 2 否
String queryType = json.getString("queryType");
if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_1,queryType)) {
OnlineFileLog onlineFileLog = onlineFileLogDao.selectById(fileId);
resultSb.append(onlyOfficePreviewUrl);
resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
resultSb.append("fileType=").append("docx").append("&");
resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
resultSb.append("key=").append("key").append("&");
resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
resultSb.append("fileName=").append(busProcessModelHis.getFileName());
StringBuffer downloadFileUrl = new StringBuffer();
downloadFileUrl.append(downloadUrl).append(onlineFileLog.getFilePath() == null ? "" : onlineFileLog.getFilePath());
resultSb.append(onlyOfficePreviewUrl);
resultSb.append("oldFileName=").append(onlineFileLog.getFileName()).append("&");
resultSb.append("fileType=").append("docx").append("&");
resultSb.append("attId=").append(onlineFileLog.getAttFileId()).append("&");
resultSb.append("fileUrl=").append(downloadFileUrl.toString()).append("&");
resultSb.append("key=").append("key").append("&");
resultSb.append("filePath=").append(onlineFileLog.getFilePath()).append("&");
resultSb.append("fileName=").append(onlineFileLog.getFileName());
} else if (StringUtils.equals(CommonConstant.ONLIOFFICE_QUERY_TYPE_2,queryType)) {
BusProcessModelHis busProcessModelHis = this.processEditFile(fileId);
resultSb.append(onlyOfficePreviewUrl);
resultSb.append("oldFileName=").append(busProcessModelHis.getFileName()).append("&");
resultSb.append("fileType=").append("docx").append("&");
resultSb.append("attId=").append(busProcessModelHis.getId()).append("&");
resultSb.append("fileUrl=").append(busProcessModelHis.getDownLoadUrl()).append("&");
resultSb.append("key=").append("key").append("&");
resultSb.append("filePath=").append(busProcessModelHis.getEditFilePath()).append("&");
resultSb.append("fileName=").append(busProcessModelHis.getFileName());
}
return resultSb.toString();
}
}
byd-structuredplugins-serve/laws-single-startup/src/main/resources/application-dev.yml
+2 -1
View File
@@ -106,7 +106,7 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
datasource:
master:
url: jdbc:p6spy:mysql://121.36.69.172:3307/laws_byd_structuredplugins?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true
url: jdbc:p6spy:mysql://121.36.69.172:3307/laws_byd_structuredplugins_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true
username: root
password: hzwlsoft.com
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -222,6 +222,7 @@ mathToImg:
onlyOffice:
editorUrl: http://39.98.140.126:8999/editor?
previewUrl: http://39.98.140.126:8889/onlyOffice?
previewHistoryUrl: http://39.98.140.126:8889/viewHistoryOnlyOffice?
# 与比亚迪对接，调用的URL地址
byd: