From 6d240fbbf6a47b4125320f26c4f5c537e1493fb6 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 05 十一月 2021 22:19:12 +0800
Subject: [PATCH] fix(bug修复): 到期合同的统计条件修改为只针对在职员工统计
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java | 216 ++++++++++++++++++++++++++---------------------------
1 files changed, 106 insertions(+), 110 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 ff30333..70e4d21 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,39 +1,40 @@
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.entity.QueryRequest;
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;
-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;
-import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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 lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
/**
* 文件上传 Service实现
@@ -46,11 +47,9 @@
@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())
- .orElse("1");
+
/**
* 参数2为数据中心ID 参数1为终端ID
*/
@@ -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,40 +79,18 @@
@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.setCreator(FebsUtil.getUserId());
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.setModifier(FebsUtil.getUserId());
filesUpload.setModifytime(new Date());
filesUpload.setVersion(0);
this.save(filesUpload);
@@ -121,8 +98,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateFilesUpload(FilesUpload filesUpload) {
- this.saveOrUpdate(filesUpload);
+ public void updateFilesUpload(FilesUpload filesUpload) throws FebsException {
+ if ( filesUpload.getFilesname().lastIndexOf(".")<=0){
+ throw new FebsException("文件名格式错误");
+ }
+ LambdaUpdateWrapper<FilesUpload> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.eq(FilesUpload::getFilesid,filesUpload.getFilesid())
+ .set(FilesUpload::getFilesname,filesUpload.getFilesname()).set(FilesUpload::getFilesformat, filesUpload.getFilesname().substring( filesUpload.getFilesname().lastIndexOf(".")+1));
+ this.update(wrapper);
}
@Override
@@ -130,13 +113,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, FebsUtil.getUserId());
+ 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());
+ });
}
@@ -144,72 +133,79 @@
public void download(String fileids, HttpServletRequest request, HttpServletResponse response) {
String[] arr = fileids.split(",");
List<File> files = new ArrayList<>();
+ List<String> fileName = 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");
+ Folder folder = iFolderService.getById(filesUpload.getFolderid());
+ files.add(new File(properties.getUploadCommonPath() + folder.getFoldername() + "/" + filesUpload.getFilesaddress()));
+ if (fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() == 0) {
+ fileName.add(filesUpload.getFilesname());
} else {
- downloadName = new String(downloadName.getBytes("UTF-8"), "ISO-8859-1");
+ fileName.add(filesUpload.getFilesname().substring(0,filesUpload.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count()+"."+filesUpload.getFilesformat());
}
- } 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();
- }
+ });
+ 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());
+ if (!FileUtil.exist(properties.getUploadCommonPath() + newfolder.getFoldername() )){
+ FileUtil.mkdir(properties.getUploadCommonPath() + newfolder.getFoldername() );
+ }
+ FileUtil.move(oldfile, newfile, true);
+ });
+
+ LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();
+ wapper.in(FilesUpload::getFilesid, arr);
+ wapper.set(FilesUpload::getFolderid, folderid);
+ wapper.set(FilesUpload::getModifier, FebsUtil.getUserId());
+ wapper.set(FilesUpload::getModifytime, new Date());
+ this.update(wapper);
+
+ }
+ @Override
+ public void getImage(String filesid, HttpServletResponse response) throws Exception {
+ FilesUpload filesUpload = this.getById(filesid);
+ if (StrUtil.isBlank(filesUpload.getFilesaddress())) {
+ return;
+ }
+ Folder folder = iFolderService.getById(filesUpload.getFolderid());
+ String path = properties.getUploadCommonPath() + folder.getFoldername() + "/" + filesUpload.getFilesaddress();
+ try (InputStream inputStream = new FileInputStream(path); OutputStream out = response.getOutputStream()) {
+ //byte数组用于存放图片字节数据
+ byte[] buff = new byte[inputStream.available()];
+ inputStream.read(buff);
+ inputStream.close();
+ if (filesUpload.getFilesformat().equals("tif")){
+ //设置发送到客户端的响应内容类型
+ response.setContentType("image/tiff");
+ }else if (filesUpload.getFilesformat().equals("bmp")){
+ response.setContentType("application/x-bmp");
+ }else if (filesUpload.getFilesformat().equals("jpg")){
+ response.setContentType("image/jpeg");
+ }else if (filesUpload.getFilesformat().equals("png")){
+ response.setContentType("image/png");
+ }else if (filesUpload.getFilesformat().equals("gif")){
+ response.setContentType("image/gif");
+ }
+ out.write(buff);
+ }
+ }
+
+
}
--
Gitblit v1.8.0