FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
在线编辑 文件日志更新

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!84
This commit is contained in:
高嵩
2023-05-22 18:08:11 +08:00
parent 11ac28f0c8 aba2536836
commit 3d55a51650
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+10 -3
View File
@@ -1041,7 +1041,7 @@ public class WorkFlowController extends BaseController {
@ApiOperation(value = "查找在线编辑文件")
@GetMapping("/selectOnlineFile")
public ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId) {
public ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName) {
String path = standEditFilePath+"/hisFile/";
File file = null;
FileOutputStream fileOutputStream = null;
@@ -1092,6 +1092,13 @@ public class WorkFlowController extends BaseController {
onlineFileLog.setValidFlag("0");
onlineFileLogDao.insert(onlineFileLog);
logger.info("======================日志存入成功==============================="+onlineFileLog.toString());
if(StringUtils.isNotBlank(standName)) {
AttFileEO attFileEO = new AttFileEO();
attFileEO.setId(attFileVo.getId());
attFileEO.setOldFileName(standName);
attFileEOService.updateById(attFileEO);
logger.info("======================文件名称修改成功==============================="+attFileEO.toString());
}
//删除媒介桥梁文件
if(file.delete()){
//删除文件名称
@@ -1131,10 +1138,10 @@ public class WorkFlowController extends BaseController {
logger.info("删除成功"+onlineFileLogs.get(0).getId());
}else {
logger.info("======================文件日志记录小于10==============================="+onlineFileLogs.size());
return Result.success(attFileVo.getId());
return Result.success();
}
}
return Result.success(attFileVo.getId());
return Result.success();
}
@ApiOperation(value = "查询问题和回答")