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 5da06d95..cf2a4ce8 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 @@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URL; import java.net.URLConnection; +import java.util.Arrays; import java.util.List; import java.util.Scanner; @@ -51,11 +52,12 @@ public class BusProcessModelHisController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFile") - public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId){ + public void recieveFile(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String fileId,String standName){ logger.info("**********进入onlyoffice接收文档接口************"); logger.info("**********fileNm************"+fileNm+"======="); logger.info("**********standNo************"+standNo+"======="); logger.info("**********fileId************"+fileId+"======="); + logger.info("**********standName************"+standName+"======="); try { PrintWriter writer = response.getWriter(); String body = ""; @@ -86,10 +88,20 @@ 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(fileNm); + builder.append(fileName); +// builder.append(fileNm); String saveFileUrl = builder.toString(); File file = new File(saveFileUrl); downloadNetFile(downloadUri, file); @@ -119,12 +131,13 @@ public class BusProcessModelHisController { @ApiOperation(value = "|onlyOffice接收文件") @PostMapping("/recieveFileBefore") - public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId){ + public void recieveFileBefore(HttpServletRequest request, HttpServletResponse response, String fileNm, String standNo, String pid, String taskId ,String standName){ logger.info("**********进入onlyoffice接收文档接口************"); logger.info("**********fileNm************"+fileNm+"======="); logger.info("**********standNo************"+standNo+"======="); logger.info("**********fileId************"+pid+"======="); - logger.info("**********fileId************"+taskId+"======="); + logger.info("**********taskId************"+taskId+"======="); + logger.info("**********standName************"+standName+"======="); try { PrintWriter writer = response.getWriter(); String body = ""; @@ -155,10 +168,19 @@ 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(fileNm); + builder.append(fileName); String saveFileUrl = builder.toString(); File file = new File(saveFileUrl); downloadNetFile(downloadUri, file);