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-01 16:57:41 +08:00
parent f80a55f665
commit f97b77a95a
4 changed files with 19 additions and 6 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
+8 -5
View File
@@ -142,7 +142,7 @@ public class OnlyOfficeController {
@ApiOperation(value = "|onlyOffice接收文件")
@PostMapping("/receiveFile")
public void receiveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId, String standName, String key) {
public void receiveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId, String standName, String key,String dataType,String jxFileName) {
logger.info("**********进入receiveFile接收文档接口************");
logger.info("**********fileNm************" + fileNm + "=======");
logger.info("**********standNo************" + standNo + "=======");
@@ -196,7 +196,7 @@ public class OnlyOfficeController {
key = keyObj.toString();
logger.info("**********key************" + key + "=======");
}
lawsUserInfoService.selectOnlineFile(fileId, standName, key);
lawsUserInfoService.selectOnlineFile(fileId, standName, key,dataType,jxFileName);
}
} catch (Exception ex) {
saved = 1;
@@ -219,7 +219,7 @@ public class OnlyOfficeController {
@ApiOperation(value = "|onlyOffice接收文件")
@PostMapping("/receiveFileBefore")
public void receiveFileBefore(HttpServletRequest request, HttpServletResponse response, String key, String fileNm, String standNo, String pid, String taskId, String standName) {
public void receiveFileBefore(HttpServletRequest request, HttpServletResponse response, String key, String fileNm, String standNo, String pid, String taskId, String standName,String dataType,String jxFileName) {
logger.info("**********进入receiveFileBefore接收文档接口************");
logger.info("**********fileNm************" + fileNm + "=======");
logger.info("**********standNo************" + standNo + "=======");
@@ -274,7 +274,7 @@ public class OnlyOfficeController {
key = keyObj.toString();
logger.info("**********key************" + key + "=======");
}
lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName, key);
lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName, key, dataType, jxFileName);
}
}
} catch (Exception ex) {
@@ -364,11 +364,12 @@ public class OnlyOfficeController {
@ApiOperation(value = "根据在线文件Id查询所有onlyoffice历史文件")
@GetMapping("/getAllOnlyOfficeHisFileById")
public Result<List<Map<String, String>>> getAllOnlyOfficeHisFileById(String fileId, String fileName) {
public Result<List<Map<String, String>>> getAllOnlyOfficeHisFileById(String fileId, String fileName,String dataType) {
List<Map<String, String>> fileList = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LambdaQueryWrapper<OnlineFileLog> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OnlineFileLog::getHisId, fileId);
wrapper.eq(OnlineFileLog::getDataType, dataType);
wrapper.eq(OnlineFileLog::getValidFlag, "0");
wrapper.orderByDesc(OnlineFileLog::getCreateTime);
List<OnlineFileLog> onlineFileLogList = onlineFileLogDao.selectList(wrapper);
@@ -381,6 +382,8 @@ public class OnlyOfficeController {
map.put("attFileId", onlineFileLog.getAttFileId());
map.put("createTime", sdf.format(onlineFileLog.getCreateTime()));
map.put("fileKey", onlineFileLog.getFileKey());
map.put("dataType", onlineFileLog.getDataType());
map.put("jxFileName", onlineFileLog.getJxFileName());
fileList.add(map);
}
return Result.OK(fileList);
byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/entity/OnlineFileLog.java
+6
View File
@@ -52,4 +52,10 @@ public class OnlineFileLog {
@ApiModelProperty(value = "文件key")
private String fileKey;
@ApiModelProperty(value = "数据类型：0历史数据 1基线保存数据")
private String dataType;
@ApiModelProperty(value = "基线保存文件名称")
private String jxFileName;
}
byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
+3 -1
View File
@@ -51,7 +51,7 @@ public class LawsUserInfoService {
* @param standName
* @param key
*/
public void selectOnlineFile(String onlineFileId, String standName, String key) {
public void selectOnlineFile(String onlineFileId, String standName, String key ,String dataType,String jxFileName) {
log.info("======================standName===============================！！！！！！！！！！！！！！！！！！！！！！" + standName);
String path = standEditFilePath + "hisFile/";
File file = null;
@@ -111,6 +111,8 @@ public class LawsUserInfoService {
onlineFileLog.setValidFlag("0");
onlineFileLog.setFileKey(key);
onlineFileLog.setFilePath(fileUrl);
onlineFileLog.setDataType(dataType);
onlineFileLog.setJxFileName(jxFileName);
onlineFileLogDao.insert(onlineFileLog);
log.info("======================日志存入成功===============================");
if (StringUtils.isNotBlank(standName)) {
byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+2
View File
@@ -430,9 +430,11 @@ public class FileSpiltService {
}
} catch (Exception e) {
log.info("拆分出现异常了：",e);
log.error(e.getMessage(),e);
return -1;
}
log.info("treeList长度：" + treeList.size());
if (treeList.size() > 0 && messageList.size() > 0) {
sarFileSplitMenuEOMapper.insertForeach(treeList);
for (int i = 0; i < messageList.size(); i++) {