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

合并分支 'dev_20230216' 到 'master'

Browse Source 
在线编辑 日志

查看合并请求 laws-foton-slrs/foton-wkflow-rest!49
This commit is contained in:
高嵩
2023-05-22 18:08:26 +08:00
parent f1d11774c9 f4d076fb5f
commit d030fa1898
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -220,5 +220,5 @@ public interface LawsUserInfoService {
List<EsRevisePlanDTO> getAllPlansByWkInfo(); List<EsRevisePlanDTO> getAllPlansByWkInfo();
@GetMapping("lawss/activiti/selectOnlineFile") @GetMapping("lawss/activiti/selectOnlineFile")
ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId); ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName);
} }
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java
+5 -23
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog; import com.ydw.bat.wkflow.business_main.datas.entity.OnlineFileLog;
import com.ydw.bat.wkflow.business_main.datas.entity.ResponseMessage;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessModelHisMapper;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -88,26 +89,16 @@ public class BusProcessModelHisController {
try { try {
logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri);
if (StringUtils.isNotEmpty(downloadUri)) { if (StringUtils.isNotEmpty(downloadUri)) {
String fileName = standName;
if(StringUtils.isNotBlank(fileNm)){
String[] split = fileNm.split("\\.");
List<String> asList = Arrays.asList(split);
if(asList.size()>1){
fileName = standName+"."+split[1];
logger.info("**********fileName************"+fileName+"=======");
}
}
StringBuilder builder=new StringBuilder(); StringBuilder builder=new StringBuilder();
builder.append(standEditFilePath); builder.append(standEditFilePath);
builder.append(standNo).append("/"); builder.append(standNo).append("/");
builder.append(fileName); builder.append(fileNm);
// builder.append(fileNm);
String saveFileUrl = builder.toString(); String saveFileUrl = builder.toString();
File file = new File(saveFileUrl); File file = new File(saveFileUrl);
downloadNetFile(downloadUri, file); downloadNetFile(downloadUri, file);
// 更新在线编辑当前节点编辑状态 // 更新在线编辑当前节点编辑状态
busProcessModelHisService.modelHisOneUpdStatusById(fileId); busProcessModelHisService.modelHisOneUpdStatusById(fileId);
lawsUserInfoService.selectOnlineFile(fileId); ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId, standName);
} }
} catch (Exception ex) { } catch (Exception ex) {
saved = 1; saved = 1;
@@ -168,19 +159,10 @@ public class BusProcessModelHisController {
try { try {
logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri);
if (StringUtils.isNotEmpty(downloadUri)) { if (StringUtils.isNotEmpty(downloadUri)) {
String fileName = standName;
if(StringUtils.isNotBlank(fileNm)){
String[] split = fileNm.split("\\.");
List<String> asList = Arrays.asList(split);
if(asList.size()>1){
fileName = standName+"."+split[1];
logger.info("**********fileName************"+fileName+"=======");
}
}
StringBuilder builder=new StringBuilder(); StringBuilder builder=new StringBuilder();
builder.append(standEditFilePath); builder.append(standEditFilePath);
builder.append(standNo).append("/"); builder.append(standNo).append("/");
builder.append(fileName); builder.append(fileNm);
String saveFileUrl = builder.toString(); String saveFileUrl = builder.toString();
File file = new File(saveFileUrl); File file = new File(saveFileUrl);
downloadNetFile(downloadUri, file); downloadNetFile(downloadUri, file);
@@ -191,7 +173,7 @@ public class BusProcessModelHisController {
objectQueryWrapper.eq("TASK_ID",taskId); objectQueryWrapper.eq("TASK_ID",taskId);
BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper); BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper);
if(busProcessModelHis!=null){ if(busProcessModelHis!=null){
lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId()); ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName);
} }
} }
} catch (Exception ex) { } catch (Exception ex) {