diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/FileDto.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/FileDTO.java similarity index 91% rename from docus-client-interface/src/main/java/com/docus/server/vo/segmentation/FileDto.java rename to docus-client-interface/src/main/java/com/docus/server/dto/segmentation/FileDTO.java index 4dfaa06..3a34afe 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/FileDto.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/FileDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.vo.segmentation; +package com.docus.server.dto.segmentation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Data; */ @ApiModel("上传文件附带的文件信息") @Data -public class FileDto { +public class FileDTO { @ApiModelProperty("文件分类ID") private String assortId; @ApiModelProperty("文件展示标题") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/UploadBatchFileParam.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java similarity index 86% rename from docus-client-interface/src/main/java/com/docus/server/vo/segmentation/UploadBatchFileParam.java rename to docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java index bdf0a95..2c8a53e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/UploadBatchFileParam.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java @@ -1,4 +1,4 @@ -package com.docus.server.vo.segmentation; +package com.docus.server.dto.segmentation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,8 @@ import javax.validation.constraints.NotNull; @Data @ApiModel("文件上传参数") -public class UploadBatchFileParam { +public class UploadBatchFileRequest { + @ApiModelProperty(value = "业务系统病案主键") @NotNull(message = "业务系统病案主键不能为空") private String patientId; @@ -16,7 +17,6 @@ public class UploadBatchFileParam { @ApiModelProperty(value = "采集器id,来源") private String collectorId; - @ApiModelProperty(value = "扫描用户代码 默认admin") private String scanUserCode = "admin"; @@ -29,7 +29,8 @@ public class UploadBatchFileParam { @ApiModelProperty(value = "任务id,如果有 ") private Long taskId = -1L; - @ApiModelProperty(value = "文件信息Json FileDto Model") + @ApiModelProperty(value = "文件信息Json FileDTO Model") @NotNull(message = "文件信息Json不能为空!") private String fileInfo; + } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java index 47c4407..580f763 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java @@ -1,10 +1,13 @@ package com.docus.server.controller; import com.docus.server.common.service.IFileUploadService; +import com.docus.server.dto.segmentation.UploadBatchFileRequest; +import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -14,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 文件上传下载 API @@ -39,8 +43,9 @@ public class FileController { @ApiImplicitParams({ @ApiImplicitParam(name = "files", value = "文件", required = true, dataTypeClass = MultipartFile.class) }) - public void uploadFile(@RequestPart("files") MultipartFile[] files, String pathKey) throws Exception { - iFileUploadService.uploadFile(files, pathKey); + public void uploadFile(@RequestPart("files") MultipartFile[] files, @Validated UploadBatchFileRequest request) throws Exception { + List segmentation = iFileUploadService.uploadFile(files, "segmentation"); + //将基础信息存到库表里面,后面自动分段后,需要上传到归档系统 } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrServiceImpl.java index 46001cd..7d4d14b 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrServiceImpl.java @@ -76,7 +76,7 @@ public class OcrServiceImpl implements OcrApi { @Override public OcrResponse uploadFile(Map params) { - + HTTP_POST_LOCK.lock(); try { diff --git a/docus-segmentation/src/test/java/com/docus/server/ImageProcessingExample.java b/docus-segmentation/src/test/java/com/docus/server/ImageProcessingExample.java index d3a2691..501e51c 100644 --- a/docus-segmentation/src/test/java/com/docus/server/ImageProcessingExample.java +++ b/docus-segmentation/src/test/java/com/docus/server/ImageProcessingExample.java @@ -3,8 +3,8 @@ package com.docus.server; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.docus.core.util.json.JSON; -import com.docus.server.vo.segmentation.FileDto; -import com.docus.server.vo.segmentation.UploadBatchFileParam; +import com.docus.server.dto.segmentation.FileDTO; +import com.docus.server.dto.segmentation.UploadBatchFileRequest; import java.io.File; import java.util.ArrayList; @@ -16,13 +16,13 @@ public class ImageProcessingExample { public static void main(String[] args) throws Exception { - UploadBatchFileParam uploadBatchFileParam = new UploadBatchFileParam(); + UploadBatchFileRequest uploadBatchFileParam = new UploadBatchFileRequest(); System.out.println(JSON.toJSON(uploadBatchFileParam)); - FileDto fileDto = new FileDto(); + FileDTO fileDto = new FileDTO(); System.out.println(JSON.toJSON(fileDto)); - List fileDtoList = new ArrayList<>(); + List fileDtoList = new ArrayList<>(); System.out.println(JSON.toJSON(fileDtoList));