From d8a01a15bf6f310734a18eb7740c7f5ef2d19736 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
index 304d0bb..b8fc305 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.FileTable;
import com.moral.api.exception.BusinessException;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -64,7 +66,7 @@
sysFile.setCreateId(user.getUserId()).setCreateName(user.getUserName());
}
save(sysFile);
- return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename);
+ return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename).setFileType(fileType.getValue());
}
@Override
@@ -100,7 +102,7 @@
}
private String getFilePath(String sysCode) {
- return sysCode.concat(StringUtils.SLASH).concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
+ return sysCode.concat(StringUtils.SLASH).concat(DateUtils.dateToDateString(new Date(),DateUtils.yyyyMMdd_EN)).concat(StringUtils.SLASH);
}
public void storageFile(MultipartFile file, String originalFilename, String targetFolder) {
@@ -230,6 +232,7 @@
FileVo fileVo = new FileVo();
fileVo.setFileId(it.getFileId());
fileVo.setFileName(it.getFileName());
+ fileVo.setFileType(it.getFileType());
list.add(fileVo);
});
return list;
--
Gitblit v1.8.0