From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
index b70149c..df66f75 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java
+++ b/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)

--
Gitblit v1.8.0