From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 068944d..df097ce 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,11 +1,13 @@
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;
import com.moral.api.mapper.FileTableMapper;
import com.moral.api.pojo.enums.FileType;
import com.moral.api.pojo.enums.YesOrNo;
+import com.moral.api.pojo.vo.file.FileAddressVo;
import com.moral.api.pojo.vo.file.FileVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.FileTableService;
@@ -20,6 +22,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 +67,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 +103,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) {
@@ -204,9 +207,9 @@
// 2.2.������������������������������
list.forEach(it -> {
existsList.removeIf(file -> file.getFileId().equals(it.getFileId()));
- it.setFileId(relationId);
FileTable file = new FileTable();
BeanUtils.copyProperties(it,file);
+ file.setRelationId(relationId);
addList.add(file);
});
if (!CollectionUtils.isEmpty(addList)) {
@@ -230,6 +233,25 @@
FileVo fileVo = new FileVo();
fileVo.setFileId(it.getFileId());
fileVo.setFileName(it.getFileName());
+ fileVo.setFileType(it.getFileType());
+ list.add(fileVo);
+ });
+ return list;
+ }
+
+ @Override
+ public List<FileAddressVo> list(int relationId, int fileModule, int fileType) {
+ List<FileAddressVo> list = new ArrayList<>();
+ List<FileTable> existsList = this.lambdaQuery().eq(FileTable::getRelationId, relationId)
+ .eq(FileTable::getFileModule, fileModule)
+ .eq(Objects.nonNull(fileType),FileTable::getFileType,fileType)
+ .eq(FileTable::getIsDel, YesOrNo.NO.value).orderByAsc(FileTable::getCreateTime).list();
+ existsList.forEach(it->{
+ FileAddressVo fileVo = new FileAddressVo();
+ fileVo.setFileId(it.getFileId());
+ fileVo.setFileName(it.getFileName());
+ fileVo.setFileType(it.getFileType());
+ fileVo.setFileAddress(it.getFileAddress());
list.add(fileVo);
});
return list;
--
Gitblit v1.8.0