sunsail云平台后端管理项目工程
parent: 8c318c38 | 补丁 | 提交 | show whitespace
yz
2021-03-16 52cf7583cff6a6871d54d5a2cae1aa2a3b6b5bbc 
修改bug
4个文件已修改
91 ■■■■■ 已修改文件
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/Folder.java


@@ -1,15 +1,14 @@


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.TableId;


import com.baomidou.mybatisplus.annotation.TableName;


import lombok.Data;


import org.hibernate.validator.constraints.Range;




import javax.validation.constraints.NotBlank;


import javax.validation.constraints.NotNull;


import java.util.Date;




/**


* 文件夹 Entity


@@ -46,7 +45,7 @@


    /**


     * id


     */


    @TableId("parentId")


    @TableField("parentId")


    private Long parentId;


    /**


     * 文件夹名称




 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java


@@ -282,7 +282,7 @@


            if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {


                fileName.add(accessory.getFilesname());


            } else {


                fileName.add(accessory.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() + 1);


                fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());


            }


        });


        MyUtil.download(request, response, files, fileName);




 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java


@@ -1,28 +1,26 @@


package cc.mrbird.febs.server.hr.service.impl;




import cc.mrbird.febs.common.core.constant.ModuleCode;


import cc.mrbird.febs.common.core.entity.constant.FebsConstant;


import cc.mrbird.febs.common.core.utils.SortUtil;


import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;


import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;


import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;


import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;


import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;




import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import org.apache.commons.lang3.StringUtils;


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.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 cc.mrbird.febs.common.core.entity.constant.FebsConstant;


import cc.mrbird.febs.common.core.entity.constant.StringConstant;


import cc.mrbird.febs.common.core.utils.FebsUtil;


import cc.mrbird.febs.common.core.utils.SequenceUtil;


import cc.mrbird.febs.common.core.utils.SortUtil;


import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;


import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;


import cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper;


import cc.mrbird.febs.server.hr.service.IEmpDimissionLogService;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import lombok.RequiredArgsConstructor;


import org.apache.commons.lang3.StringUtils;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;




import java.util.*;




@@ -60,7 +58,7 @@


        if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {


            queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());


        }


        if (empDimissionlog.getEmpId()!=null) {


        if (null!=empDimissionlog.getEmpId()&&!empDimissionlog.getEmpId().equals(0L)) {


            queryWrapper.eq("a.empId", empDimissionlog.getEmpId());


        }


        if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {




 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/FilesUploadServiceImpl.java


@@ -1,21 +1,15 @@


package cc.mrbird.febs.server.hr.service.impl;




import java.io.*;


import java.util.*;


import java.util.stream.Collectors;




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.EmpAccessory;


import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;


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.IEmpBaseInfoService;


import cc.mrbird.febs.server.hr.service.IFilesUploadService;


import cc.mrbird.febs.server.hr.service.IFolderService;


import cn.hutool.core.io.FileUtil;


@@ -23,20 +17,24 @@


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.io.*;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.Date;


import java.util.List;




/**


 * 文件上传 Service实现


@@ -51,10 +49,7 @@




    private final IFolderService iFolderService;


    private final FebsServerHrProperties properties;


    private final IEmpBaseInfoService empBaseInfoService;


    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())


            .map(u -> u.getUserId().toString())


            .orElse("1");




    /**


     * 参数2为数据中心ID 参数1为终端ID


     */


@@ -88,14 +83,14 @@


        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(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(dict.getStr("fileName"));


        filesUpload.setFolderid(folderid);


        filesUpload.setModifier(operatorId);


        filesUpload.setModifier(FebsUtil.getUserId());


        filesUpload.setModifytime(new Date());


        filesUpload.setVersion(0);


        this.save(filesUpload);


@@ -120,7 +115,7 @@


        LambdaUpdateWrapper<FilesUpload> wapper = new LambdaUpdateWrapper<>();


        wapper.in(FilesUpload::getFilesid, arr);


        wapper.set(FilesUpload::getDelFlag, 1);


        wapper.set(FilesUpload::getModifier, operatorId);


        wapper.set(FilesUpload::getModifier, FebsUtil.getUserId());


        wapper.set(FilesUpload::getModifytime, new Date());


        this.update(wapper);




@@ -147,7 +142,7 @@


            if (fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() == 0) {


                fileName.add(filesUpload.getFilesname());


            } else {


                fileName.add(filesUpload.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() + 1);


                fileName.add(filesUpload.getFilesname().substring(0,filesUpload.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count()+"."+filesUpload.getFilesformat());


            }




        });


@@ -167,13 +162,16 @@


            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, fileids);


        wapper.set(FilesUpload::getModifier, operatorId);


        wapper.set(FilesUpload::getFolderid, folderid);


        wapper.set(FilesUpload::getModifier, FebsUtil.getUserId());


        wapper.set(FilesUpload::getModifytime, new Date());


        this.update(wapper);