From 29371c05ec48ad91b32829f1cecbb5c470924be8 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 10 二月 2021 01:22:23 +0800
Subject: [PATCH] 完成文件管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java | 6
febs-server/febs-server-hr/src/main/resources/febs-server-hr.properties | 2
.gitignore | 3
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IFilesUploadService.java | 13 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java | 36 +++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java | 164 ++++++++++++++++++++++++++++++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/properties/FebsServerHrProperties.java | 20 ++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java | 4
8 files changed, 221 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 65bb0b8..250e7d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
**/*.iml
/febs-cloud/.txlcn/
**/spy.log
-*/.DS_Store
\ No newline at end of file
+*/.DS_Store
+/.txlcn/
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
index 7788480..2a61f45 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
@@ -1,18 +1,23 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.server.hr.entity.FilesUpload;
-import cc.mrbird.febs.server.hr.service.IFilesUploadService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
-import lombok.extern.slf4j.Slf4j;
+import cc.mrbird.febs.server.hr.entity.FilesUpload;
+import cc.mrbird.febs.server.hr.service.IFilesUploadService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import javax.validation.Valid;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Map;
/**
@@ -45,21 +50,34 @@
@PostMapping
@PreAuthorize("hasAuthority('filesUpload:add')")
- public void addFilesUpload(@Valid FilesUpload filesUpload) throws FebsException {
+ public void addFilesUpload(@NotNull(message = "{required}") Long folderid, MultipartFile file, HttpServletRequest request) throws FebsException {
try {
- this.filesUploadService.createFilesUpload(filesUpload);
+ this.filesUploadService.createFilesUpload(folderid, file);
} catch (Exception e) {
- String message = "新增FilesUpload失败";
+ String message = "上传文件失败";
log.error(message, e);
throw new FebsException(message);
}
}
+ @PostMapping("/download")
+ @PreAuthorize("hasAuthority('filesUpload:download')")
+ public void download(@NotBlank(message = "{required}") String fileids,HttpServletRequest request, HttpServletResponse response) throws FebsException {
+ try {
+ this.filesUploadService.download(fileids,request,response);
+ } catch (Exception e) {
+ String message = "下载文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+
@DeleteMapping
@PreAuthorize("hasAuthority('filesUpload:delete')")
- public void deleteFilesUpload(FilesUpload filesUpload) throws FebsException {
+ public void deleteFilesUpload(@NotBlank(message = "{required}") String fileids) throws FebsException {
try {
- this.filesUploadService.deleteFilesUpload(filesUpload);
+ this.filesUploadService.deleteFilesUpload(fileids);
} catch (Exception e) {
String message = "删除FilesUpload失败";
log.error(message, e);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java
index 0b62eed..e3fce9c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/FilesUpload.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.entity;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -47,7 +49,7 @@
/**
* id
*/
- @TableField("filesId")
+ @TableId("filesId")
private Long filesid;
/**
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
index bcdd50e..8bee454 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.entity;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -39,7 +41,7 @@
/**
* id
*/
- @TableField("folderId")
+ @TableId("folderId")
private Long folderid;
/**
@@ -71,6 +73,6 @@
*/
@TableField("sort")
@NotNull(message = "{required}")
- @Range(message = "排序范围为 {min} 到 {max} 之间", min = 0, max = 100)
+ @Range(message = "{range}", min = 0, max = 100)
private Integer sort=0;
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/properties/FebsServerHrProperties.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/properties/FebsServerHrProperties.java
new file mode 100644
index 0000000..a30c238
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/properties/FebsServerHrProperties.java
@@ -0,0 +1,20 @@
+package cc.mrbird.febs.server.hr.properties;
+
+import lombok.Data;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * @author MrBird
+ */
+@Data
+@SpringBootConfiguration
+@PropertySource(value = {"classpath:febs-server-hr.properties"})
+@ConfigurationProperties(prefix = "febs.server.hr")
+public class FebsServerHrProperties {
+ /**
+ * 文件上传地址
+ */
+ private String uploadPpath = "D:/upload/hr/";
+}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IFilesUploadService.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IFilesUploadService.java
index b13b4c0..d5bd381 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IFilesUploadService.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IFilesUploadService.java
@@ -1,11 +1,16 @@
package cc.mrbird.febs.server.hr.service;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.server.hr.entity.FilesUpload;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.List;
/**
@@ -35,9 +40,8 @@
/**
* 新增
*
- * @param filesUpload filesUpload
*/
- void createFilesUpload(FilesUpload filesUpload);
+ void createFilesUpload(Long folderid, MultipartFile file) throws FebsException, IOException;
/**
* 修改
@@ -49,7 +53,8 @@
/**
* 删除
*
- * @param filesUpload filesUpload
*/
- void deleteFilesUpload(FilesUpload filesUpload);
+ void deleteFilesUpload(String fileids);
+
+ void download(String fileids, HttpServletRequest request, HttpServletResponse response);
}
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
index 65d567a..ff30333 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java
@@ -1,9 +1,24 @@
package cc.mrbird.febs.server.hr.service.impl;
+import java.io.*;
+import java.util.*;
+
+import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.FilesUpload;
+import cc.mrbird.febs.server.hr.entity.Folder;
import cc.mrbird.febs.server.hr.mapper.FilesUploadMapper;
+import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
import cc.mrbird.febs.server.hr.service.IFilesUploadService;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.file.FileWriter;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -13,8 +28,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* 文件上传 Service实现
@@ -28,6 +47,14 @@
public class FilesUploadServiceImpl extends ServiceImpl<FilesUploadMapper, FilesUpload> implements IFilesUploadService {
private final FilesUploadMapper filesUploadMapper;
+ private final FebsServerHrProperties properties;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
+ /**
+ * 参数2为数据中心ID 参数1为终端ID
+ */
+ private Snowflake snowflake = IdUtil.getSnowflake(ModuleCode.HR_FIlE, 1);
@Override
public IPage<FilesUpload> findFilesUploads(QueryRequest request, FilesUpload filesUpload) {
@@ -39,11 +66,12 @@
@Override
public List<FilesUpload> findFilesUploads(FilesUpload filesUpload) {
LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
- if (null != filesUpload.getFolderid()){
- queryWrapper.eq(FilesUpload::getFolderid,filesUpload.getFolderid());
+ queryWrapper.eq(FilesUpload::getDelFlag,0);
+ if (null != filesUpload.getFolderid()) {
+ queryWrapper.eq(FilesUpload::getFolderid, filesUpload.getFolderid());
}
- if (StrUtil.isNotBlank(filesUpload.getFilesname())){
- queryWrapper.like(FilesUpload::getFilesname,filesUpload.getFilesname()) ;
+ if (StrUtil.isNotBlank(filesUpload.getFilesname())) {
+ queryWrapper.like(FilesUpload::getFilesname, filesUpload.getFilesname());
}
queryWrapper.orderByDesc(FilesUpload::getModifytime);
return this.baseMapper.selectList(queryWrapper);
@@ -51,7 +79,43 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createFilesUpload(FilesUpload filesUpload) {
+ public void createFilesUpload(Long folderid, MultipartFile file) throws FebsException, IOException {
+ if (file.isEmpty()) {
+ throw new FebsException("上传的文件不能为空！请重新上传");
+ }
+ if (file.getSize() <= 0) {
+ throw new FebsException("上传的文件大小需要大于0kb");
+ }
+ if (file.getSize() > 50 * 1024* 1024) {
+ throw new FebsException("上传的文件大于50M");
+ }
+ if (!FileUtil.exist(properties.getUploadPpath())) {
+ FileUtil.mkdir(properties.getUploadPpath());
+ }
+ //原本名字
+ String fileName = file.getOriginalFilename();
+ String suffix = "";
+ if (fileName.indexOf(".") > 0) {
+ //后缀
+ suffix = fileName.substring(fileName.indexOf("."), fileName.length());
+ }
+ //生成新的名字
+ String newName = snowflake.nextIdStr() + suffix;
+ //上传
+ file.transferTo(new File(properties.getUploadPpath() + newName));
+
+ FilesUpload filesUpload = new FilesUpload();
+ filesUpload.setCreatetime(new Date());
+ filesUpload.setCreator(operatorId);
+ filesUpload.setDelFlag(0);
+ filesUpload.setFilesaddress(newName);
+ filesUpload.setFilesformat(StrUtil.isBlank(suffix) ? suffix : suffix.substring(1));
+ filesUpload.setFilesid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
+ filesUpload.setFilesname(fileName);
+ filesUpload.setFolderid(folderid);
+ filesUpload.setModifier(operatorId);
+ filesUpload.setModifytime(new Date());
+ filesUpload.setVersion(0);
this.save(filesUpload);
}
@@ -63,9 +127,89 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void deleteFilesUpload(FilesUpload filesUpload) {
- LambdaQueryWrapper<FilesUpload> wapper = new LambdaQueryWrapper<>();
- // TODO 设置删除条件
- this.remove(wapper);
+ public void deleteFilesUpload(String fileids) {
+ String[] arr = fileids.split(",");
+ LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
+ wapper.in(FilesUpload::getFilesid,arr).setSql("delFlag = 1");
+ this.update(wapper);
+
+ LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
+ wapper.in(FilesUpload::getFilesid,arr);
+ List<FilesUpload> list = this.list(queryWrapper);
+ list.parallelStream().forEach(i-> FileUtil.del(properties.getUploadPpath() + i.getFilesaddress()));
+
}
+
+ @Override
+ public void download(String fileids, HttpServletRequest request, HttpServletResponse response) {
+ String[] arr = fileids.split(",");
+ List<File> files = new ArrayList<>();
+ Arrays.stream(arr).forEach(i -> {
+ FilesUpload filesUpload = this.getById(i);
+ files.add(new File(properties.getUploadPpath() + filesUpload.getFilesaddress()));
+ });
+ //设置压缩包的名字
+ //解决不同浏览器压缩包名字含有中文时乱码的问题
+ String downloadName ="PersonnelInformation-" + DateUtil.format(new Date(), "yyyyMMddhhmmsss") + ".zip";
+ String agent = request.getHeader("USER-AGENT");
+ try {
+ if (agent.contains("MSIE") || agent.contains("Trident")) {
+ downloadName = java.net.URLEncoder.encode(downloadName, "UTF-8");
+ } else {
+ downloadName = new String(downloadName.getBytes("UTF-8"), "ISO-8859-1");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ response.setHeader("Content-Disposition", "attachment;fileName=\"" + downloadName + "\"");
+
+
+ //设置压缩流：直接写入response，实现边压缩边下载
+ ZipOutputStream zipos = null;
+ try {
+ zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
+ //设置压缩方法
+ zipos.setMethod(ZipOutputStream.DEFLATED);
+ } catch (Exception e) {
+ log.error("设置压缩流出现异常" + e.getMessage());
+ e.printStackTrace();
+ }
+
+ //循环将文件写入压缩流
+ DataOutputStream os = null;
+ for (int i = 0; i < files.size(); i++) {
+ File file = files.get(i);
+ try {
+ //添加ZipEntry，并ZipEntry中写入文件流
+ //这里，加上i是防止要下载的文件有重名的导致下载失败
+ zipos.putNextEntry(new ZipEntry(file.getName()));
+ os = new DataOutputStream(zipos);
+ InputStream is = new FileInputStream(file);
+ byte[] b = new byte[100];
+ int length;
+ while ((length = is.read(b)) != -1) {
+ os.write(b, 0, length);
+ }
+ is.close();
+ zipos.closeEntry();
+ } catch (IOException e) {
+ log.error("循环将文件写入压缩流出现异常" + e.getMessage());
+ e.printStackTrace();
+ }
+ }
+
+ //关闭流
+ try {
+ os.flush();
+ os.close();
+ zipos.close();
+ } catch (IOException e) {
+ log.error("关闭流现异常" + e.getMessage());
+ e.printStackTrace();
+ }
+
+ }
+
+
+
}
diff --git a/febs-server/febs-server-hr/src/main/resources/febs-server-hr.properties b/febs-server/febs-server-hr/src/main/resources/febs-server-hr.properties
new file mode 100644
index 0000000..c94bee4
--- /dev/null
+++ b/febs-server/febs-server-hr/src/main/resources/febs-server-hr.properties
@@ -0,0 +1,2 @@
+# 批量插入单次最大值，比如配置为1000，那么数据库插入1000条数据commit一次
+febs.server.hr.uploadPpath=D:/upload/hr/
--
Gitblit v1.8.0