From 2373057023decf149fa9a9850875a4f543f3d76d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 14:31:44 +0800
Subject: [PATCH] fix(bug修复): 基本信息录入
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java | 141 +++++++++++++++--------------------------------
1 files changed, 45 insertions(+), 96 deletions(-)
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 7ca006a..0de6f5a 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
@@ -6,15 +6,16 @@
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.MyUtil;
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 cc.mrbird.febs.server.hr.service.IFolderService;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.FileWriter;
+import cn.hutool.core.lang.Dict;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
@@ -32,8 +33,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
/**
* 文件上传 Service实现
@@ -46,7 +45,7 @@
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
public class FilesUploadServiceImpl extends ServiceImpl<FilesUploadMapper, FilesUpload> implements IFilesUploadService {
- private final FilesUploadMapper filesUploadMapper;
+ private final IFolderService iFolderService;
private final FebsServerHrProperties properties;
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
@@ -66,7 +65,7 @@
@Override
public List<FilesUpload> findFilesUploads(FilesUpload filesUpload) {
LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(FilesUpload::getDelFlag,0);
+ queryWrapper.eq(FilesUpload::getDelFlag, 0);
if (null != filesUpload.getFolderid()) {
queryWrapper.eq(FilesUpload::getFolderid, filesUpload.getFolderid());
}
@@ -80,38 +79,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
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));
-
+ Folder folder = iFolderService.getById(folderid);
+ Dict dict = MyUtil.filesUpload(file, properties.getUploadCommonPath() + folder.getFoldername() + "/", snowflake.nextIdStr());
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.setFilesaddress(dict.getStr("newName"));
+ filesUpload.setFilesformat(StrUtil.isBlank(dict.getStr("suffix")) ? dict.getStr("suffix") : dict.getStr("suffix").substring(1));
filesUpload.setFilesid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
- filesUpload.setFilesname(fileName);
+ filesUpload.setFilesname(dict.getStr("fileName"));
filesUpload.setFolderid(folderid);
filesUpload.setModifier(operatorId);
filesUpload.setModifytime(new Date());
@@ -130,13 +107,19 @@
public void deleteFilesUpload(String fileids) {
String[] arr = fileids.split(",");
LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
- wapper.in(FilesUpload::getFilesid,arr).setSql("delFlag = 1");
+ wapper.in(FilesUpload::getFilesid, arr);
+ wapper.set(FilesUpload::getDelFlag,1);
+ wapper.set(FilesUpload::getModifier,operatorId);
+ wapper.set(FilesUpload::getModifytime,new Date());
this.update(wapper);
LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
- wapper.in(FilesUpload::getFilesid,arr);
+ queryWrapper.in(FilesUpload::getFilesid, arr);
List<FilesUpload> list = this.list(queryWrapper);
- list.parallelStream().forEach(i-> FileUtil.del(properties.getUploadPpath() + i.getFilesaddress()));
+ list.parallelStream().forEach(i -> {
+ Folder folder = iFolderService.getById(i.getFolderid());
+ FileUtil.del(properties.getUploadCommonPath() + folder.getFoldername() + "/" + i.getFilesaddress());
+ });
}
@@ -147,71 +130,37 @@
List<String> fileName = new ArrayList<>();
Arrays.stream(arr).forEach(i -> {
FilesUpload filesUpload = this.getById(i);
- files.add(new File(properties.getUploadPpath() + filesUpload.getFilesaddress()));
+ Folder folder = iFolderService.getById(filesUpload.getFolderid());
+ files.add(new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + filesUpload.getFilesaddress()));
fileName.add(filesUpload.getFilesname());
});
- //设置压缩包的名字
- //解决不同浏览器压缩包名字含有中文时乱码的问题
- 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(fileName.get(i)));
- 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();
- }
+ MyUtil.download(request, response, files, fileName);
}
+ @Override
+ public void mvFiles(String fileids,Long folderid) {
+ String[] arr = fileids.split(",");
+
+ LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(FilesUpload::getFilesid, arr);
+ List<FilesUpload> list = this.list(queryWrapper);
+ list.parallelStream().forEach(i -> {
+ Folder folder = iFolderService.getById(i.getFolderid());
+ Folder newfolder = iFolderService.getById(folderid);
+ File oldfile = new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + i.getFilesaddress());
+ File newfile = new File(properties.getUploadCommonPath() + newfolder.getFoldername() + "/" + i.getFilesaddress());
+ FileUtil.move(oldfile,newfile,true);
+ });
+
+ LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
+ wapper.in(FilesUpload::getFilesid, arr);
+ wapper.set(FilesUpload::getFolderid,fileids);
+ wapper.set(FilesUpload::getModifier,operatorId);
+ wapper.set(FilesUpload::getModifytime,new Date());
+ this.update(wapper);
+
+ }
}
--
Gitblit v1.8.0