Zhaops %!s(int64=6) %!d(string=hai) anos
pai
achega
5b52ad255d

+ 4 - 2
prec-service/src/main/java/com/diagbot/dto/FileDTO.java

@@ -16,12 +16,14 @@ public class FileDTO {
     private String title;
     private String url;
     private String info;
+    private Integer type;
 
     public FileDTO(String state, String info) {
         this.state = state;
         this.info = info;
     }
-    public FileDTO(){
+
+    public FileDTO() {
 
     }
-}
+}

+ 3 - 1
prec-service/src/main/java/com/diagbot/service/UploadService.java

@@ -14,8 +14,10 @@ import java.util.List;
 public interface UploadService {
     //单文件上传
     FileDTO singleFileUpload(MultipartFile file);
+
     //多文件上传
     List<FileDTO> multiFileUpload(MultipartFile[] mpfs);
+
     //多文件上传同时生成缩略图
     List<FileThumDTO> multiFileThumUpload(MultipartFile[] mpfs);
-}
+}

+ 2 - 2
prec-service/src/main/java/com/diagbot/service/impl/UploadServiceImpl.java

@@ -37,7 +37,7 @@ public class UploadServiceImpl implements UploadService {
             return new FileDTO("FAILURE", "文件上传失败,超出大小限制4MB");
         }
         try {
-            FileDTO fileDTO = saveFile(file);
+            FileDTO fileDTO = saveFile(file, null);
             return fileDTO;
         } catch (Exception e) {
             log.error("文件上传失败", e);
@@ -65,7 +65,7 @@ public class UploadServiceImpl implements UploadService {
             }
 
             try {
-                FileDTO fileDTO = saveFile(file);
+                FileDTO fileDTO = saveFile(file, null);
                 fileDTOS.add(fileDTO);
             } catch (Exception e) {
                 log.error("文件上传失败", e);

+ 5 - 1
prec-service/src/main/java/com/diagbot/web/UploadController.java

@@ -62,8 +62,12 @@ public class UploadController {
     @ApiOperation(value = "智能预问诊-多个文件上传同时生成缩略图")
     @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
     @PostMapping(value = "/uploadImageThums", produces = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public String multiFileThumUpload(@RequestParam("upfiles") MultipartFile[] file, HttpServletRequest request, HttpServletResponse response) {
+    public String multiFileThumUpload(@RequestParam("upfiles") MultipartFile[] file, @RequestParam("type") Integer type, HttpServletRequest request, HttpServletResponse response) {
         List<FileThumDTO> fileDTO = uploadFacade.multiFileThumUpload(file);
+        for (FileThumDTO fileThumDTO : fileDTO) {
+            fileThumDTO.getSource().setType(type);
+            fileThumDTO.getThumbnail().setType(type);
+        }
         String data = FastJsonUtils.getBeanToJson(fileDTO);
         response.setContentType("text/plain;charset=UTF-8");