forked from kidgrow-microservices-platform

zhaoxiaohao
2020-10-22 e64ef023096f7ddc4f23a84e9dd0d1d82e1b9c77
添加上传的接口,hospitalId,departId在参数里面
5 files modified
56 ■■■■■ changed files
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java 7 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java 5 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java 6 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java 29 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java 9 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -60,5 +60,12 @@
     */
    @PostMapping(value="byteUplaod")
    FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes);
    /**
     * 文件上传 根据fileType选择上传方式 hospitalId  departmentId
     * @param file
     * @return
     */
    @PostMapping(value="/feignUploadHosIdAndDepId",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    FileInfo feignUploadHosIdAndDepId(@RequestPart("file") MultipartFile file,@RequestParam("imgType") String imgType,@RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId);
}
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
@@ -51,6 +51,11 @@
            public FileInfo byteUplaod(String fileName, byte[] bytes) {
                return null;
            }
            @Override
            public FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId) {
                return null;
            }
        };
    }
}
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java
@@ -44,4 +44,10 @@
    ResultBody baseDownLoad(Map<String, Object> map) throws Exception;
    FileInfo byteUplaod(String fileName, InputStream inputStream, int size);
    /**
     * 文件上传 根据fileType选择上传方式 hospitalId  departmentId
     * @param file
     * @return
     */
    FileInfo feignUploadHosIdAndDepId(MultipartFile file, String imgType, String hospitalId, String departmentId)throws Exception;
}
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java
@@ -336,5 +336,34 @@
        baseMapper.insert(newfileInfo);
        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;
    }
}
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
@@ -69,6 +69,15 @@
        return fileService.uploadForThumbnails(file,imgType);
    }
    /**
     * 文件上传 根据fileType选择上传方式 hospitalId  departmentId
     * @param file
     * @return
     */
    @PostMapping(value="/feignUploadHosIdAndDepId",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    public FileInfo feignUploadHosIdAndDepId(@RequestPart("file") MultipartFile file,@RequestParam("imgType") String imgType,@RequestParam("hospitalId") String hospitalId,@RequestParam("departmentId") String departmentId) throws Exception {
        return fileService.feignUploadHosIdAndDepId(file,imgType,hospitalId,departmentId);
    }
    /**
     * base64上传图片
     */
    @PostMapping(value="baseUplaod",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE)