diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java index 4e380293..898e8cb6 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java @@ -347,6 +347,7 @@ public class OnlyOfficeController { for (OnlineFileLog onlineFileLog : onlineFileLogList) { Map map = new HashMap<>(); map.put("id", onlineFileLog.getId()); + map.put("filePath", onlineFileLog.getFilePath()); map.put("fileName", fileName); map.put("attFileId", onlineFileLog.getAttFileId()); map.put("createTime", sdf.format(onlineFileLog.getCreateTime())); diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java index 7790a394..3e38174e 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java @@ -110,6 +110,7 @@ public class LawsUserInfoService { onlineFileLog.setFileName(String.valueOf(time)); onlineFileLog.setValidFlag("0"); onlineFileLog.setFileKey(key); + onlineFileLog.setFilePath(fileUrl); onlineFileLogDao.insert(onlineFileLog); log.info("======================日志存入成功==============================="); if (StringUtils.isNotBlank(standName)) { 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 b817e516..b70fa970 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 @@ -2,7 +2,6 @@ package com.jero.modules.onlyoffice.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.util.MinioUtil; import com.jero.modules.onlyoffice.entity.BusProcessModelHis; import com.jero.modules.onlyoffice.entity.OnlineFileLog; import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper; @@ -14,11 +13,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.text.SimpleDateFormat; import java.util.List; import java.util.UUID; @@ -135,7 +133,8 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl