diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java index 0ebda27c..66f842e3 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/BusProcessModelHisController.java @@ -249,8 +249,15 @@ public class BusProcessModelHisController { @ApiOperation(value = "|model| 传入 模板文档名称(不带后缀)默认 docx") @GetMapping("/saveEditFile") - public BusProcessModelHis saveEditFile(String model) { - return busProcessModelHisService.saveEditFile(model); + public Result saveEditFile(String model) { + + return Result.OK(busProcessModelHisService.saveEditFile(model)); + } + + @ApiOperation(value = "根据路径下载文件") + @GetMapping("/downLoadFile") + public void downLoadFile(@RequestParam(name = "path") String path, HttpServletResponse response) { + busProcessModelHisService.downLoadFile(path,response); } @GetMapping("/processModelHisOneUpdStatus") diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/IBusProcessModelHisService.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/IBusProcessModelHisService.java index 64e249e1..52ddeeb8 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/IBusProcessModelHisService.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/IBusProcessModelHisService.java @@ -1,10 +1,10 @@ package com.jero.modules.onlyoffice.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.onlyoffice.entity.BusProcessModelHis; import com.jero.modules.onlyoffice.entity.OnlineFileLog; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -32,4 +32,6 @@ public interface IBusProcessModelHisService extends IService List modelHisList(String pid); OnlineFileLog selectOnlineFile(String onlineFileId); + + void downLoadFile(String path, HttpServletResponse response); } diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java index d3443b85..c75ca4ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java @@ -13,10 +13,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -134,6 +132,45 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl 0) { + outputStream.write(buf, 0, len); + } + response.flushBuffer(); + }catch (IOException e) { + log.error("预览文件失败" + e.getMessage()); + response.setStatus(404); + e.printStackTrace(); + } finally { + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + } + + } + /** * 企标流程文件存储 * @param pid