fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复对同一文件重复上传后无法下载备份文件的问题

Browse Source
This commit is contained in:
F嘉阳
2018-02-26 10:16:59 +08:00
parent 1967b9d2f6
commit 765040e852
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/fjy/spring/controller/UpLoadController.java
View File

@@ -147,7 +147,9 @@ public class UpLoadController {
TbUser user = (TbUser) request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY); TbUser user = (TbUser) request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY);
Date date = new Date(); Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy_MM_dd HH_mm_ss");
String dateNowStr = sdf.format(date); String dateNowStr = sdf.format(date);
String dateNowStr2 = sdf2.format(date);
String uploadUrl; String uploadUrl;
//String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/"; //String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/";
if (rename) { if (rename) {
@@ -180,7 +182,15 @@ public class UpLoadController {
File targetFile = new File(pathname); File targetFile = new File(pathname);
//若文件已存在则自动重命名 //若文件已存在则自动重命名
if (targetFile.exists()){ if (targetFile.exists()){
File mvfile = new File(pathname+".bak"); log.info("源文件路径:"+pathname);
TbFile file1 = fileService.findByFilepath(pathname);
file1.setColfilepath(file1.getColfilepath()+"."+dateNowStr2+".bak");
file1.setColfilename(file1.getColfilename()+"."+dateNowStr2+".bak");
if (fileService.addFile(file1))
log.info("重命名文件数据库更新成功");
else
log.error("重命名文件数据库更新失败");
File mvfile = new File(pathname+"."+dateNowStr2+".bak");
try { try {
FileUtils.moveFile(targetFile, mvfile); FileUtils.moveFile(targetFile, mvfile);
log.info("源文件："+targetFile.getName()+"已重命名为："+ mvfile.getName()); log.info("源文件："+targetFile.getName()+"已重命名为："+ mvfile.getName());

2
src/main/java/com/fjy/spring/repository/TbFileRepository.java
View File

@@ -11,4 +11,6 @@ public interface TbFileRepository extends JpaRepository<TbFile,Integer>{
public List<TbFile> findByWorkFolderAndCourseName(String workFolder,String courseName); public List<TbFile> findByWorkFolderAndCourseName(String workFolder,String courseName);
public List<TbFile> findByColuserid(Integer id); public List<TbFile> findByColuserid(Integer id);
public TbFile findByColfilepath(String filePath);
} }

4
src/main/java/com/fjy/spring/service/FileService.java
View File

@@ -52,4 +52,8 @@ public class FileService {
return tbFileRepository.findByColuserid(id); return tbFileRepository.findByColuserid(id);
} }
public TbFile findByFilepath(String filePath){
return tbFileRepository.findByColfilepath(filePath);
}
} }