ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 在线编辑保存10份

Browse Source
This commit is contained in:
mzaxd
2024-01-24 09:22:43 +08:00
parent 8a161f9cab
commit b28cf1b1e5
5 changed files with 347 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java
+1
View File
@@ -1,5 +1,6 @@
package com.jero.modules.oss.service; package com.jero.modules.oss.service;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
laws-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+12 -6
View File
@@ -1,24 +1,28 @@
package com.jero.modules.oss.service.impl; package com.jero.modules.oss.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.LanguageEnum;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.CommonUtils; import com.jero.common.util.CommonUtils;
import com.jero.common.util.MinioUtil; import com.jero.common.util.MinioUtil;
import com.jero.common.util.UUIDUtils;
import com.jero.common.util.oss.OssBootUtil; import com.jero.common.util.oss.OssBootUtil;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.mapper.OSSFileMapper; import com.jero.modules.oss.mapper.OSSFileMapper;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.util.MyStringUtils; import com.jero.modules.system.util.MyStringUtils;
import me.zhyd.oauth.utils.UuidUtils; import me.zhyd.oauth.utils.UuidUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -31,7 +35,6 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
private String uploadpath; private String uploadpath;
@Value(value = "${jero.path.uploadCos}") @Value(value = "${jero.path.uploadCos}")
private String uploadCospath; private String uploadCospath;
/** /**
* 文件后缀黑名单 * 文件后缀黑名单
*/ */
@@ -41,13 +44,14 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
// 文档拆分条款图片访问路径 // 文档拆分条款图片访问路径
@Value(value = "${jero.splitUrl}") @Value(value = "${jero.splitUrl}")
private String splitUrl; private String splitUrl;
@Override @Override
public void upload(MultipartFile multipartFile) throws IOException { public void upload(MultipartFile multipartFile) throws IOException {
String fileName = multipartFile.getOriginalFilename(); String fileName = multipartFile.getOriginalFilename();
fileName = CommonUtils.getFileName(fileName); fileName = CommonUtils.getFileName(fileName);
OSSFile ossFile = new OSSFile(); OSSFile ossFile = new OSSFile();
ossFile.setFileName(fileName); ossFile.setFileName(fileName);
String url = OssBootUtil.upload(multipartFile,"upload/test"); String url = OssBootUtil.upload(multipartFile, "upload/test");
//update-begin--Author:scott Date:20201227 for：JT-361【文件预览】阿里云原生域名可以文件预览，自己映射域名kkfileview提示文件下载失败------------------- //update-begin--Author:scott Date:20201227 for：JT-361【文件预览】阿里云原生域名可以文件预览，自己映射域名kkfileview提示文件下载失败-------------------
// 返回阿里云原生域名前缀URL // 返回阿里云原生域名前缀URL
ossFile.setUrl(OssBootUtil.getOriginalUrl(url)); ossFile.setUrl(OssBootUtil.getOriginalUrl(url));
@@ -60,15 +64,15 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
try { try {
this.removeById(ossFile.getId()); this.removeById(ossFile.getId());
OssBootUtil.deleteUrl(ossFile.getUrl()); OssBootUtil.deleteUrl(ossFile.getUrl());
} } catch (Exception ex) {
catch (Exception ex) {
return false; return false;
} }
return true; return true;
} }
@Override @Override
public List<OSSFile> getFileInfosByConnectId(String connectId) { public List<OSSFile> getFileInfosByConnectId(String connectId) {
if(StringUtils.isBlank(connectId)){ if (StringUtils.isBlank(connectId)) {
return new ArrayList<>(); return new ArrayList<>();
} }
LambdaQueryWrapper<OSSFile> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OSSFile> wrapper = new LambdaQueryWrapper<>();
@@ -90,6 +94,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
this.remove(lambdaQueryWrapper); this.remove(lambdaQueryWrapper);
} }
} }
/** /**
* 本地文件上传-文档拆分专用 * 本地文件上传-文档拆分专用
* *
@@ -203,6 +208,7 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
} }
return list; return list;
} }
@Override @Override
public List<OSSFile> getFileInfoAll(String id) { public List<OSSFile> getFileInfoAll(String id) {
if (MyStringUtils.isEmpty(id)) { if (MyStringUtils.isEmpty(id)) {
@@ -218,11 +224,11 @@ public class OSSFileServiceImpl extends ServiceImpl<OSSFileMapper, OSSFile> impl
} }
@Override @Override
public void updateFileInfo(List<OSSFile> ossFileList) { public void updateFileInfo(List<OSSFile> ossFileList) {
this.updateBatchById(ossFileList); this.updateBatchById(ossFileList);
} }
/** /**
* 本地文件上传 cos * 本地文件上传 cos
* *
laws-modules/src/main/java/com/jero/modules/onlyoffice/controller/OnlyOfficeController.java
+3 -5
View File
@@ -159,13 +159,12 @@ public class OnlyOfficeController {
downloadUri = downloadUri.replace("onlyoffice.sinotruk.com", "onlyoffice-sa2of.yf-grp:8080"); downloadUri = downloadUri.replace("onlyoffice.sinotruk.com", "onlyoffice-sa2of.yf-grp:8080");
BusProcessModelHis modelHis = busProcessModelHisService.getById(fileId); BusProcessModelHis modelHis = busProcessModelHisService.getById(fileId);
String editFilePath = modelHis.getEditFilePath(); String editFilePath = modelHis.getEditFilePath();
String saveFileUrl = standEditFilePath + String saveFileUrl = standEditFilePath + editFilePath;
editFilePath;
logger.info("**********onlyoffice文档下载路径************" + downloadUri); logger.info("**********onlyoffice文档下载路径************" + downloadUri);
logger.info("**********onlyoffice文档保存本地路径************" + saveFileUrl); logger.info("**********onlyoffice文档保存本地路径************" + saveFileUrl);
HttpUtil.downloadFileFromUrl(downloadUri, saveFileUrl); HttpUtil.downloadFileFromUrl(downloadUri, saveFileUrl);
//File file = new File(saveFileUrl); File file = new File(saveFileUrl);
//downloadNetFile(downloadUri, file); downloadNetFile(downloadUri, file);
// 更新在线编辑当前节点编辑状态 // 更新在线编辑当前节点编辑状态
busProcessModelHisService.modelHisOneUpdStatusById(fileId); busProcessModelHisService.modelHisOneUpdStatusById(fileId);
Object keyObj = jsonObj.get("key"); Object keyObj = jsonObj.get("key");
@@ -191,7 +190,6 @@ public class OnlyOfficeController {
} catch (IOException e) { } catch (IOException e) {
logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage()); logger.info("**********onlyoffice接收文档接口异常************" + e.getMessage());
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
return;
} }
} }
laws-modules/src/main/java/com/jero/modules/onlyoffice/service/LawsUserInfoService.java
+64 -67
View File
@@ -1,19 +1,22 @@
package com.jero.modules.onlyoffice.service; package com.jero.modules.onlyoffice.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.util.MinioUtil;
import com.jero.common.util.UUIDUtils;
import com.jero.modules.onlyoffice.entity.AttFileEO; import com.jero.modules.onlyoffice.entity.AttFileEO;
import com.jero.modules.onlyoffice.entity.AttFileVo; import com.jero.modules.onlyoffice.entity.AttFileVo;
import com.jero.modules.onlyoffice.entity.OnlineFileLog; import com.jero.modules.onlyoffice.entity.OnlineFileLog;
import com.jero.modules.onlyoffice.mapper.AttFileEODao; import com.jero.modules.onlyoffice.mapper.AttFileEODao;
import com.jero.modules.onlyoffice.mapper.BusProcessModelHisMapper;
import com.jero.modules.onlyoffice.mapper.OnlineFileLogDao; import com.jero.modules.onlyoffice.mapper.OnlineFileLogDao;
import com.jero.modules.onlyoffice.service.impl.AttFileEOServiceImpl; import com.jero.modules.onlyoffice.service.impl.AttFileEOServiceImpl;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -28,45 +31,50 @@ import java.util.List;
@Service @Service
@Slf4j @Slf4j
public class LawsUserInfoService { public class LawsUserInfoService {
@Value("${file.path}") @Value("${file.path}")
private String standEditFilePath; private String standEditFilePath;
@Autowired
@Resource
private IBusProcessModelHisService busProcessModelHisService; private IBusProcessModelHisService busProcessModelHisService;
@Autowired
private AttFileEOServiceImpl attFileEOService; @Resource
@Autowired
private OnlineFileLogDao onlineFileLogDao; private OnlineFileLogDao onlineFileLogDao;
@Autowired
private AttFileEODao attFileEODao; @Resource
private IOSSFileService ossFileService;
/** /**
* 查找在线编辑文件 * 查找在线编辑文件
*
* @param onlineFileId * @param onlineFileId
* @param standName * @param standName
* @param key * @param key
*/ */
public void selectOnlineFile(String onlineFileId, String standName, String key) { public void selectOnlineFile(String onlineFileId, String standName, String key) {
log.info("======================standName===============================！！！！！！！！！！！！！！！！！！！！！！"+standName); log.info("======================standName===============================！！！！！！！！！！！！！！！！！！！！！！" + standName);
String path = standEditFilePath+"/hisFile/"; String path = standEditFilePath + "hisFile/";
File file = null; File file = null;
FileOutputStream fileOutputStream = null; FileOutputStream fileOutputStream = null;
BufferedOutputStream bufferedOutputStream = null; BufferedOutputStream bufferedOutputStream = null;
//下载位置 //下载位置
OnlineFileLog onlineFileLog = busProcessModelHisService.selectOnlineFile(onlineFileId); OnlineFileLog onlineFileLog = busProcessModelHisService.selectOnlineFile(onlineFileId);
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if(onlineFileLog == null){ if (onlineFileLog == null) {
return ; return;
} }
String fileName = UUIDUtils.randomUUID(20);
try { try {
file = new File(path+onlineFileLog.getOldFileName()); file = new File(path + onlineFileLog.getOldFileName());
boolean directory = file.isDirectory(); boolean directory = file.isDirectory();
log.info("**********path+onlineFileLog.getOldFileName()本地路径************" + path+onlineFileLog.getOldFileName()); log.info("**********path+onlineFileLog.getOldFileName()本地路径************" + path + onlineFileLog.getOldFileName());
//目录是否存在 //目录是否存在
if(!directory){ if (!directory) {
file.mkdirs(); file.mkdirs();
} }
file = new File(path+"/"+onlineFileLog.getOldFileName(),onlineFileLog.getOldFileName()+"."+onlineFileLog.getFileSuffix()); file = new File(path + "/" + onlineFileLog.getOldFileName(), fileName + "." + onlineFileLog.getFileSuffix());
log.info("**********parent路径************" + path+"/"+onlineFileLog.getOldFileName()); log.info("**********parent路径************" + path + "/" + onlineFileLog.getOldFileName());
log.info("**********child路径************" + onlineFileLog.getOldFileName()+"."+onlineFileLog.getFileSuffix()); log.info("**********child路径************" + onlineFileLog.getOldFileName() + "." + onlineFileLog.getFileSuffix());
fileOutputStream = new FileOutputStream(file); fileOutputStream = new FileOutputStream(file);
bufferedOutputStream = new BufferedOutputStream(fileOutputStream); bufferedOutputStream = new BufferedOutputStream(fileOutputStream);
fileOutputStream.write(onlineFileLog.getBytes()); fileOutputStream.write(onlineFileLog.getBytes());
@@ -74,25 +82,29 @@ public class LawsUserInfoService {
//把文件下载到本地 然后获得文件的名称 通过文件名称 调用 filesave接口 获取id 进行日志存入 //把文件下载到本地 然后获得文件的名称 通过文件名称 调用 filesave接口 获取id 进行日志存入
log.info("======================文件存储到本地成功，作为存储与Att表的桥梁==============================="); log.info("======================文件存储到本地成功，作为存储与Att表的桥梁===============================");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.info("======================文件存储到本地失败===============================");
}finally { } finally {
try { try {
if(bufferedOutputStream!=null){ if (bufferedOutputStream != null) {
bufferedOutputStream.close(); bufferedOutputStream.close();
} }
if(fileOutputStream!=null){ if (fileOutputStream != null) {
fileOutputStream.close(); fileOutputStream.close();
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); log.info("======================文件流关闭失败===============================");
} }
} }
//把文件放置到本地 // 把文件放置到本地
AttFileVo attFileVo = attFileEOService.saveFileInfo(file); OSSFile ossFile = new OSSFile();
log.info("======================文件成功存储到Att中==============================="+attFileVo.toString()); // 开始存储文件信息
//储存文件 一个文件夹 储存十个 ossFile.setFileName(onlineFileLog.getOldFileName());
if(attFileVo!=null) { String fileUrl = "hisFile/" + onlineFileLog.getOldFileName() + "/" + fileName + "." + onlineFileLog.getFileSuffix();
onlineFileLog.setAttFileId(attFileVo.getId()); ossFile.setUrl(fileUrl);
ossFileService.save(ossFile);
log.info("======================文件成功存储到Oss中===============================" + ossFile.toString());
// 储存文件 一个文件夹 储存十个
onlineFileLog.setAttFileId(ossFile.getId());
onlineFileLog.setUpdateTime(new Date()); onlineFileLog.setUpdateTime(new Date());
onlineFileLog.setCreateTime(new Date()); onlineFileLog.setCreateTime(new Date());
onlineFileLog.setFileName(String.valueOf(time)); onlineFileLog.setFileName(String.valueOf(time));
@@ -100,54 +112,39 @@ public class LawsUserInfoService {
onlineFileLog.setFileKey(key); onlineFileLog.setFileKey(key);
onlineFileLogDao.insert(onlineFileLog); onlineFileLogDao.insert(onlineFileLog);
log.info("======================日志存入成功==============================="); log.info("======================日志存入成功===============================");
if(StringUtils.isNotBlank(standName)) { if (StringUtils.isNotBlank(standName)) {
AttFileEO attFileEO = new AttFileEO(); ossFile.setFileName(standName + ".docx");
attFileEO.setId(attFileVo.getId()); ossFileService.updateById(ossFile);
attFileEO.setOldFileName(standName+".docx"); log.info("======================文件名称修改成功===============================" + standName + ".docx" + "======" + "传入对象为：" + ossFile.getFileName());
// TODO 等在线编辑正式上线时，需要替换成oss_file表
attFileEODao.updateFileInfoById(attFileEO);
log.info("======================文件名称修改成功==============================="+standName+".docx"+"======"+"传入对象为："+attFileEO.getOldFileName());
}
//删除媒介桥梁文件
if(file.delete()){
//删除文件名称
File fileTOW = new File(path+onlineFileLog.getOldFileName());
if(fileTOW.delete()){
File fileInfo = new File(path);
if(fileInfo.delete()){
log.info("======================桥梁文件删除成功==============================="+path+onlineFileLog.getOldFileName());
}
}
}else {
log.info("======================桥梁文件删除失败！！！！！！！！===============================");
} }
QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapperHis = new QueryWrapper<>(); QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapperHis = new QueryWrapper<>();
onlineFileLogQueryWrapperHis.eq("HIS_ID",onlineFileId); onlineFileLogQueryWrapperHis.eq("HIS_ID", onlineFileId);
onlineFileLogQueryWrapperHis.eq("VALID_FLAG","0"); onlineFileLogQueryWrapperHis.eq("VALID_FLAG", "0");
onlineFileLogQueryWrapperHis.orderByAsc("CREATE_TIME"); onlineFileLogQueryWrapperHis.orderByAsc("CREATE_TIME");
List<OnlineFileLog> onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapperHis); List<OnlineFileLog> onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapperHis);
//建立删除 // 只保留最近的10个文件
// File deleteFileInfo = new File(path + onlineFileLog.getOLdFileName()+"/",onlineFileLogs.get(0).getFileName()+"."+onlineFileLogs.get(0).getFileSuffix()); if (onlineFileLogs.size() > 10) {
if(onlineFileLogs.size()>10){ log.info("======================文件日志记录小于10===============================" + onlineFileLogs.size());
log.info("======================文件日志记录小于10==============================="+onlineFileLogs.size());
QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapper = new QueryWrapper<>(); QueryWrapper<OnlineFileLog> onlineFileLogQueryWrapper = new QueryWrapper<>();
onlineFileLogQueryWrapper.eq("FILE_NAME",onlineFileLogs.get(0).getFileName()); onlineFileLogQueryWrapper.eq("ID", onlineFileLogs.get(0).getId());
OnlineFileLog onlineFileLogIsNot = onlineFileLogDao.selectOne(onlineFileLogQueryWrapper); OnlineFileLog onlineFileLogIsNot = onlineFileLogDao.selectOne(onlineFileLogQueryWrapper);
if(onlineFileLogIsNot!=null){ if (onlineFileLogIsNot != null) {
//删除此处有关的数据 // 删除此处有关的数据
AttFileEO fileInfo = attFileEOService.getFileInfo(onlineFileLogIsNot.getAttFileId()); OSSFile ossFileInfo = ossFileService.getById(onlineFileLogIsNot.getAttFileId());
if(fileInfo!=null){ if (ossFileInfo != null) {
File fileAtt = new File(standEditFilePath+fileInfo.getFilePath()+fileInfo.getFileName()); // 删除所有相关文件和记录
if(fileAtt.delete()){ File fileAtt = new File(standEditFilePath + ossFileInfo.getUrl());
attFileEOService.deleteById(onlineFileLogIsNot.getAttFileId()); boolean delete = fileAtt.delete();
if (delete) {
log.info("======================文件删除成功===============================" + ossFileInfo.getUrl());
ossFileService.removeById(onlineFileLogIsNot.getAttFileId());
onlineFileLogDao.deleteById(onlineFileLogs.get(0).getId()); onlineFileLogDao.deleteById(onlineFileLogs.get(0).getId());
} }
} }
} }
log.info("删除成功"+onlineFileLogs.get(0).getId()); log.info("删除成功" + onlineFileLogs.get(0).getId());
}else { } else {
log.info("======================文件日志记录小于10==============================="+onlineFileLogs.size()); log.info("======================文件日志记录小于10===============================" + onlineFileLogs.size());
}
} }
} }
} }
laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/BusProcessModelHisServiceImpl.java
-1
View File
@@ -80,7 +80,6 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
File targetFile = new File(filePath + targetPath); File targetFile = new File(filePath + targetPath);
FileUtils.copyFile(sourceFile, targetFile); FileUtils.copyFile(sourceFile, targetFile);
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
modelHis.setTaskId(taskId); modelHis.setTaskId(taskId);
modelHis.setPId(topId); modelHis.setPId(topId);
modelHis.setEditFilePath(targetPath); modelHis.setEditFilePath(targetPath);