diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicApi.java index aff2c43..37d1dde 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO; -import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; +import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; -import com.docus.server.entity.segmentation.OcrBasic; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 患者信息表 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 患者信息表 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrBasicApi") -@RequestMapping("/ocrBasic") +@RequestMapping("/ocr/Basic") public interface OcrBasicApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrBasicVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrBasicDTO 新增参数 - */ + * 新增 + * + * @param addOcrBasicDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrBasicDTO addOcrBasicDTO); /** - * 编辑 - * @param editOcrBasicDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrBasicDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrBasicDTO editOcrBasicDTO); /** - * 批量删除 - * @param deleteOcrBasicDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrBasicDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrBasicDTO deleteOcrBasicDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicTestApi.java index cc80503..c2db1d8 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrbasictest.AddOcrBasicTestDTO; -import com.docus.server.dto.segmentation.ocrbasictest.EditOcrBasicTestDTO; import com.docus.server.dto.segmentation.ocrbasictest.DeleteOcrBasicTestDTO; +import com.docus.server.dto.segmentation.ocrbasictest.EditOcrBasicTestDTO; import com.docus.server.vo.segmentation.ocrbasictest.OcrBasicTestVO; -import com.docus.server.entity.segmentation.OcrBasicTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 患者信息表-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 患者信息表-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrBasicTestApi") -@RequestMapping("/ocrBasicTest") +@RequestMapping("/ocr/BasicTest") public interface OcrBasicTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrBasicTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrBasicTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrBasicTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrBasicTestDTO addOcrBasicTestDTO); /** - * 编辑 - * @param editOcrBasicTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrBasicTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrBasicTestDTO editOcrBasicTestDTO); /** - * 批量删除 - * @param deleteOcrBasicTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrBasicTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrBasicTestDTO deleteOcrBasicTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigApi.java index 02a9d4d..2c2a817 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrcutconfig.AddOcrCutConfigDTO; -import com.docus.server.dto.segmentation.ocrcutconfig.EditOcrCutConfigDTO; import com.docus.server.dto.segmentation.ocrcutconfig.DeleteOcrCutConfigDTO; +import com.docus.server.dto.segmentation.ocrcutconfig.EditOcrCutConfigDTO; import com.docus.server.vo.segmentation.ocrcutconfig.OcrCutConfigVO; -import com.docus.server.entity.segmentation.OcrCutConfig; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr图片剪切配置 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr图片剪切配置 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrCutConfigApi") -@RequestMapping("/ocrCutConfig") +@RequestMapping("/ocr/CutConfig") public interface OcrCutConfigApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrCutConfigVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrCutConfigDTO 新增参数 - */ + * 新增 + * + * @param addOcrCutConfigDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrCutConfigDTO addOcrCutConfigDTO); /** - * 编辑 - * @param editOcrCutConfigDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrCutConfigDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrCutConfigDTO editOcrCutConfigDTO); /** - * 批量删除 - * @param deleteOcrCutConfigDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrCutConfigDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrCutConfigDTO deleteOcrCutConfigDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigTestApi.java index 962e663..b641b50 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrcutconfigtest.AddOcrCutConfigTestDTO; -import com.docus.server.dto.segmentation.ocrcutconfigtest.EditOcrCutConfigTestDTO; import com.docus.server.dto.segmentation.ocrcutconfigtest.DeleteOcrCutConfigTestDTO; +import com.docus.server.dto.segmentation.ocrcutconfigtest.EditOcrCutConfigTestDTO; import com.docus.server.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO; -import com.docus.server.entity.segmentation.OcrCutConfigTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr图片剪切配置-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr图片剪切配置-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrCutConfigTestApi") -@RequestMapping("/ocrCutConfigTest") +@RequestMapping("/ocr/CutConfigTest") public interface OcrCutConfigTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrCutConfigTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrCutConfigTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrCutConfigTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrCutConfigTestDTO addOcrCutConfigTestDTO); /** - * 编辑 - * @param editOcrCutConfigTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrCutConfigTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrCutConfigTestDTO editOcrCutConfigTestDTO); /** - * 批量删除 - * @param deleteOcrCutConfigTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrCutConfigTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrCutConfigTestDTO deleteOcrCutConfigTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoApi.java index a793573..335154d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +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.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO; +import com.docus.server.dto.segmentation.ocrfileinfo.EditOcrFileInfoDTO; import com.docus.server.vo.segmentation.ocrfileinfo.OcrFileInfoVO; -import com.docus.server.entity.segmentation.OcrFileInfo; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr文件信息 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr文件信息 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrFileInfoApi") -@RequestMapping("/ocrFileInfo") +@RequestMapping("/ocr/FileInfo") public interface OcrFileInfoApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrFileInfoVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrFileInfoDTO 新增参数 - */ + * 新增 + * + * @param addOcrFileInfoDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrFileInfoDTO addOcrFileInfoDTO); /** - * 编辑 - * @param editOcrFileInfoDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrFileInfoDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrFileInfoDTO editOcrFileInfoDTO); /** - * 批量删除 - * @param deleteOcrFileInfoDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrFileInfoDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrFileInfoDTO deleteOcrFileInfoDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoTestApi.java index a758290..55f2d7f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrfileinfotest.AddOcrFileInfoTestDTO; -import com.docus.server.dto.segmentation.ocrfileinfotest.EditOcrFileInfoTestDTO; import com.docus.server.dto.segmentation.ocrfileinfotest.DeleteOcrFileInfoTestDTO; +import com.docus.server.dto.segmentation.ocrfileinfotest.EditOcrFileInfoTestDTO; import com.docus.server.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO; -import com.docus.server.entity.segmentation.OcrFileInfoTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr文件信息-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr文件信息-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrFileInfoTestApi") -@RequestMapping("/ocrFileInfoTest") +@RequestMapping("/ocr/FileInfoTest") public interface OcrFileInfoTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrFileInfoTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrFileInfoTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrFileInfoTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrFileInfoTestDTO addOcrFileInfoTestDTO); /** - * 编辑 - * @param editOcrFileInfoTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrFileInfoTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrFileInfoTestDTO editOcrFileInfoTestDTO); /** - * 批量删除 - * @param deleteOcrFileInfoTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrFileInfoTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrFileInfoTestDTO deleteOcrFileInfoTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleApi.java index 3c88bd8..061a5a6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrrule.AddOcrRuleDTO; -import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; +import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; -import com.docus.server.entity.segmentation.OcrRule; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 匹配策略表 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 匹配策略表 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrRuleApi") -@RequestMapping("/ocrRule") +@RequestMapping("/ocr/Rule") public interface OcrRuleApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrRuleVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrRuleDTO 新增参数 - */ + * 新增 + * + * @param addOcrRuleDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrRuleDTO addOcrRuleDTO); /** - * 编辑 - * @param editOcrRuleDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrRuleDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrRuleDTO editOcrRuleDTO); /** - * 批量删除 - * @param deleteOcrRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrRuleDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrRuleDTO deleteOcrRuleDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleTestApi.java index f8c65db..705364e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrruletest.AddOcrRuleTestDTO; -import com.docus.server.dto.segmentation.ocrruletest.EditOcrRuleTestDTO; import com.docus.server.dto.segmentation.ocrruletest.DeleteOcrRuleTestDTO; +import com.docus.server.dto.segmentation.ocrruletest.EditOcrRuleTestDTO; import com.docus.server.vo.segmentation.ocrruletest.OcrRuleTestVO; -import com.docus.server.entity.segmentation.OcrRuleTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 匹配策略表-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 匹配策略表-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrRuleTestApi") -@RequestMapping("/ocrRuleTest") +@RequestMapping("/ocr/RuleTest") public interface OcrRuleTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrRuleTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrRuleTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrRuleTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrRuleTestDTO addOcrRuleTestDTO); /** - * 编辑 - * @param editOcrRuleTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrRuleTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrRuleTestDTO editOcrRuleTestDTO); /** - * 批量删除 - * @param deleteOcrRuleTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrRuleTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrRuleTestDTO deleteOcrRuleTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java index 5fea172..ffe4141 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java @@ -25,7 +25,7 @@ import java.util.List; * @since 2023-08-21 */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpRuleApi") -@RequestMapping("/ocrSpRule") +@RequestMapping("/ocr/SpRule") public interface OcrSpRuleApi { /** diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialDetailApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialDetailApi.java index e64e35f..7b916b7 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialDetailApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialDetailApi.java @@ -25,7 +25,7 @@ import java.util.List; * @since 2023-08-25 */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpecialDetailApi") -@RequestMapping("/ocrSpecialDetail") +@RequestMapping("/ocr/SpecialDetail") public interface OcrSpecialDetailApi { /** diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleApi.java index fc6799d..a540c9c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrspecialrule.AddOcrSpecialRuleDTO; -import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; +import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; -import com.docus.server.entity.segmentation.OcrSpecialRule; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 特殊策略表 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 特殊策略表 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpecialRuleApi") -@RequestMapping("/ocrSpecialRule") +@RequestMapping("/ocr/SpecialRule") public interface OcrSpecialRuleApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrSpecialRuleVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrSpecialRuleDTO 新增参数 - */ + * 新增 + * + * @param addOcrSpecialRuleDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrSpecialRuleDTO addOcrSpecialRuleDTO); /** - * 编辑 - * @param editOcrSpecialRuleDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrSpecialRuleDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrSpecialRuleDTO editOcrSpecialRuleDTO); /** - * 批量删除 - * @param deleteOcrSpecialRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrSpecialRuleDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrSpecialRuleDTO deleteOcrSpecialRuleDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleTestApi.java index 783b1c2..da63a2a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrspecialruletest.AddOcrSpecialRuleTestDTO; -import com.docus.server.dto.segmentation.ocrspecialruletest.EditOcrSpecialRuleTestDTO; import com.docus.server.dto.segmentation.ocrspecialruletest.DeleteOcrSpecialRuleTestDTO; +import com.docus.server.dto.segmentation.ocrspecialruletest.EditOcrSpecialRuleTestDTO; import com.docus.server.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; -import com.docus.server.entity.segmentation.OcrSpecialRuleTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 特殊策略表-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 特殊策略表-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpecialRuleTestApi") -@RequestMapping("/ocrSpecialRuleTest") +@RequestMapping("/ocr/SpecialRuleTest") public interface OcrSpecialRuleTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrSpecialRuleTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrSpecialRuleTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrSpecialRuleTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO); /** - * 编辑 - * @param editOcrSpecialRuleTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrSpecialRuleTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO); /** - * 批量删除 - * @param deleteOcrSpecialRuleTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrSpecialRuleTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrSpecialRuleTestDTO deleteOcrSpecialRuleTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigApi.java index 2120b9e..e7f5e07 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrurlconfig.AddOcrUrlConfigDTO; -import com.docus.server.dto.segmentation.ocrurlconfig.EditOcrUrlConfigDTO; import com.docus.server.dto.segmentation.ocrurlconfig.DeleteOcrUrlConfigDTO; +import com.docus.server.dto.segmentation.ocrurlconfig.EditOcrUrlConfigDTO; import com.docus.server.vo.segmentation.ocrurlconfig.OcrUrlConfigVO; -import com.docus.server.entity.segmentation.OcrUrlConfig; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr路径配置表 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr路径配置表 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrUrlConfigApi") -@RequestMapping("/ocrUrlConfig") +@RequestMapping("/ocr/UrlConfig") public interface OcrUrlConfigApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrUrlConfigVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrUrlConfigDTO 新增参数 - */ + * 新增 + * + * @param addOcrUrlConfigDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrUrlConfigDTO addOcrUrlConfigDTO); /** - * 编辑 - * @param editOcrUrlConfigDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrUrlConfigDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrUrlConfigDTO editOcrUrlConfigDTO); /** - * 批量删除 - * @param deleteOcrUrlConfigDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrUrlConfigDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrUrlConfigDTO deleteOcrUrlConfigDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigTestApi.java index da6e1d1..8bf76de 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigTestApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrurlconfigtest.AddOcrUrlConfigTestDTO; -import com.docus.server.dto.segmentation.ocrurlconfigtest.EditOcrUrlConfigTestDTO; import com.docus.server.dto.segmentation.ocrurlconfigtest.DeleteOcrUrlConfigTestDTO; +import com.docus.server.dto.segmentation.ocrurlconfigtest.EditOcrUrlConfigTestDTO; import com.docus.server.vo.segmentation.ocrurlconfigtest.OcrUrlConfigTestVO; -import com.docus.server.entity.segmentation.OcrUrlConfigTest; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* ocr路径配置表-调试 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr路径配置表-调试 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrUrlConfigTestApi") -@RequestMapping("/ocrUrlConfigTest") +@RequestMapping("/ocr/UrlConfigTest") public interface OcrUrlConfigTestApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrUrlConfigTestVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrUrlConfigTestDTO 新增参数 - */ + * 新增 + * + * @param addOcrUrlConfigTestDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO); /** - * 编辑 - * @param editOcrUrlConfigTestDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrUrlConfigTestDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO); /** - * 批量删除 - * @param deleteOcrUrlConfigTestDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrUrlConfigTestDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrUrlConfigTestDTO deleteOcrUrlConfigTestDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrVersionApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrVersionApi.java index 9573edf..61f57d9 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrVersionApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrVersionApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.ocrversion.AddOcrVersionDTO; -import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; +import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; -import com.docus.server.entity.segmentation.OcrVersion; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 正式数据版本号管理 API -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 正式数据版本号管理 API + * + * @author AutoGenerator + * @since 2023-08-29 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrVersionApi") -@RequestMapping("/ocrVersion") +@RequestMapping("/ocr/Version") public interface OcrVersionApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") OcrVersionVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addOcrVersionDTO 新增参数 - */ + * 新增 + * + * @param addOcrVersionDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddOcrVersionDTO addOcrVersionDTO); /** - * 编辑 - * @param editOcrVersionDTO 编辑参数 - */ + * 编辑 + * + * @param editOcrVersionDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditOcrVersionDTO editOcrVersionDTO); /** - * 批量删除 - * @param deleteOcrVersionDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteOcrVersionDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteOcrVersionDTO deleteOcrVersionDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java index 664dde4..a3f7803 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/ZdAssortApi.java @@ -1,72 +1,81 @@ package com.docus.server.api.segmentation; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.dto.segmentation.zdassort.AddZdAssortDTO; -import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; import com.docus.server.dto.segmentation.zdassort.DeleteZdAssortDTO; +import com.docus.server.dto.segmentation.zdassort.EditZdAssortDTO; import com.docus.server.vo.segmentation.zdassort.ZdAssortVO; -import com.docus.server.entity.segmentation.ZdAssort; import org.springframework.cloud.openfeign.FeignClient; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + import java.util.List; /** -* -* 病案分类 API -* -* @author AutoGenerator -* @since 2023-08-30 -*/ + * 病案分类 API + * + * @author AutoGenerator + * @since 2023-08-30 + */ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.ZdAssortApi") @RequestMapping("/zdAssort") public interface ZdAssortApi { /** - * 按主键查询 - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ @GetMapping("/find/{id}") ZdAssortVO findById(@PathVariable(value = "id") Long id); /** - * 查询所有 - * @return 实体 - */ + * 查询所有 + * + * @return 实体 + */ @GetMapping("/findAll") List findAll(); /** - * 关键字搜索 - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); /** - * 新增 - * @param addZdAssortDTO 新增参数 - */ + * 新增 + * + * @param addZdAssortDTO 新增参数 + */ @PostMapping("/add") void add(@RequestBody AddZdAssortDTO addZdAssortDTO); /** - * 编辑 - * @param editZdAssortDTO 编辑参数 - */ + * 编辑 + * + * @param editZdAssortDTO 编辑参数 + */ @PutMapping("/edit") void edit(@RequestBody EditZdAssortDTO editZdAssortDTO); /** - * 批量删除 - * @param deleteZdAssortDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * + * @param deleteZdAssortDTO 删除参数 + * @return 成功或失败 + */ @DeleteMapping("/delete") int delete(@RequestBody DeleteZdAssortDTO deleteZdAssortDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java index cadd913..384e9ad 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/UploadBatchFileRequest.java @@ -32,12 +32,15 @@ public class UploadBatchFileRequest { private String scanUserName = "admin"; @ApiModelProperty(value = "文档类型，0：病案3.0归档系统 1：3.0门急诊归档系统 ") + @NotNull(message = "文档类型不能为空") private Integer recordType = 0; - @ApiModelProperty(value = "任务id，如果有 ") + @ApiModelProperty(value = "任务id，如果有，没有传入-1") + @NotNull(message = "任务id不能为空") private Long taskId = -1L; @ApiModelProperty(value = "是否测试数据(0否 1是)") + @NotNull(message = "是否测试数据(0否 1是)不能为空") private int testData; @ApiModelProperty(value = "文件信息Json FileDTO Model") diff --git a/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java b/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java index 607f354..3b2e211 100644 --- a/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java +++ b/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java @@ -1,10 +1,12 @@ package com.docus.server; +import com.docus.log.EnableTrackGroup; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; +@EnableTrackGroup @EnableAsync @EnableFeignClients(basePackages = {"com.docus.core.excel.feign", "com.docus.server.api"}) @SpringBootApplication(scanBasePackages = {"com.docus"}) diff --git a/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEvent.java b/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEvent.java index 7458da7..c47782d 100644 --- a/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEvent.java +++ b/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEvent.java @@ -42,12 +42,12 @@ public class FlowEvent extends ApplicationEvent { @Override public Integer getValue() { - return null; + return this.value; } @Override public String getDisplay() { - return null; + return this.display; } } diff --git a/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEventListener.java b/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEventListener.java index 49ce06e..38bb060 100644 --- a/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEventListener.java +++ b/docus-segmentation/src/main/java/com/docus/server/common/event/FlowEventListener.java @@ -1,72 +1,26 @@ package com.docus.server.common.event; -import com.docus.server.api.ocr.OcrApi; -import com.docus.server.service.impl.PlatformServiceImpl; +import com.docus.log.executor.TrackRetrySpringExecutor; +import com.docus.log.handler.IJobHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.List; - @Component @Slf4j public class FlowEventListener { - @Resource - private OcrApi ocrApi; - @Resource - private PlatformServiceImpl downloadService; @EventListener @Async("threadPoolExecutor") - public void flowListen(FlowEvent fileEvent) { - - String patientId = fileEvent.getPatientId(); + public void flowListen(FlowEvent fileEvent) throws Exception { FlowEvent.FlowTypeEnum flowTypeEnum = fileEvent.getFlowTypeEnum(); - switch (flowTypeEnum) { - case START_SEGMENT: - startSegment(patientId); - break; - case START_OCR: - startOcr(patientId); - break; - case START_UPLOAD: - startUpload(patientId); - break; - default: - break; - } - - } + IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(flowTypeEnum.name()); - /** - * 开始上传归档系统 - * - * @param patientId - */ - private void startUpload(String patientId) { - downloadService.uploadPlatform(null, null); - } + jobHandler.execute(fileEvent.getPatientId()); - /** - * 开始进行ocr识别 - * - * @param patientId - */ - private void startOcr(String patientId) { - System.out.println(patientId); - List text = ocrApi.getText("D:\\docus\\cut\\segmentation\\20230822\\c6b03e5767814895a2c155c32f174051\\麻醉.jpg"); } - /** - * 开始分段 - * - * @param patientId - */ - private void startSegment(String patientId) { - System.out.println(patientId); - } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrHandler.java b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrHandler.java new file mode 100644 index 0000000..0468190 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartOcrHandler.java @@ -0,0 +1,23 @@ +package com.docus.server.service.handler; + +import com.docus.log.annotation.TrackRetryListener; +import com.docus.server.api.ocr.OcrApi; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 开始OCR处理器 + */ +@Component +public class StartOcrHandler { + @Resource + private OcrApi ocrApi; + + @TrackRetryListener("START_OCR") + public void startOcr(String patientId) { + System.out.println(patientId); + List text = ocrApi.getText("D:\\docus\\cut\\segmentation\\20230822\\c6b03e5767814895a2c155c32f174051\\麻醉.jpg"); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java new file mode 100644 index 0000000..739a2c5 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartSegmentHandler.java @@ -0,0 +1,16 @@ +package com.docus.server.service.handler; + +import com.docus.log.annotation.TrackRetryListener; +import org.springframework.stereotype.Component; + +/** + * 开始分段处理器 + */ +@Component +public class StartSegmentHandler { + + @TrackRetryListener("START_SEGMENT") + public void startSegment(String patientId) { + System.out.println(patientId); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/handler/StartUploadHandler.java b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartUploadHandler.java new file mode 100644 index 0000000..7a20c80 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/handler/StartUploadHandler.java @@ -0,0 +1,21 @@ +package com.docus.server.service.handler; + +import com.docus.log.annotation.TrackRetryListener; +import com.docus.server.service.impl.PlatformServiceImpl; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 开始上传归档系统处理器 + */ +@Component +public class StartUploadHandler { + @Resource + private PlatformServiceImpl downloadService; + + @TrackRetryListener("START_UPLOAD") + public void startUpload(String patientId) { + downloadService.uploadPlatform(null, null); + } +}