From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-tools/src/main/java/com/oying/service/impl/LocalStorageServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/oying-tools/src/main/java/com/oying/service/impl/LocalStorageServiceImpl.java b/oying-tools/src/main/java/com/oying/service/impl/LocalStorageServiceImpl.java
index f9218ff..2d31c95 100644
--- a/oying-tools/src/main/java/com/oying/service/impl/LocalStorageServiceImpl.java
+++ b/oying-tools/src/main/java/com/oying/service/impl/LocalStorageServiceImpl.java
@@ -16,19 +16,22 @@
import com.oying.service.LocalStorageService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import org.springframework.web.multipart.MultipartFile;
+
import javax.servlet.http.HttpServletResponse;
/**
-* @author Z
-* @date 2019-09-05
-*/
+ * @author Z
+ * @date 2019-09-05
+ */
@Service
@RequiredArgsConstructor
public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, LocalStorage> implements LocalStorageService {
@@ -37,23 +40,23 @@
private final FileProperties properties;
@Override
- public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page){
+ public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page) {
return PageUtil.toPage(localStorageMapper.findAll(criteria, page));
}
@Override
- public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria){
+ public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria) {
return localStorageMapper.findAll(criteria);
}
@Override
@Transactional(rollbackFor = Exception.class)
public LocalStorage create(String name, MultipartFile multipartFile) {
- FileUtil.checkSize(properties.getMaxSize(), multipartFile.getSize());
+ FileUtil.checkSize(0, multipartFile.getSize());
String suffix = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
String type = FileUtil.getFileType(suffix);
- File file = FileUtil.upload(multipartFile, properties.getPath().getPath() + type + File.separator);
- if(ObjectUtil.isNull(file)){
+ File file = FileUtil.upload(multipartFile, properties.getPath().getPath() + type + File.separator);
+ if (ObjectUtil.isNull(file)) {
throw new BadRequestException("上传失败");
}
try {
@@ -68,7 +71,7 @@
);
save(localStorage);
return localStorage;
- }catch (Exception e){
+ } catch (Exception e) {
FileUtil.del(file);
throw e;
}
@@ -96,7 +99,7 @@
public void download(List<LocalStorage> queryAll, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (LocalStorage localStorage : queryAll) {
- Map<String,Object> map = new LinkedHashMap<>();
+ Map<String, Object> map = new LinkedHashMap<>();
map.put("文件名", localStorage.getRealName());
map.put("备注名", localStorage.getName());
map.put("文件类型", localStorage.getType());
--
Gitblit v1.9.3