Merge remote-tracking branch 'origin/dev' into dev

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java

@@ -45,6 +45,8 @@

    @Value("${kidgrow.file-server.oss.domain}")
    private  String DOMAIN;
    @Value("${spring.profiles.active}")
    private String OssPathEn;
    @Override
    public FileInfo upload(MultipartFile file) throws Exception {
        FileInfo fileInfo = FileUtil.getFileInfo(file);
@@ -318,19 +320,49 @@
    }

    @Override
    public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
    public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
        String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
        String newFileName= RandomValueUtils.uuid()+"."+houzhui;
        FileInfo newfileInfo=new FileInfo();
        newfileInfo.setName(newFileName);
        newfileInfo.setId(IdUtil.fastSimpleUUID());
        newfileInfo.setSize(size);
        newfileInfo.setIsImg(true);
        newfileInfo.setIsImg(false);
        newfileInfo.setContentType("byte[]");
        newfileInfo.setSource("aliyun");
        newfileInfo.setImgType(houzhui);
        newfileInfo.setCreateTime(new Date());
        this.fileUpLoadOss(newfileInfo,newFileName,inputStream);
        this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
        baseMapper.insert(newfileInfo);
        inputStream.close();
        return newfileInfo;
    }

    @Override
    public FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId) throws Exception {
        List<String> lassStr= Arrays.asList("png","bmp","dib","gif","jfif","jpe","jpeg","jpg","tif","tiff","ico");
        String suffix=file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1);
        if(!lassStr.contains(suffix)){
            return null;
        }
        String name = file.getOriginalFilename();
        String fileName= UUID.randomUUID().toString().replaceAll("-","");
        //image/jpeg;base64
        String newFileName=fileName+name.substring(name.lastIndexOf("."));
        FileInfo newfileInfo=new FileInfo();
        newfileInfo.setName(newFileName);
        newfileInfo.setId(IdUtil.fastSimpleUUID());
        newfileInfo.setSize(file.getSize());
        newfileInfo.setIsImg(true);
        newfileInfo.setContentType("image/jpeg");
        newfileInfo.setSource("aliyun");
        newfileInfo.setImgType(imgType);
        newfileInfo.setCreateTime(new Date());
        String folderByDate =DateUtil.formatDate(new Date());
        String filePath = FilePath(imgType, folderByDate, hospitalId, departmentId);
        InputStream inputStream = file.getInputStream();
        this.fileUpLoadOss(newfileInfo,filePath+newFileName,inputStream);
        inputStream.close();
        baseMapper.insert(newfileInfo);
        return newfileInfo;
    }