新增图片回显功能

docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java

@@ -29,7 +29,7 @@ public class CodeGenerator {
         defaultConfig.getGlobalConfig().setSwagger2(true);
         defaultConfig.getGlobalConfig().setDateType(DateType.ONLY_DATE);
         defaultConfig.getStrategy().setEntityLombokModel(true);
-        defaultConfig.getStrategy().setInclude("ocr_basic","ocr_cut_config","ocr_file_info","ocr_rule","ocr_special_rule","ocr_url_config","ocr_version","ocr_basic_test","ocr_cut_config_test","ocr_file_info_test","ocr_rule_test","ocr_special_rule_test","ocr_url_config_test");//需要生成的表，可指定多个，留空为全部生成
+        defaultConfig.getStrategy().setInclude("");//需要生成的表，可指定多个，留空为全部生成
         BaseCodeGenerator.generate(defaultConfig);
     }
 }

docus-segmentation/src/main/java/com/docus/server/controller/FileController.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +22,11 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.OutputStream;
 import java.util.List;
 
 /**
@@ -53,13 +59,36 @@ public class FileController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "files", value = "文件", required = true, dataTypeClass = MultipartFile.class)
     })
-    public void uploadFile(@RequestPart("files") MultipartFile[] files, @Validated UploadBatchFileRequest request) throws Exception {
+    public Object uploadFile(@RequestPart("files") MultipartFile[] files, @Validated UploadBatchFileRequest request) throws Exception {
         List<UploadFileVO> segmentation = iFileUploadService.uploadFile(files, "segmentation");
 
         //将基础信息存到库表里面，后面自动分段后，需要上传到归档系统
-        commonService.add(segmentation, request);
+        Object result = commonService.add(segmentation, request);
 
         iPublishEventService.publishEvent(request.getPatientId(), FlowEvent.FlowTypeEnum.START_SEGMENT);
+
+        return result;
+    }
+
+    /**
+     * 获取图片
+     */
+    @ApiOperation("获取图片")
+    @GetMapping(value = "/getImage")
+    public void getImage(String path, HttpServletRequest request, HttpServletResponse response) {
+        if (StringUtils.isNotBlank(path)) {
+            File image = new File(path);
+            if (image.exists()) {
+                response.setContentType("image/png");
+                try {
+                    FileInputStream in = new FileInputStream(image);
+                    OutputStream out = response.getOutputStream();
+                    FileCopyUtils.copy(in, out);
+                } catch (Exception e) {
+                    System.out.println(e.getMessage());
+                }
+            }
+        }
     }
 
     /**

docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoConvert.java

@@ -1,12 +1,10 @@
 package com.docus.server.convert;
 
 import com.docus.infrastructure.web.response.PageResult;
+import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO;
+import com.docus.server.dto.segmentation.ocrfileinfo.EditOcrFileInfoDTO;
 import com.docus.server.entity.segmentation.OcrFileInfo;
-    import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO;
-    import com.docus.server.dto.segmentation.ocrfileinfo.EditOcrFileInfoDTO;
-    import com.docus.server.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO;
 import com.docus.server.vo.segmentation.ocrfileinfo.OcrFileInfoVO;
-
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
@@ -47,5 +45,6 @@ public interface OcrFileInfoConvert {
     PageResult<OcrFileInfoVO> convertVO(PageResult<OcrFileInfo> pageResult);
     @Mappings({})
     List<OcrFileInfo> convertDO(List<AddOcrFileInfoDTO> files);
+
 }
 

docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java

@@ -45,5 +45,6 @@ public interface OcrFileInfoTestConvert {
 
     @Mappings({})
     List<OcrFileInfoTest> convertDO(List<AddOcrFileInfoTestDTO> files);
+
 }
 

docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java

@@ -31,7 +31,7 @@ public class CommonService {
     private IOcrFileInfoTestService iOcrFileInfoTestService;
 
     @Transactional(rollbackFor = Exception.class)
-    public void add(List<UploadFileVO> segmentation, UploadBatchFileRequest request) {
+    public Object add(List<UploadFileVO> segmentation, UploadBatchFileRequest request) {
         //test
         if (request.getTestData() == 1) {
             AddOcrBasicTestDTO addOcrBasicDTO = new AddOcrBasicTestDTO();
@@ -62,6 +62,7 @@ public class CommonService {
 
             iOcrFileInfoTestService.addBatch(files);
 
+            return files;
         } else {
             AddOcrBasicDTO addOcrBasicDTO = new AddOcrBasicDTO();
 
@@ -88,8 +89,9 @@ public class CommonService {
 
 
             iOcrFileInfoService.addBatch(files);
-        }
 
+            return files;
+        }
 
     }
 }