diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index be418d6d..ba18b130 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -220,5 +220,5 @@ public interface LawsUserInfoService { List getAllPlansByWkInfo(); @GetMapping("lawss/activiti/selectOnlineFile") - ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId); + ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java index cf2a4ce8..411c7a6b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java @@ -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_main.datas.entity.BusProcessModelHis; 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.service.IBusProcessModelHisService; import io.swagger.annotations.ApiOperation; @@ -88,26 +89,16 @@ public class BusProcessModelHisController { try { logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); if (StringUtils.isNotEmpty(downloadUri)) { - String fileName = standName; - if(StringUtils.isNotBlank(fileNm)){ - String[] split = fileNm.split("\\."); - List asList = Arrays.asList(split); - if(asList.size()>1){ - fileName = standName+"."+split[1]; - logger.info("**********fileName************"+fileName+"======="); - } - } StringBuilder builder=new StringBuilder(); builder.append(standEditFilePath); builder.append(standNo).append("/"); - builder.append(fileName); -// builder.append(fileNm); + builder.append(fileNm); String saveFileUrl = builder.toString(); File file = new File(saveFileUrl); downloadNetFile(downloadUri, file); // 更新在线编辑当前节点编辑状态 busProcessModelHisService.modelHisOneUpdStatusById(fileId); - lawsUserInfoService.selectOnlineFile(fileId); + ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(fileId, standName); } } catch (Exception ex) { saved = 1; @@ -168,19 +159,10 @@ public class BusProcessModelHisController { try { logger.info("**********onlyoffice接收文档接口获得downloadUri************" + downloadUri); if (StringUtils.isNotEmpty(downloadUri)) { - String fileName = standName; - if(StringUtils.isNotBlank(fileNm)){ - String[] split = fileNm.split("\\."); - List asList = Arrays.asList(split); - if(asList.size()>1){ - fileName = standName+"."+split[1]; - logger.info("**********fileName************"+fileName+"======="); - } - } StringBuilder builder=new StringBuilder(); builder.append(standEditFilePath); builder.append(standNo).append("/"); - builder.append(fileName); + builder.append(fileNm); String saveFileUrl = builder.toString(); File file = new File(saveFileUrl); downloadNetFile(downloadUri, file); @@ -191,7 +173,7 @@ public class BusProcessModelHisController { objectQueryWrapper.eq("TASK_ID",taskId); BusProcessModelHis busProcessModelHis = busProcessModelHisMapper.selectOne(objectQueryWrapper); if(busProcessModelHis!=null){ - lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId()); + ResponseMessage responseMessage = lawsUserInfoService.selectOnlineFile(busProcessModelHis.getId(), standName); } } } catch (Exception ex) {