fix(人力微服务): 修改前端，后端判断比较多，撤回上版本操作

yz

2021-04-06 e42bbb438b21ad7ef01888b7172ee5f810d2ab39

 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);
@@ -104,12 +99,12 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateFilesUpload(FilesUpload filesUpload) throws FebsException {
        if ( filesUpload.getFilesname().indexOf(".")<=0){
        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().indexOf(".")+1));
                .set(FilesUpload::getFilesname,filesUpload.getFilesname()).set(FilesUpload::getFilesformat,  filesUpload.getFilesname().substring( filesUpload.getFilesname().lastIndexOf(".")+1));
        this.update(wrapper);
    }

@@ -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().lastIndexOf(".")) + 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);