fix(hr微服务): 修改bug

yz_08

2021-03-30 14a1d7b4f7da211a333f997d8ec5a31bfeb82f2c

fix(hr微服务): 修改bug

修改文件操作获取后缀方法

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java

@@ -117,7 +117,7 @@
        //原本名字
        String fileName = file.getOriginalFilename();
        String suffix = "";
        if (fileName.indexOf(".") > 0) {
        if (fileName.lastIndexOf(".") > 0) {
            //后缀
            suffix = fileName.substring(fileName.lastIndexOf("."));
        }

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

@@ -238,12 +238,12 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
        if ( empAccessory.getFilesname().indexOf(".")<=0){
        if ( empAccessory.getFilesname().lastIndexOf(".")<=0){
            throw  new FebsException("文件名格式错误");
        }
        LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
        wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
                .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat,  empAccessory.getFilesname().substring( empAccessory.getFilesname().indexOf(".")+1));
                .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat,  empAccessory.getFilesname().substring( empAccessory.getFilesname().lastIndexOf(".")+1));
        this.update(wrapper);
    }

@@ -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().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
                fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
            }
        });
        MyUtil.download(request, response, files, fileName);
@@ -387,8 +387,8 @@
                accessory.setDelFlag(0);
                accessory.setEmpid(empBaseInfo.get(0).getEmpId());
                accessory.setFilesaddress(file1.getName());
                if (file1.getName().indexOf(".") > 0) {
                    accessory.setFilesformat( file1.getName().substring(file1.getName().indexOf(".")+1));
                if (file1.getName().lastIndexOf(".") > 0) {
                    accessory.setFilesformat( file1.getName().substring(file1.getName().lastIndexOf(".")+1));
                }
                accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
                accessory.setFilesname(file1.getName());

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

@@ -637,7 +637,7 @@
            inputStream.read(buff);
            inputStream.close();

            String  contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().indexOf(".")+1);
            String  contentType = empBaseInfo.getImagePath().substring(empBaseInfo.getImagePath().lastIndexOf(".")+1);
            if (contentType.equals("tif")){
                //设置发送到客户端的响应内容类型
                response.setContentType("image/tiff");

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

@@ -99,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);
    }

@@ -142,7 +142,7 @@
            if (fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count() == 0) {
                fileName.add(filesUpload.getFilesname());
            } else {
                fileName.add(filesUpload.getFilesname().substring(0,filesUpload.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count()+"."+filesUpload.getFilesformat());
                fileName.add(filesUpload.getFilesname().substring(0,filesUpload.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(filesUpload.getFilesname(), filter)).count()+"."+filesUpload.getFilesformat());
            }

        });