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 fbc7ac0..aff2c43 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,81 +1,72 @@ 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.DeleteOcrBasicDTO; import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; +import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; +import com.docus.server.entity.segmentation.OcrBasic; import org.springframework.cloud.openfeign.FeignClient; -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 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 java.util.List; /** - * 患者信息表 API - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrBasicApi") @RequestMapping("/ocrBasic") 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 new file mode 100644 index 0000000..cc80503 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrBasicTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* 患者信息表-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrBasicTestApi") +@RequestMapping("/ocrBasicTest") +public interface OcrBasicTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrBasicTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrBasicTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrBasicTestDTO addOcrBasicTestDTO); + + /** + * 编辑 + * @param editOcrBasicTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrBasicTestDTO editOcrBasicTestDTO); + + /** + * 批量删除 + * @param deleteOcrBasicTestDTO 删除参数 + * @return 成功或失败 + */ + @DeleteMapping("/delete") + int delete(@RequestBody DeleteOcrBasicTestDTO deleteOcrBasicTestDTO); +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrConfigApi.java deleted file mode 100644 index 1be6bbe..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrConfigApi.java +++ /dev/null @@ -1,81 +0,0 @@ -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.ocrconfig.AddOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.DeleteOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.EditOcrConfigDTO; -import com.docus.server.vo.segmentation.ocrconfig.OcrConfigVO; -import org.springframework.cloud.openfeign.FeignClient; -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-25 - */ -@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrConfigApi") -@RequestMapping("/ocrConfig") -public interface OcrConfigApi { - - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - @GetMapping("/find/{id}") - OcrConfigVO findById(@PathVariable(value = "id") Long id); - - /** - * 查询所有 - * - * @return 实体 - */ - @GetMapping("/findAll") - List findAll(); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @PostMapping("/search") - PageResult search(@RequestBody SearchDTO searchDTO); - - /** - * 新增 - * - * @param addOcrConfigDTO 新增参数 - */ - @PostMapping("/add") - void add(@RequestBody AddOcrConfigDTO addOcrConfigDTO); - - /** - * 编辑 - * - * @param editOcrConfigDTO 编辑参数 - */ - @PutMapping("/edit") - void edit(@RequestBody EditOcrConfigDTO editOcrConfigDTO); - - /** - * 批量删除 - * - * @param deleteOcrConfigDTO 删除参数 - * @return 成功或失败 - */ - @DeleteMapping("/delete") - int delete(@RequestBody DeleteOcrConfigDTO deleteOcrConfigDTO); -} 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 new file mode 100644 index 0000000..02a9d4d --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* ocr图片剪切配置 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrCutConfigApi") +@RequestMapping("/ocrCutConfig") +public interface OcrCutConfigApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrCutConfigVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrCutConfigDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrCutConfigDTO addOcrCutConfigDTO); + + /** + * 编辑 + * @param editOcrCutConfigDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrCutConfigDTO editOcrCutConfigDTO); + + /** + * 批量删除 + * @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 new file mode 100644 index 0000000..962e663 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrCutConfigTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* ocr图片剪切配置-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrCutConfigTestApi") +@RequestMapping("/ocrCutConfigTest") +public interface OcrCutConfigTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrCutConfigTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrCutConfigTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrCutConfigTestDTO addOcrCutConfigTestDTO); + + /** + * 编辑 + * @param editOcrCutConfigTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrCutConfigTestDTO editOcrCutConfigTestDTO); + + /** + * 批量删除 + * @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 e0b8848..a793573 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,81 +1,72 @@ 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.DeleteOcrFileInfoDTO; 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 com.docus.server.entity.segmentation.OcrFileInfo; import org.springframework.cloud.openfeign.FeignClient; -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 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 java.util.List; /** - * ocr文件信息 API - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* ocr文件信息 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrFileInfoApi") @RequestMapping("/ocrFileInfo") 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 new file mode 100644 index 0000000..a758290 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrFileInfoTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* ocr文件信息-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrFileInfoTestApi") +@RequestMapping("/ocrFileInfoTest") +public interface OcrFileInfoTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrFileInfoTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrFileInfoTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrFileInfoTestDTO addOcrFileInfoTestDTO); + + /** + * 编辑 + * @param editOcrFileInfoTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrFileInfoTestDTO editOcrFileInfoTestDTO); + + /** + * 批量删除 + * @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 e1b30bf..3c88bd8 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,81 +1,72 @@ 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.DeleteOcrRuleDTO; import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; +import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; +import com.docus.server.entity.segmentation.OcrRule; import org.springframework.cloud.openfeign.FeignClient; -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 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 java.util.List; /** - * 匹配策略表 API - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 匹配策略表 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrRuleApi") @RequestMapping("/ocrRule") 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 new file mode 100644 index 0000000..f8c65db --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrRuleTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* 匹配策略表-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrRuleTestApi") +@RequestMapping("/ocrRuleTest") +public interface OcrRuleTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrRuleTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrRuleTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrRuleTestDTO addOcrRuleTestDTO); + + /** + * 编辑 + * @param editOcrRuleTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrRuleTestDTO editOcrRuleTestDTO); + + /** + * 批量删除 + * @param deleteOcrRuleTestDTO 删除参数 + * @return 成功或失败 + */ + @DeleteMapping("/delete") + int delete(@RequestBody DeleteOcrRuleTestDTO deleteOcrRuleTestDTO); +} 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 8ca8440..fc6799d 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,81 +1,72 @@ 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.DeleteOcrSpecialRuleDTO; import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; +import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; +import com.docus.server.entity.segmentation.OcrSpecialRule; import org.springframework.cloud.openfeign.FeignClient; -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 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 java.util.List; /** - * 特殊策略表 API - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 特殊策略表 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpecialRuleApi") @RequestMapping("/ocrSpecialRule") 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 new file mode 100644 index 0000000..783b1c2 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpecialRuleTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* 特殊策略表-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpecialRuleTestApi") +@RequestMapping("/ocrSpecialRuleTest") +public interface OcrSpecialRuleTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrSpecialRuleTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrSpecialRuleTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO); + + /** + * 编辑 + * @param editOcrSpecialRuleTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO); + + /** + * 批量删除 + * @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 new file mode 100644 index 0000000..2120b9e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* ocr路径配置表 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrUrlConfigApi") +@RequestMapping("/ocrUrlConfig") +public interface OcrUrlConfigApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrUrlConfigVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrUrlConfigDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrUrlConfigDTO addOcrUrlConfigDTO); + + /** + * 编辑 + * @param editOcrUrlConfigDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrUrlConfigDTO editOcrUrlConfigDTO); + + /** + * 批量删除 + * @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 new file mode 100644 index 0000000..da6e1d1 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrUrlConfigTestApi.java @@ -0,0 +1,72 @@ +package com.docus.server.api.segmentation; + +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.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 java.util.List; + + +/** +* +* ocr路径配置表-调试 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrUrlConfigTestApi") +@RequestMapping("/ocrUrlConfigTest") +public interface OcrUrlConfigTestApi { + + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrUrlConfigTestVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * @param addOcrUrlConfigTestDTO 新增参数 + */ + @PostMapping("/add") + void add(@RequestBody AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO); + + /** + * 编辑 + * @param editOcrUrlConfigTestDTO 编辑参数 + */ + @PutMapping("/edit") + void edit(@RequestBody EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO); + + /** + * 批量删除 + * @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 248f1b9..9573edf 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,81 +1,72 @@ 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.DeleteOcrVersionDTO; import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; +import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; +import com.docus.server.entity.segmentation.OcrVersion; import org.springframework.cloud.openfeign.FeignClient; -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 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 java.util.List; /** - * 正式数据版本号管理 API - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 正式数据版本号管理 API +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrVersionApi") @RequestMapping("/ocrVersion") 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/dto/segmentation/ocrbasic/AddOcrBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/AddOcrBasicDTO.java index daa38bc..d1a8a58 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/AddOcrBasicDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/AddOcrBasicDTO.java @@ -6,21 +6,26 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** - * 患者信息表 AddDTO - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "AddOcrBasicDTO对象", description = "患者信息表") +@ApiModel(value="AddOcrBasicDTO对象", description="患者信息表") public class AddOcrBasicDTO implements Serializable { @ApiModelProperty(value = "id") @@ -35,9 +40,6 @@ public class AddOcrBasicDTO implements Serializable { @ApiModelProperty(value = "患者姓名") private String name; - @ApiModelProperty(value = "分段完成时间") - private Date ocrFinishTime; - @ApiModelProperty(value = "住院日期") private Date admissDate; @@ -56,14 +58,17 @@ public class AddOcrBasicDTO implements Serializable { @ApiModelProperty(value = "出院科室名称") private String disDeptName; + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "更新时间") private Date updateTime; - @ApiModelProperty(value = "是否测试数据(0否 1是)") - private int isTest; - } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/DeleteOcrBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/DeleteOcrBasicDTO.java index f55f561..c60e19b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/DeleteOcrBasicDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/DeleteOcrBasicDTO.java @@ -19,7 +19,7 @@ import java.util.List; * 患者信息表 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/EditOcrBasicDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/EditOcrBasicDTO.java index e6cb1c1..e144ea0 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/EditOcrBasicDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasic/EditOcrBasicDTO.java @@ -6,21 +6,26 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** - * 患者信息表 EditDTO - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EditOcrBasicDTO对象", description = "患者信息表") +@ApiModel(value="EditOcrBasicDTO对象", description="患者信息表") public class EditOcrBasicDTO implements Serializable { @ApiModelProperty(value = "id") @@ -35,9 +40,6 @@ public class EditOcrBasicDTO implements Serializable { @ApiModelProperty(value = "患者姓名") private String name; - @ApiModelProperty(value = "分段完成时间") - private Date ocrFinishTime; - @ApiModelProperty(value = "住院日期") private Date admissDate; @@ -56,14 +58,17 @@ public class EditOcrBasicDTO implements Serializable { @ApiModelProperty(value = "出院科室名称") private String disDeptName; + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "更新时间") private Date updateTime; - @ApiModelProperty(value = "是否测试数据(0否 1是)") - private int isTest; - } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java new file mode 100644 index 0000000..7b04a04 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/AddOcrBasicTestDTO.java @@ -0,0 +1,74 @@ +package com.docus.server.dto.segmentation.ocrbasictest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 患者信息表-调试 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrBasicTestDTO对象", description="患者信息表-调试") +public class AddOcrBasicTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案主键") + private String patientId; + + @ApiModelProperty(value = "病案号") + private String inpatientNo; + + @ApiModelProperty(value = "患者姓名") + private String name; + + @ApiModelProperty(value = "住院日期") + private Date admissDate; + + @ApiModelProperty(value = "住院科室") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + private String disDeptName; + + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/DeleteOcrBasicTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/DeleteOcrBasicTestDTO.java new file mode 100644 index 0000000..3df183f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/DeleteOcrBasicTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrbasictest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 患者信息表-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrBasicTestDTO对象", description="患者信息表-调试") +public class DeleteOcrBasicTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/EditOcrBasicTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/EditOcrBasicTestDTO.java new file mode 100644 index 0000000..ca93363 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrbasictest/EditOcrBasicTestDTO.java @@ -0,0 +1,74 @@ +package com.docus.server.dto.segmentation.ocrbasictest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 患者信息表-调试 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrBasicTestDTO对象", description="患者信息表-调试") +public class EditOcrBasicTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案主键") + private String patientId; + + @ApiModelProperty(value = "病案号") + private String inpatientNo; + + @ApiModelProperty(value = "患者姓名") + private String name; + + @ApiModelProperty(value = "住院日期") + private Date admissDate; + + @ApiModelProperty(value = "住院科室") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + private String disDeptName; + + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java new file mode 100644 index 0000000..26e04f3 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/AddOcrCutConfigDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.segmentation.ocrcutconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrCutConfigDTO对象", description="ocr图片剪切配置") +public class AddOcrCutConfigDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/DeleteOcrCutConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/DeleteOcrCutConfigDTO.java new file mode 100644 index 0000000..7447152 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/DeleteOcrCutConfigDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrcutconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* ocr图片剪切配置 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrCutConfigDTO对象", description="ocr图片剪切配置") +public class DeleteOcrCutConfigDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java new file mode 100644 index 0000000..5b56956 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfig/EditOcrCutConfigDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.segmentation.ocrcutconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrCutConfigDTO对象", description="ocr图片剪切配置") +public class EditOcrCutConfigDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java new file mode 100644 index 0000000..58acac9 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/AddOcrCutConfigTestDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.segmentation.ocrcutconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置-调试 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrCutConfigTestDTO对象", description="ocr图片剪切配置-调试") +public class AddOcrCutConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/DeleteOcrCutConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/DeleteOcrCutConfigTestDTO.java new file mode 100644 index 0000000..3749086 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/DeleteOcrCutConfigTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrcutconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* ocr图片剪切配置-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrCutConfigTestDTO对象", description="ocr图片剪切配置-调试") +public class DeleteOcrCutConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java new file mode 100644 index 0000000..b3129cc --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrcutconfigtest/EditOcrCutConfigTestDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.segmentation.ocrcutconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置-调试 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrCutConfigTestDTO对象", description="ocr图片剪切配置-调试") +public class EditOcrCutConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java index 16ae1c9..0e3be8e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java @@ -6,21 +6,26 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; /** - * ocr文件信息 AddDTO - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* ocr文件信息 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "AddOcrFileInfoDTO对象", description = "ocr文件信息") +@ApiModel(value="AddOcrFileInfoDTO对象", description="ocr文件信息") public class AddOcrFileInfoDTO implements Serializable { @ApiModelProperty(value = "id") @@ -29,19 +34,19 @@ public class AddOcrFileInfoDTO implements Serializable { @ApiModelProperty(value = "病案id") private String patientId; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片标题") private String fileTitle; @ApiModelProperty(value = "图片名称") private String picName; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "文件类型") private Integer fileType; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片排序") private Integer sort; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "序列号") private String serialNumber; @ApiModelProperty(value = "图片地址") @@ -57,9 +62,9 @@ public class AddOcrFileInfoDTO implements Serializable { private String ocrText; @ApiModelProperty(value = "分段完成时间") - private Date finshTime; + private Date ocrFinishTime; - @ApiModelProperty(value = "分段状态 0正在分段 1完成分段") + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") private Boolean ocrStatus; @ApiModelProperty(value = "分段id") diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/DeleteOcrFileInfoDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/DeleteOcrFileInfoDTO.java index af12dd5..bb5961d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/DeleteOcrFileInfoDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/DeleteOcrFileInfoDTO.java @@ -19,7 +19,7 @@ import java.util.List; * ocr文件信息 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java index d3a5ab6..d838835 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * ocr文件信息 EditDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -34,19 +34,19 @@ public class EditOcrFileInfoDTO implements Serializable { @ApiModelProperty(value = "病案id") private String patientId; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片标题") private String fileTitle; @ApiModelProperty(value = "图片名称") private String picName; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "文件类型") private Integer fileType; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片排序") private Integer sort; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "序列号") private String serialNumber; @ApiModelProperty(value = "图片地址") @@ -62,9 +62,9 @@ public class EditOcrFileInfoDTO implements Serializable { private String ocrText; @ApiModelProperty(value = "分段完成时间") - private LocalDateTime finshTime; + private Date ocrFinishTime; - @ApiModelProperty(value = "分段状态 0正在分段 1完成分段") + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") private Boolean ocrStatus; @ApiModelProperty(value = "分段id") @@ -83,10 +83,10 @@ public class EditOcrFileInfoDTO implements Serializable { private Float rate; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java new file mode 100644 index 0000000..a6ae559 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java @@ -0,0 +1,92 @@ +package com.docus.server.dto.segmentation.ocrfileinfotest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr文件信息-调试 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrFileInfoTestDTO对象", description="ocr文件信息-调试") +public class AddOcrFileInfoTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案id") + private String patientId; + + @ApiModelProperty(value = "图片标题") + private String fileTitle; + + @ApiModelProperty(value = "图片名称") + private String picName; + + @ApiModelProperty(value = "文件类型") + private Integer fileType; + + @ApiModelProperty(value = "图片排序") + private Integer sort; + + @ApiModelProperty(value = "序列号") + private String serialNumber; + + @ApiModelProperty(value = "图片地址") + private String picUrl; + + @ApiModelProperty(value = "图片分割后地址") + private String picCutUrl; + + @ApiModelProperty(value = "图片旋转角度(整数 90 180 360)") + private Integer angle; + + @ApiModelProperty(value = "识别文本结果") + private String ocrText; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") + private Boolean ocrStatus; + + @ApiModelProperty(value = "分段id") + private Integer assortId; + + @ApiModelProperty(value = "分段名称") + private String assortName; + + @ApiModelProperty(value = "命中策略id") + private Integer ruleId; + + @ApiModelProperty(value = "命中关键词") + private String key; + + @ApiModelProperty(value = "命中占比") + private Float rate; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/DeleteOcrFileInfoTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/DeleteOcrFileInfoTestDTO.java new file mode 100644 index 0000000..8b850c9 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/DeleteOcrFileInfoTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrfileinfotest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* ocr文件信息-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrFileInfoTestDTO对象", description="ocr文件信息-调试") +public class DeleteOcrFileInfoTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java new file mode 100644 index 0000000..7751309 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java @@ -0,0 +1,92 @@ +package com.docus.server.dto.segmentation.ocrfileinfotest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr文件信息-调试 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrFileInfoTestDTO对象", description="ocr文件信息-调试") +public class EditOcrFileInfoTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案id") + private String patientId; + + @ApiModelProperty(value = "图片标题") + private String fileTitle; + + @ApiModelProperty(value = "图片名称") + private String picName; + + @ApiModelProperty(value = "文件类型") + private Integer fileType; + + @ApiModelProperty(value = "图片排序") + private Integer sort; + + @ApiModelProperty(value = "序列号") + private String serialNumber; + + @ApiModelProperty(value = "图片地址") + private String picUrl; + + @ApiModelProperty(value = "图片分割后地址") + private String picCutUrl; + + @ApiModelProperty(value = "图片旋转角度(整数 90 180 360)") + private Integer angle; + + @ApiModelProperty(value = "识别文本结果") + private String ocrText; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") + private Boolean ocrStatus; + + @ApiModelProperty(value = "分段id") + private Integer assortId; + + @ApiModelProperty(value = "分段名称") + private String assortName; + + @ApiModelProperty(value = "命中策略id") + private Integer ruleId; + + @ApiModelProperty(value = "命中关键词") + private String key; + + @ApiModelProperty(value = "命中占比") + private Float rate; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java index 62c936f..891cd65 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/AddOcrRuleDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 匹配策略表 AddDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -46,17 +46,14 @@ public class AddOcrRuleDTO implements Serializable { @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; - @ApiModelProperty(value = "是否使用二级分段") private Boolean isUseSecond; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/DeleteOcrRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/DeleteOcrRuleDTO.java index f020709..42c763a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/DeleteOcrRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/DeleteOcrRuleDTO.java @@ -19,7 +19,7 @@ import java.util.List; * 匹配策略表 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java index 5bbc21b..363a5a2 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrrule/EditOcrRuleDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 匹配策略表 EditDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -46,17 +46,14 @@ public class EditOcrRuleDTO implements Serializable { @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; - @ApiModelProperty(value = "是否使用二级分段") private Boolean isUseSecond; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java new file mode 100644 index 0000000..dc7938a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/AddOcrRuleTestDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.segmentation.ocrruletest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 匹配策略表-调试 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrRuleTestDTO对象", description="匹配策略表-调试") +public class AddOcrRuleTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "分段id") + private String assortId; + + @ApiModelProperty(value = "占比分") + private Integer matchRatio; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + private String keyWord; + + @ApiModelProperty(value = "二级分段json") + private String json; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "是否使用二级分段") + private Boolean isUseSecond; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/DeleteOcrRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/DeleteOcrRuleTestDTO.java new file mode 100644 index 0000000..3961230 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/DeleteOcrRuleTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrruletest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 匹配策略表-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrRuleTestDTO对象", description="匹配策略表-调试") +public class DeleteOcrRuleTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java new file mode 100644 index 0000000..507184e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrruletest/EditOcrRuleTestDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.segmentation.ocrruletest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 匹配策略表-调试 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrRuleTestDTO对象", description="匹配策略表-调试") +public class EditOcrRuleTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "分段id") + private String assortId; + + @ApiModelProperty(value = "占比分") + private Integer matchRatio; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + private String keyWord; + + @ApiModelProperty(value = "二级分段json") + private String json; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "是否使用二级分段") + private Boolean isUseSecond; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/AddOcrSpecialRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/AddOcrSpecialRuleDTO.java index 1e6e07d..ea8b74a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/AddOcrSpecialRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/AddOcrSpecialRuleDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 特殊策略表 AddDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -31,20 +31,26 @@ public class AddOcrSpecialRuleDTO implements Serializable { @ApiModelProperty(value = "id") private Long id; + @ApiModelProperty(value = "特殊规则描述") + private String name; + @ApiModelProperty(value = "分段id") private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/DeleteOcrSpecialRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/DeleteOcrSpecialRuleDTO.java index 04429b8..91d25fe 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/DeleteOcrSpecialRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/DeleteOcrSpecialRuleDTO.java @@ -19,7 +19,7 @@ import java.util.List; * 特殊策略表 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/EditOcrSpecialRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/EditOcrSpecialRuleDTO.java index 8bf1dd7..21f43fd 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/EditOcrSpecialRuleDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialrule/EditOcrSpecialRuleDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 特殊策略表 EditDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -31,20 +31,26 @@ public class EditOcrSpecialRuleDTO implements Serializable { @ApiModelProperty(value = "id") private Long id; + @ApiModelProperty(value = "特殊规则描述") + private String name; + @ApiModelProperty(value = "分段id") private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrconfig/OcrConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/AddOcrSpecialRuleTestDTO.java similarity index 50% rename from docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrconfig/OcrConfigVO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/AddOcrSpecialRuleTestDTO.java index 9c78210..d3a0d98 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrconfig/OcrConfigVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/AddOcrSpecialRuleTestDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.vo.segmentation.ocrconfig; +package com.docus.server.dto.segmentation.ocrspecialruletest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,42 +12,45 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * -* 基础配置表 VO +* 特殊策略表-调试 AddDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="OcrConfigVO对象", description="基础配置表") -public class OcrConfigVO implements Serializable { +@ApiModel(value="AddOcrSpecialRuleTestDTO对象", description="特殊策略表-调试") +public class AddOcrSpecialRuleTestDTO implements Serializable { @ApiModelProperty(value = "id") private Long id; - @ApiModelProperty(value = "") - private String configKey; + @ApiModelProperty(value = "特殊规则描述") + private String name; - @ApiModelProperty(value = "") - private String configJson; + @ApiModelProperty(value = "分段id") + private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/DeleteOcrSpecialRuleTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/DeleteOcrSpecialRuleTestDTO.java new file mode 100644 index 0000000..6977e0e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/DeleteOcrSpecialRuleTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrspecialruletest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 特殊策略表-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrSpecialRuleTestDTO对象", description="特殊策略表-调试") +public class DeleteOcrSpecialRuleTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/EditOcrConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/EditOcrSpecialRuleTestDTO.java similarity index 50% rename from docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/EditOcrConfigDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/EditOcrSpecialRuleTestDTO.java index db6322c..fc3c81c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/EditOcrConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrspecialruletest/EditOcrSpecialRuleTestDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.dto.segmentation.ocrconfig; +package com.docus.server.dto.segmentation.ocrspecialruletest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,42 +12,45 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * -* 基础配置表 EditDTO +* 特殊策略表-调试 EditDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="EditOcrConfigDTO对象", description="基础配置表") -public class EditOcrConfigDTO implements Serializable { +@ApiModel(value="EditOcrSpecialRuleTestDTO对象", description="特殊策略表-调试") +public class EditOcrSpecialRuleTestDTO implements Serializable { @ApiModelProperty(value = "id") private Long id; - @ApiModelProperty(value = "") - private String configKey; + @ApiModelProperty(value = "特殊规则描述") + private String name; - @ApiModelProperty(value = "") - private String configJson; + @ApiModelProperty(value = "分段id") + private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java new file mode 100644 index 0000000..71fa6cf --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/AddOcrUrlConfigDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrurlconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrUrlConfigDTO对象", description="ocr路径配置表") +public class AddOcrUrlConfigDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/DeleteOcrConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/DeleteOcrUrlConfigDTO.java similarity index 67% rename from docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/DeleteOcrConfigDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/DeleteOcrUrlConfigDTO.java index 627b1b0..1765704 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/DeleteOcrConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/DeleteOcrUrlConfigDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.dto.segmentation.ocrconfig; +package com.docus.server.dto.segmentation.ocrurlconfig; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,17 +16,17 @@ import java.util.List; /** * -* 基础配置表 DeleteDTO +* ocr路径配置表 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="DeleteOcrConfigDTO对象", description="基础配置表") -public class DeleteOcrConfigDTO implements Serializable { +@ApiModel(value="DeleteOcrUrlConfigDTO对象", description="ocr路径配置表") +public class DeleteOcrUrlConfigDTO implements Serializable { @ApiModelProperty(value = "ids") private List ids; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java new file mode 100644 index 0000000..7b18e51 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfig/EditOcrUrlConfigDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrurlconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrUrlConfigDTO对象", description="ocr路径配置表") +public class EditOcrUrlConfigDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java new file mode 100644 index 0000000..d5d14fb --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/AddOcrUrlConfigTestDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrurlconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表-调试 AddDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrUrlConfigTestDTO对象", description="ocr路径配置表-调试") +public class AddOcrUrlConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/DeleteOcrUrlConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/DeleteOcrUrlConfigTestDTO.java new file mode 100644 index 0000000..1bf7947 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/DeleteOcrUrlConfigTestDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrurlconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* ocr路径配置表-调试 DeleteDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrUrlConfigTestDTO对象", description="ocr路径配置表-调试") +public class DeleteOcrUrlConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java new file mode 100644 index 0000000..a737b37 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrurlconfigtest/EditOcrUrlConfigTestDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrurlconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表-调试 EditDTO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrUrlConfigTestDTO对象", description="ocr路径配置表-调试") +public class EditOcrUrlConfigTestDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/AddOcrVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/AddOcrVersionDTO.java index c4f0f24..5ac044b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/AddOcrVersionDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/AddOcrVersionDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 正式数据版本号管理 AddDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -41,10 +41,10 @@ public class AddOcrVersionDTO implements Serializable { private Boolean isEnable; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/DeleteOcrVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/DeleteOcrVersionDTO.java index e893f43..52f5d8c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/DeleteOcrVersionDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/DeleteOcrVersionDTO.java @@ -19,7 +19,7 @@ import java.util.List; * 正式数据版本号管理 DeleteDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/EditOcrVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/EditOcrVersionDTO.java index cb04134..42044a6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/EditOcrVersionDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrversion/EditOcrVersionDTO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 正式数据版本号管理 EditDTO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -41,10 +41,10 @@ public class EditOcrVersionDTO implements Serializable { private Boolean isEnable; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasic.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasic.java index ba499e0..3144b3e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasic.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasic.java @@ -1,33 +1,36 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; +import com.docus.server.enums.*; /** - * 患者信息表 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_basic") -@ApiModel(value = "OcrBasic对象", description = "患者信息表") +@ApiModel(value="OcrBasic对象", description="患者信息表") public class OcrBasic implements Serializable { @ApiModelProperty(value = "id") @@ -46,10 +49,6 @@ public class OcrBasic implements Serializable { @TableField("name") private String name; - @ApiModelProperty(value = "分段完成时间") - @TableField("ocr_finish_time") - private Date ocrFinishTime; - @ApiModelProperty(value = "住院日期") @TableField("admiss_date") private Date admissDate; @@ -74,6 +73,14 @@ public class OcrBasic implements Serializable { @TableField("dis_dept_name") private String disDeptName; + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + @TableField("ocr_statue") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + @TableField("ocr_finish_time") + private Date ocrFinishTime; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; @@ -82,9 +89,5 @@ public class OcrBasic implements Serializable { @TableField("update_time") private Date updateTime; - @ApiModelProperty(value = "是否测试数据(0否 1是)") - @TableField("is_test") - private int isTest; - } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasicTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasicTest.java new file mode 100644 index 0000000..8f870bf --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrBasicTest.java @@ -0,0 +1,93 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* 患者信息表-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_basic_test") +@ApiModel(value="OcrBasicTest对象", description="患者信息表-调试") +public class OcrBasicTest implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "病案主键") + @TableField("patient_id") + private String patientId; + + @ApiModelProperty(value = "病案号") + @TableField("inpatient_no") + private String inpatientNo; + + @ApiModelProperty(value = "患者姓名") + @TableField("name") + private String name; + + @ApiModelProperty(value = "住院日期") + @TableField("admiss_date") + private Date admissDate; + + @ApiModelProperty(value = "住院科室") + @TableField("admiss_dept") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + @TableField("admiss_dept_name") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + @TableField("dis_date") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + @TableField("dis_dept") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + @TableField("dis_dept_name") + private String disDeptName; + + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + @TableField("ocr_statue") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + @TableField("ocr_finish_time") + private Date ocrFinishTime; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java new file mode 100644 index 0000000..fe92309 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfig.java @@ -0,0 +1,61 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* ocr图片剪切配置 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_cut_config") +@ApiModel(value="OcrCutConfig对象", description="ocr图片剪切配置") +public class OcrCutConfig implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + @TableField("height") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + @TableField("width_start") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + @TableField("width_end") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfigTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfigTest.java new file mode 100644 index 0000000..f283e91 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrCutConfigTest.java @@ -0,0 +1,61 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* ocr图片剪切配置-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_cut_config_test") +@ApiModel(value="OcrCutConfigTest对象", description="ocr图片剪切配置-调试") +public class OcrCutConfigTest implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + @TableField("height") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + @TableField("width_start") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + @TableField("width_end") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java index f60e2ce..783fa3b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java @@ -1,33 +1,36 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.util.Date; +import com.docus.server.enums.*; /** - * ocr文件信息 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* ocr文件信息 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_file_info") -@ApiModel(value = "OcrFileInfo对象", description = "ocr文件信息") +@ApiModel(value="OcrFileInfo对象", description="ocr文件信息") public class OcrFileInfo implements Serializable { @ApiModelProperty(value = "id") @@ -38,7 +41,7 @@ public class OcrFileInfo implements Serializable { @TableField("patient_id") private String patientId; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片标题") @TableField("file_title") private String fileTitle; @@ -46,15 +49,15 @@ public class OcrFileInfo implements Serializable { @TableField("pic_name") private String picName; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "文件类型") @TableField("file_type") private Integer fileType; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片排序") @TableField("sort") private Integer sort; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "序列号") @TableField("serial_number") private String serialNumber; @@ -75,10 +78,10 @@ public class OcrFileInfo implements Serializable { private String ocrText; @ApiModelProperty(value = "分段完成时间") - @TableField("finsh_time") - private Date finshTime; + @TableField("ocr_finish_time") + private Date ocrFinishTime; - @ApiModelProperty(value = "分段状态 0正在分段 1完成分段") + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") @TableField("ocr_status") private Boolean ocrStatus; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java new file mode 100644 index 0000000..5506f89 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java @@ -0,0 +1,117 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* ocr文件信息-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_file_info_test") +@ApiModel(value="OcrFileInfoTest对象", description="ocr文件信息-调试") +public class OcrFileInfoTest implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "病案id") + @TableField("patient_id") + private String patientId; + + @ApiModelProperty(value = "图片标题") + @TableField("file_title") + private String fileTitle; + + @ApiModelProperty(value = "图片名称") + @TableField("pic_name") + private String picName; + + @ApiModelProperty(value = "文件类型") + @TableField("file_type") + private Integer fileType; + + @ApiModelProperty(value = "图片排序") + @TableField("sort") + private Integer sort; + + @ApiModelProperty(value = "序列号") + @TableField("serial_number") + private String serialNumber; + + @ApiModelProperty(value = "图片地址") + @TableField("pic_url") + private String picUrl; + + @ApiModelProperty(value = "图片分割后地址") + @TableField("pic_cut_url") + private String picCutUrl; + + @ApiModelProperty(value = "图片旋转角度(整数 90 180 360)") + @TableField("angle") + private Integer angle; + + @ApiModelProperty(value = "识别文本结果") + @TableField("ocr_text") + private String ocrText; + + @ApiModelProperty(value = "分段完成时间") + @TableField("ocr_finish_time") + private Date ocrFinishTime; + + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") + @TableField("ocr_status") + private Boolean ocrStatus; + + @ApiModelProperty(value = "分段id") + @TableField("assort_id") + private Integer assortId; + + @ApiModelProperty(value = "分段名称") + @TableField("assort_name") + private String assortName; + + @ApiModelProperty(value = "命中策略id") + @TableField("rule_id") + private Integer ruleId; + + @ApiModelProperty(value = "命中关键词") + @TableField("key") + private String key; + + @ApiModelProperty(value = "命中占比") + @TableField("rate") + private Float rate; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java index ba9a993..b194f1f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRule.java @@ -1,33 +1,36 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; +import com.docus.server.enums.*; /** - * 匹配策略表 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 匹配策略表 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_rule") -@ApiModel(value = "OcrRule对象", description = "匹配策略表") +@ApiModel(value="OcrRule对象", description="匹配策略表") public class OcrRule implements Serializable { @ApiModelProperty(value = "id") @@ -54,21 +57,17 @@ public class OcrRule implements Serializable { @TableField("version") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - @TableField("is_test") - private Boolean isTest; - @ApiModelProperty(value = "是否使用二级分段") @TableField("is_use_second") private Boolean isUseSecond; @ApiModelProperty(value = "创建时间") @TableField("create_time") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") @TableField("update_time") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java new file mode 100644 index 0000000..f27535e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrRuleTest.java @@ -0,0 +1,73 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* 匹配策略表-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_rule_test") +@ApiModel(value="OcrRuleTest对象", description="匹配策略表-调试") +public class OcrRuleTest implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "分段id") + @TableField("assort_id") + private String assortId; + + @ApiModelProperty(value = "占比分") + @TableField("match_ratio") + private Integer matchRatio; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + @TableField("key_word") + private String keyWord; + + @ApiModelProperty(value = "二级分段json") + @TableField("json") + private String json; + + @ApiModelProperty(value = "版本号") + @TableField("version") + private Integer version; + + @ApiModelProperty(value = "是否使用二级分段") + @TableField("is_use_second") + private Boolean isUseSecond; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRule.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRule.java index 052c80f..24201c6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRule.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRule.java @@ -1,58 +1,69 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; +import com.docus.server.enums.*; /** - * 特殊策略表 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 特殊策略表 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_special_rule") -@ApiModel(value = "OcrSpecialRule对象", description = "特殊策略表") +@ApiModel(value="OcrSpecialRule对象", description="特殊策略表") public class OcrSpecialRule implements Serializable { @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.ASSIGN_UUID) private Long id; + @ApiModelProperty(value = "特殊规则描述") + @TableField("name") + private String name; + @ApiModelProperty(value = "分段id") @TableField("assort_id") private String assortId; - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + @TableField("start_json") + private String startJson; - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + @TableField("end_json") + private String endJson; @ApiModelProperty(value = "版本号") @TableField("version") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - @TableField("is_test") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleTest.java similarity index 54% rename from docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrConfig.java rename to docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleTest.java index 6162826..a6a100f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpecialRuleTest.java @@ -1,62 +1,69 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; +import com.docus.server.enums.*; /** - * 基础配置表 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 特殊策略表-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -@TableName("ocr_config") -@ApiModel(value = "OcrConfig对象", description = "基础配置表") -public class OcrConfig implements Serializable { +@TableName("ocr_special_rule_test") +@ApiModel(value="OcrSpecialRuleTest对象", description="特殊策略表-调试") +public class OcrSpecialRuleTest implements Serializable { @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.ASSIGN_UUID) private Long id; - @ApiModelProperty(value = "") - @TableField("config_key") - private String configKey; + @ApiModelProperty(value = "特殊规则描述") + @TableField("name") + private String name; - @ApiModelProperty(value = "") - @TableField("config_json") - private String configJson; + @ApiModelProperty(value = "分段id") + @TableField("assort_id") + private String assortId; - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + @TableField("start_json") + private String startJson; - @ApiModelProperty(value = "更新时间") - @TableField("update_time") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + @TableField("end_json") + private String endJson; @ApiModelProperty(value = "版本号") @TableField("version") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - @TableField("is_test") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java new file mode 100644 index 0000000..87a783a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfig.java @@ -0,0 +1,53 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* ocr路径配置表 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_url_config") +@ApiModel(value="OcrUrlConfig对象", description="ocr路径配置表") +public class OcrUrlConfig implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "路径地址") + @TableField("url") + private String url; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfigTest.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfigTest.java new file mode 100644 index 0000000..df35117 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrUrlConfigTest.java @@ -0,0 +1,53 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* ocr路径配置表-调试 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_url_config_test") +@ApiModel(value="OcrUrlConfigTest对象", description="ocr路径配置表-调试") +public class OcrUrlConfigTest implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Long id; + + @ApiModelProperty(value = "路径地址") + @TableField("url") + private String url; + + @ApiModelProperty(value = "创建时间") + @TableField("create_time") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("update_time") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrVersion.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrVersion.java index e55895b..70f6c24 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrVersion.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrVersion.java @@ -1,33 +1,36 @@ package com.docus.server.entity.segmentation; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; +import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -import java.io.Serializable; -import java.time.LocalDateTime; +import com.docus.server.enums.*; /** - * 正式数据版本号管理 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 正式数据版本号管理 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_version") -@ApiModel(value = "OcrVersion对象", description = "正式数据版本号管理") +@ApiModel(value="OcrVersion对象", description="正式数据版本号管理") public class OcrVersion implements Serializable { @ApiModelProperty(value = "id") @@ -48,11 +51,11 @@ public class OcrVersion implements Serializable { @ApiModelProperty(value = "创建时间") @TableField("create_time") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") @TableField("update_time") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasic/OcrBasicVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasic/OcrBasicVO.java index 9548219..6e2c657 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasic/OcrBasicVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasic/OcrBasicVO.java @@ -6,6 +6,10 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.util.Date; @@ -15,7 +19,7 @@ import java.util.Date; * 患者信息表 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -36,9 +40,6 @@ public class OcrBasicVO implements Serializable { @ApiModelProperty(value = "患者姓名") private String name; - @ApiModelProperty(value = "分段完成时间") - private Date ocrFinishTime; - @ApiModelProperty(value = "住院日期") private Date admissDate; @@ -57,14 +58,17 @@ public class OcrBasicVO implements Serializable { @ApiModelProperty(value = "出院科室名称") private String disDeptName; + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "更新时间") private Date updateTime; - @ApiModelProperty(value = "是否测试数据(0否 1是)") - private int isTest; - } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasictest/OcrBasicTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasictest/OcrBasicTestVO.java new file mode 100644 index 0000000..ce4f61f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrbasictest/OcrBasicTestVO.java @@ -0,0 +1,74 @@ +package com.docus.server.vo.segmentation.ocrbasictest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 患者信息表-调试 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrBasicTestVO对象", description="患者信息表-调试") +public class OcrBasicTestVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案主键") + private String patientId; + + @ApiModelProperty(value = "病案号") + private String inpatientNo; + + @ApiModelProperty(value = "患者姓名") + private String name; + + @ApiModelProperty(value = "住院日期") + private Date admissDate; + + @ApiModelProperty(value = "住院科室") + private String admissDept; + + @ApiModelProperty(value = "住院科室名称") + private String admissDeptName; + + @ApiModelProperty(value = "出院日期") + private Date disDate; + + @ApiModelProperty(value = "出院科室") + private String disDept; + + @ApiModelProperty(value = "出院科室名称") + private String disDeptName; + + @ApiModelProperty(value = "ocr状态 0未开始 1正在分段 2分段完成") + private Boolean ocrStatue; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java new file mode 100644 index 0000000..2a87aaa --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfig/OcrCutConfigVO.java @@ -0,0 +1,50 @@ +package com.docus.server.vo.segmentation.ocrcutconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrCutConfigVO对象", description="ocr图片剪切配置") +public class OcrCutConfigVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java new file mode 100644 index 0000000..4ac9ea1 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrcutconfigtest/OcrCutConfigTestVO.java @@ -0,0 +1,50 @@ +package com.docus.server.vo.segmentation.ocrcutconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr图片剪切配置-调试 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrCutConfigTestVO对象", description="ocr图片剪切配置-调试") +public class OcrCutConfigTestVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "图像压缩宽度") + private Double height; + + @ApiModelProperty(value = "半截图纵向区域开始") + private Double widthStart; + + @ApiModelProperty(value = "半截图纵向区域结束") + private Double widthEnd; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java index ee03d38..cc6321d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * ocr文件信息 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -34,19 +34,19 @@ public class OcrFileInfoVO implements Serializable { @ApiModelProperty(value = "病案id") private String patientId; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片标题") private String fileTitle; @ApiModelProperty(value = "图片名称") private String picName; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "文件类型") private Integer fileType; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "图片排序") private Integer sort; - @ApiModelProperty(value = "") + @ApiModelProperty(value = "序列号") private String serialNumber; @ApiModelProperty(value = "图片地址") @@ -62,9 +62,9 @@ public class OcrFileInfoVO implements Serializable { private String ocrText; @ApiModelProperty(value = "分段完成时间") - private LocalDateTime finshTime; + private Date ocrFinishTime; - @ApiModelProperty(value = "分段状态 0正在分段 1完成分段") + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") private Boolean ocrStatus; @ApiModelProperty(value = "分段id") @@ -83,10 +83,10 @@ public class OcrFileInfoVO implements Serializable { private Float rate; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java new file mode 100644 index 0000000..6716221 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java @@ -0,0 +1,92 @@ +package com.docus.server.vo.segmentation.ocrfileinfotest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr文件信息-调试 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrFileInfoTestVO对象", description="ocr文件信息-调试") +public class OcrFileInfoTestVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "病案id") + private String patientId; + + @ApiModelProperty(value = "图片标题") + private String fileTitle; + + @ApiModelProperty(value = "图片名称") + private String picName; + + @ApiModelProperty(value = "文件类型") + private Integer fileType; + + @ApiModelProperty(value = "图片排序") + private Integer sort; + + @ApiModelProperty(value = "序列号") + private String serialNumber; + + @ApiModelProperty(value = "图片地址") + private String picUrl; + + @ApiModelProperty(value = "图片分割后地址") + private String picCutUrl; + + @ApiModelProperty(value = "图片旋转角度(整数 90 180 360)") + private Integer angle; + + @ApiModelProperty(value = "识别文本结果") + private String ocrText; + + @ApiModelProperty(value = "分段完成时间") + private Date ocrFinishTime; + + @ApiModelProperty(value = "分段状态 0未开始 1完成分段") + private Boolean ocrStatus; + + @ApiModelProperty(value = "分段id") + private Integer assortId; + + @ApiModelProperty(value = "分段名称") + private String assortName; + + @ApiModelProperty(value = "命中策略id") + private Integer ruleId; + + @ApiModelProperty(value = "命中关键词") + private String key; + + @ApiModelProperty(value = "命中占比") + private Float rate; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java index 8fd5720..0911c2d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrrule/OcrRuleVO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 匹配策略表 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -46,17 +46,14 @@ public class OcrRuleVO implements Serializable { @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; - @ApiModelProperty(value = "是否使用二级分段") private Boolean isUseSecond; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java new file mode 100644 index 0000000..bd1cf55 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrruletest/OcrRuleTestVO.java @@ -0,0 +1,59 @@ +package com.docus.server.vo.segmentation.ocrruletest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* 匹配策略表-调试 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrRuleTestVO对象", description="匹配策略表-调试") +public class OcrRuleTestVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "分段id") + private String assortId; + + @ApiModelProperty(value = "占比分") + private Integer matchRatio; + + @ApiModelProperty(value = "匹配关键词 多个#分割") + private String keyWord; + + @ApiModelProperty(value = "二级分段json") + private String json; + + @ApiModelProperty(value = "版本号") + private Integer version; + + @ApiModelProperty(value = "是否使用二级分段") + private Boolean isUseSecond; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialrule/OcrSpecialRuleVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialrule/OcrSpecialRuleVO.java index dfd85e0..32ee6de 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialrule/OcrSpecialRuleVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialrule/OcrSpecialRuleVO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 特殊策略表 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -31,20 +31,26 @@ public class OcrSpecialRuleVO implements Serializable { @ApiModelProperty(value = "id") private Long id; + @ApiModelProperty(value = "特殊规则描述") + private String name; + @ApiModelProperty(value = "分段id") private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/AddOcrConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialruletest/OcrSpecialRuleTestVO.java similarity index 50% rename from docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/AddOcrConfigDTO.java rename to docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialruletest/OcrSpecialRuleTestVO.java index cbdbd08..335292d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrconfig/AddOcrConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrspecialruletest/OcrSpecialRuleTestVO.java @@ -1,4 +1,4 @@ -package com.docus.server.dto.segmentation.ocrconfig; +package com.docus.server.vo.segmentation.ocrspecialruletest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,42 +12,45 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * -* 基础配置表 AddDTO +* 特殊策略表-调试 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="AddOcrConfigDTO对象", description="基础配置表") -public class AddOcrConfigDTO implements Serializable { +@ApiModel(value="OcrSpecialRuleTestVO对象", description="特殊策略表-调试") +public class OcrSpecialRuleTestVO implements Serializable { @ApiModelProperty(value = "id") private Long id; - @ApiModelProperty(value = "") - private String configKey; + @ApiModelProperty(value = "特殊规则描述") + private String name; - @ApiModelProperty(value = "") - private String configJson; + @ApiModelProperty(value = "分段id") + private String assortId; - @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + @ApiModelProperty(value = "开始规则") + private String startJson; - @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + @ApiModelProperty(value = "结束规则") + private String endJson; @ApiModelProperty(value = "版本号") private Integer version; - @ApiModelProperty(value = "是否测试环境数据(0否 1是)") - private Boolean isTest; + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java new file mode 100644 index 0000000..ef2e58c --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfig/OcrUrlConfigVO.java @@ -0,0 +1,44 @@ +package com.docus.server.vo.segmentation.ocrurlconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrUrlConfigVO对象", description="ocr路径配置表") +public class OcrUrlConfigVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java new file mode 100644 index 0000000..f76ec25 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrurlconfigtest/OcrUrlConfigTestVO.java @@ -0,0 +1,44 @@ +package com.docus.server.vo.segmentation.ocrurlconfigtest; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.Date; + +/** +* +* ocr路径配置表-调试 VO +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrUrlConfigTestVO对象", description="ocr路径配置表-调试") +public class OcrUrlConfigTestVO implements Serializable { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "路径地址") + private String url; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrversion/OcrVersionVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrversion/OcrVersionVO.java index 637ed52..7ea7bd5 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrversion/OcrVersionVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrversion/OcrVersionVO.java @@ -12,14 +12,14 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** * * 正式数据版本号管理 VO * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Data @Builder @@ -41,10 +41,10 @@ public class OcrVersionVO implements Serializable { private Boolean isEnable; @ApiModelProperty(value = "创建时间") - private LocalDateTime createTime; + private Date createTime; @ApiModelProperty(value = "更新时间") - private LocalDateTime updateTime; + private Date updateTime; } diff --git a/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java b/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java index 858da37..670087c 100644 --- a/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java +++ b/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_config","ocr_file_info","ocr_rule","ocr_special_detail","ocr_special_rule","ocr_version");//需要生成的表，可指定多个，留空为全部生成 + 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");//需要生成的表，可指定多个，留空为全部生成 BaseCodeGenerator.generate(defaultConfig); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicController.java index 4a55e13..797a2c4 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicController.java @@ -1,38 +1,37 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrBasicApi; import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO; -import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; -import com.docus.server.service.IOcrBasicService; +import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; +import com.docus.server.entity.segmentation.OcrBasic; +import com.docus.server.api.segmentation.OcrBasicApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrBasicService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.List; /** - * 患者信息表 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Api(value = "患者信息表", tags = "患者信息表") @RestController public class OcrBasicController implements OcrBasicApi { @Resource private IOcrBasicService iOcrBasicService; - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @ApiOperation("按主键查询") @Override public OcrBasicVO findById(Long id) { @@ -40,22 +39,20 @@ public class OcrBasicController implements OcrBasicApi { } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrBasicService.findAll(); + @Override + public List findAll() { + return iOcrBasicService.findAll(); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { @@ -63,36 +60,33 @@ public class OcrBasicController implements OcrBasicApi { } /** - * 新增 - * - * @param addOcrBasicDTO 编辑参数 - */ + * 新增 + * @param addOcrBasicDTO 编辑参数 + */ @ApiOperation("新增") - @Override - public void add(AddOcrBasicDTO addOcrBasicDTO) { - iOcrBasicService.add(addOcrBasicDTO); + @Override + public void add(AddOcrBasicDTO addOcrBasicDTO) { + iOcrBasicService.add(addOcrBasicDTO); } /** - * 编辑 - * - * @param editOcrBasicDTO 编辑参数 - */ + * 编辑 + * @param editOcrBasicDTO 编辑参数 + */ @ApiOperation("编辑") - @Override - public void edit(EditOcrBasicDTO editOcrBasicDTO) { - iOcrBasicService.edit(editOcrBasicDTO); + @Override + public void edit(EditOcrBasicDTO editOcrBasicDTO) { + iOcrBasicService.edit(editOcrBasicDTO); } /** - * 批量删除 - * - * @param deleteOcrBasicDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrBasicDTO 删除参数 + * @return 成功或失败 + */ @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrBasicDTO deleteOcrBasicDTO) { - return iOcrBasicService.delete(deleteOcrBasicDTO); + @Override + public int delete(DeleteOcrBasicDTO deleteOcrBasicDTO) { + return iOcrBasicService.delete(deleteOcrBasicDTO); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicTestController.java new file mode 100644 index 0000000..a34b248 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrBasicTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrbasictest.OcrBasicTestVO; +import com.docus.server.entity.segmentation.OcrBasicTest; +import com.docus.server.api.segmentation.OcrBasicTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrBasicTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* 患者信息表-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "患者信息表-调试", tags = "患者信息表-调试") +@RestController +public class OcrBasicTestController implements OcrBasicTestApi { + @Resource + private IOcrBasicTestService iOcrBasicTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrBasicTestVO findById(Long id) { + return iOcrBasicTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrBasicTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrBasicTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrBasicTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrBasicTestDTO addOcrBasicTestDTO) { + iOcrBasicTestService.add(addOcrBasicTestDTO); + } + + /** + * 编辑 + * @param editOcrBasicTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrBasicTestDTO editOcrBasicTestDTO) { + iOcrBasicTestService.edit(editOcrBasicTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrBasicTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrBasicTestDTO deleteOcrBasicTestDTO) { + return iOcrBasicTestService.delete(deleteOcrBasicTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrConfigController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrConfigController.java deleted file mode 100644 index d3319df..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrConfigController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.docus.server.controller; - -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrConfigApi; -import com.docus.server.dto.segmentation.ocrconfig.AddOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.DeleteOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.EditOcrConfigDTO; -import com.docus.server.service.IOcrConfigService; -import com.docus.server.vo.segmentation.ocrconfig.OcrConfigVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 基础配置表 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -@Api(value = "基础配置表", tags = "基础配置表") -@RestController -public class OcrConfigController implements OcrConfigApi { - @Resource - private IOcrConfigService iOcrConfigService; - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @ApiOperation("按主键查询") - @Override - public OcrConfigVO findById(Long id) { - return iOcrConfigService.findById(id); - } - - /** - * 查询所有 - * - * @return 实体 - */ - @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrConfigService.findAll(); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @ApiOperation("关键字搜索") - @Override - public PageResult search(SearchDTO searchDTO) { - return iOcrConfigService.search(searchDTO); - } - - /** - * 新增 - * - * @param addOcrConfigDTO 编辑参数 - */ - @ApiOperation("新增") - @Override - public void add(AddOcrConfigDTO addOcrConfigDTO) { - iOcrConfigService.add(addOcrConfigDTO); - } - - /** - * 编辑 - * - * @param editOcrConfigDTO 编辑参数 - */ - @ApiOperation("编辑") - @Override - public void edit(EditOcrConfigDTO editOcrConfigDTO) { - iOcrConfigService.edit(editOcrConfigDTO); - } - - /** - * 批量删除 - * - * @param deleteOcrConfigDTO 删除参数 - * @return 成功或失败 - */ - @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrConfigDTO deleteOcrConfigDTO) { - return iOcrConfigService.delete(deleteOcrConfigDTO); - } -} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigController.java new file mode 100644 index 0000000..aacaf40 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrcutconfig.OcrCutConfigVO; +import com.docus.server.entity.segmentation.OcrCutConfig; +import com.docus.server.api.segmentation.OcrCutConfigApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrCutConfigService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* ocr图片剪切配置 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "ocr图片剪切配置", tags = "ocr图片剪切配置") +@RestController +public class OcrCutConfigController implements OcrCutConfigApi { + @Resource + private IOcrCutConfigService iOcrCutConfigService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrCutConfigVO findById(Long id) { + return iOcrCutConfigService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrCutConfigService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrCutConfigService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrCutConfigDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrCutConfigDTO addOcrCutConfigDTO) { + iOcrCutConfigService.add(addOcrCutConfigDTO); + } + + /** + * 编辑 + * @param editOcrCutConfigDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrCutConfigDTO editOcrCutConfigDTO) { + iOcrCutConfigService.edit(editOcrCutConfigDTO); + } + + /** + * 批量删除 + * @param deleteOcrCutConfigDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrCutConfigDTO deleteOcrCutConfigDTO) { + return iOcrCutConfigService.delete(deleteOcrCutConfigDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigTestController.java new file mode 100644 index 0000000..9b1e939 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrCutConfigTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO; +import com.docus.server.entity.segmentation.OcrCutConfigTest; +import com.docus.server.api.segmentation.OcrCutConfigTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrCutConfigTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* ocr图片剪切配置-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "ocr图片剪切配置-调试", tags = "ocr图片剪切配置-调试") +@RestController +public class OcrCutConfigTestController implements OcrCutConfigTestApi { + @Resource + private IOcrCutConfigTestService iOcrCutConfigTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrCutConfigTestVO findById(Long id) { + return iOcrCutConfigTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrCutConfigTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrCutConfigTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrCutConfigTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrCutConfigTestDTO addOcrCutConfigTestDTO) { + iOcrCutConfigTestService.add(addOcrCutConfigTestDTO); + } + + /** + * 编辑 + * @param editOcrCutConfigTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrCutConfigTestDTO editOcrCutConfigTestDTO) { + iOcrCutConfigTestService.edit(editOcrCutConfigTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrCutConfigTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrCutConfigTestDTO deleteOcrCutConfigTestDTO) { + return iOcrCutConfigTestService.delete(deleteOcrCutConfigTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoController.java index 9bff96f..9f9287d 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoController.java @@ -1,38 +1,37 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrFileInfoApi; import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO; -import com.docus.server.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO; import com.docus.server.dto.segmentation.ocrfileinfo.EditOcrFileInfoDTO; -import com.docus.server.service.IOcrFileInfoService; +import com.docus.server.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO; import com.docus.server.vo.segmentation.ocrfileinfo.OcrFileInfoVO; +import com.docus.server.entity.segmentation.OcrFileInfo; +import com.docus.server.api.segmentation.OcrFileInfoApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrFileInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.List; /** - * ocr文件信息 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* ocr文件信息 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Api(value = "ocr文件信息", tags = "ocr文件信息") @RestController public class OcrFileInfoController implements OcrFileInfoApi { @Resource private IOcrFileInfoService iOcrFileInfoService; - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @ApiOperation("按主键查询") @Override public OcrFileInfoVO findById(Long id) { @@ -40,22 +39,20 @@ public class OcrFileInfoController implements OcrFileInfoApi { } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrFileInfoService.findAll(); + @Override + public List findAll() { + return iOcrFileInfoService.findAll(); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { @@ -63,36 +60,33 @@ public class OcrFileInfoController implements OcrFileInfoApi { } /** - * 新增 - * - * @param addOcrFileInfoDTO 编辑参数 - */ + * 新增 + * @param addOcrFileInfoDTO 编辑参数 + */ @ApiOperation("新增") - @Override - public void add(AddOcrFileInfoDTO addOcrFileInfoDTO) { - iOcrFileInfoService.add(addOcrFileInfoDTO); + @Override + public void add(AddOcrFileInfoDTO addOcrFileInfoDTO) { + iOcrFileInfoService.add(addOcrFileInfoDTO); } /** - * 编辑 - * - * @param editOcrFileInfoDTO 编辑参数 - */ + * 编辑 + * @param editOcrFileInfoDTO 编辑参数 + */ @ApiOperation("编辑") - @Override - public void edit(EditOcrFileInfoDTO editOcrFileInfoDTO) { - iOcrFileInfoService.edit(editOcrFileInfoDTO); + @Override + public void edit(EditOcrFileInfoDTO editOcrFileInfoDTO) { + iOcrFileInfoService.edit(editOcrFileInfoDTO); } /** - * 批量删除 - * - * @param deleteOcrFileInfoDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrFileInfoDTO 删除参数 + * @return 成功或失败 + */ @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrFileInfoDTO deleteOcrFileInfoDTO) { - return iOcrFileInfoService.delete(deleteOcrFileInfoDTO); + @Override + public int delete(DeleteOcrFileInfoDTO deleteOcrFileInfoDTO) { + return iOcrFileInfoService.delete(deleteOcrFileInfoDTO); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoTestController.java new file mode 100644 index 0000000..8ad1ee2 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrFileInfoTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO; +import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.docus.server.api.segmentation.OcrFileInfoTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrFileInfoTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* ocr文件信息-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "ocr文件信息-调试", tags = "ocr文件信息-调试") +@RestController +public class OcrFileInfoTestController implements OcrFileInfoTestApi { + @Resource + private IOcrFileInfoTestService iOcrFileInfoTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrFileInfoTestVO findById(Long id) { + return iOcrFileInfoTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrFileInfoTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrFileInfoTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrFileInfoTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrFileInfoTestDTO addOcrFileInfoTestDTO) { + iOcrFileInfoTestService.add(addOcrFileInfoTestDTO); + } + + /** + * 编辑 + * @param editOcrFileInfoTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrFileInfoTestDTO editOcrFileInfoTestDTO) { + iOcrFileInfoTestService.edit(editOcrFileInfoTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrFileInfoTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrFileInfoTestDTO deleteOcrFileInfoTestDTO) { + return iOcrFileInfoTestService.delete(deleteOcrFileInfoTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleController.java index 94e3b6a..86ffbfe 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleController.java @@ -1,38 +1,37 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrRuleApi; import com.docus.server.dto.segmentation.ocrrule.AddOcrRuleDTO; -import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; -import com.docus.server.service.IOcrRuleService; +import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; +import com.docus.server.entity.segmentation.OcrRule; +import com.docus.server.api.segmentation.OcrRuleApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrRuleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.List; /** - * 匹配策略表 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 匹配策略表 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Api(value = "匹配策略表", tags = "匹配策略表") @RestController public class OcrRuleController implements OcrRuleApi { @Resource private IOcrRuleService iOcrRuleService; - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @ApiOperation("按主键查询") @Override public OcrRuleVO findById(Long id) { @@ -40,22 +39,20 @@ public class OcrRuleController implements OcrRuleApi { } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrRuleService.findAll(); + @Override + public List findAll() { + return iOcrRuleService.findAll(); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { @@ -63,36 +60,33 @@ public class OcrRuleController implements OcrRuleApi { } /** - * 新增 - * - * @param addOcrRuleDTO 编辑参数 - */ + * 新增 + * @param addOcrRuleDTO 编辑参数 + */ @ApiOperation("新增") - @Override - public void add(AddOcrRuleDTO addOcrRuleDTO) { - iOcrRuleService.add(addOcrRuleDTO); + @Override + public void add(AddOcrRuleDTO addOcrRuleDTO) { + iOcrRuleService.add(addOcrRuleDTO); } /** - * 编辑 - * - * @param editOcrRuleDTO 编辑参数 - */ + * 编辑 + * @param editOcrRuleDTO 编辑参数 + */ @ApiOperation("编辑") - @Override - public void edit(EditOcrRuleDTO editOcrRuleDTO) { - iOcrRuleService.edit(editOcrRuleDTO); + @Override + public void edit(EditOcrRuleDTO editOcrRuleDTO) { + iOcrRuleService.edit(editOcrRuleDTO); } /** - * 批量删除 - * - * @param deleteOcrRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrRuleDTO 删除参数 + * @return 成功或失败 + */ @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrRuleDTO deleteOcrRuleDTO) { - return iOcrRuleService.delete(deleteOcrRuleDTO); + @Override + public int delete(DeleteOcrRuleDTO deleteOcrRuleDTO) { + return iOcrRuleService.delete(deleteOcrRuleDTO); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleTestController.java new file mode 100644 index 0000000..4b6a5cc --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrRuleTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrruletest.OcrRuleTestVO; +import com.docus.server.entity.segmentation.OcrRuleTest; +import com.docus.server.api.segmentation.OcrRuleTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrRuleTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* 匹配策略表-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "匹配策略表-调试", tags = "匹配策略表-调试") +@RestController +public class OcrRuleTestController implements OcrRuleTestApi { + @Resource + private IOcrRuleTestService iOcrRuleTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrRuleTestVO findById(Long id) { + return iOcrRuleTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrRuleTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrRuleTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrRuleTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrRuleTestDTO addOcrRuleTestDTO) { + iOcrRuleTestService.add(addOcrRuleTestDTO); + } + + /** + * 编辑 + * @param editOcrRuleTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrRuleTestDTO editOcrRuleTestDTO) { + iOcrRuleTestService.edit(editOcrRuleTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrRuleTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrRuleTestDTO deleteOcrRuleTestDTO) { + return iOcrRuleTestService.delete(deleteOcrRuleTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleController.java index 85d664f..0e1af92 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleController.java @@ -1,38 +1,37 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrSpecialRuleApi; import com.docus.server.dto.segmentation.ocrspecialrule.AddOcrSpecialRuleDTO; -import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; -import com.docus.server.service.IOcrSpecialRuleService; +import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; +import com.docus.server.entity.segmentation.OcrSpecialRule; +import com.docus.server.api.segmentation.OcrSpecialRuleApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrSpecialRuleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.List; /** - * 特殊策略表 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 特殊策略表 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ @Api(value = "特殊策略表", tags = "特殊策略表") @RestController public class OcrSpecialRuleController implements OcrSpecialRuleApi { @Resource private IOcrSpecialRuleService iOcrSpecialRuleService; - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @ApiOperation("按主键查询") @Override public OcrSpecialRuleVO findById(Long id) { @@ -40,22 +39,20 @@ public class OcrSpecialRuleController implements OcrSpecialRuleApi { } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrSpecialRuleService.findAll(); + @Override + public List findAll() { + return iOcrSpecialRuleService.findAll(); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { @@ -63,36 +60,33 @@ public class OcrSpecialRuleController implements OcrSpecialRuleApi { } /** - * 新增 - * - * @param addOcrSpecialRuleDTO 编辑参数 - */ + * 新增 + * @param addOcrSpecialRuleDTO 编辑参数 + */ @ApiOperation("新增") - @Override - public void add(AddOcrSpecialRuleDTO addOcrSpecialRuleDTO) { - iOcrSpecialRuleService.add(addOcrSpecialRuleDTO); + @Override + public void add(AddOcrSpecialRuleDTO addOcrSpecialRuleDTO) { + iOcrSpecialRuleService.add(addOcrSpecialRuleDTO); } /** - * 编辑 - * - * @param editOcrSpecialRuleDTO 编辑参数 - */ + * 编辑 + * @param editOcrSpecialRuleDTO 编辑参数 + */ @ApiOperation("编辑") - @Override - public void edit(EditOcrSpecialRuleDTO editOcrSpecialRuleDTO) { - iOcrSpecialRuleService.edit(editOcrSpecialRuleDTO); + @Override + public void edit(EditOcrSpecialRuleDTO editOcrSpecialRuleDTO) { + iOcrSpecialRuleService.edit(editOcrSpecialRuleDTO); } /** - * 批量删除 - * - * @param deleteOcrSpecialRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrSpecialRuleDTO 删除参数 + * @return 成功或失败 + */ @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrSpecialRuleDTO deleteOcrSpecialRuleDTO) { - return iOcrSpecialRuleService.delete(deleteOcrSpecialRuleDTO); + @Override + public int delete(DeleteOcrSpecialRuleDTO deleteOcrSpecialRuleDTO) { + return iOcrSpecialRuleService.delete(deleteOcrSpecialRuleDTO); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleTestController.java new file mode 100644 index 0000000..1af1342 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpecialRuleTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; +import com.docus.server.api.segmentation.OcrSpecialRuleTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrSpecialRuleTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* 特殊策略表-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "特殊策略表-调试", tags = "特殊策略表-调试") +@RestController +public class OcrSpecialRuleTestController implements OcrSpecialRuleTestApi { + @Resource + private IOcrSpecialRuleTestService iOcrSpecialRuleTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrSpecialRuleTestVO findById(Long id) { + return iOcrSpecialRuleTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrSpecialRuleTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrSpecialRuleTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrSpecialRuleTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO) { + iOcrSpecialRuleTestService.add(addOcrSpecialRuleTestDTO); + } + + /** + * 编辑 + * @param editOcrSpecialRuleTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO) { + iOcrSpecialRuleTestService.edit(editOcrSpecialRuleTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrSpecialRuleTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrSpecialRuleTestDTO deleteOcrSpecialRuleTestDTO) { + return iOcrSpecialRuleTestService.delete(deleteOcrSpecialRuleTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigController.java new file mode 100644 index 0000000..c53c884 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrurlconfig.OcrUrlConfigVO; +import com.docus.server.entity.segmentation.OcrUrlConfig; +import com.docus.server.api.segmentation.OcrUrlConfigApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrUrlConfigService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* ocr路径配置表 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "ocr路径配置表", tags = "ocr路径配置表") +@RestController +public class OcrUrlConfigController implements OcrUrlConfigApi { + @Resource + private IOcrUrlConfigService iOcrUrlConfigService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrUrlConfigVO findById(Long id) { + return iOcrUrlConfigService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrUrlConfigService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrUrlConfigService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrUrlConfigDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrUrlConfigDTO addOcrUrlConfigDTO) { + iOcrUrlConfigService.add(addOcrUrlConfigDTO); + } + + /** + * 编辑 + * @param editOcrUrlConfigDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrUrlConfigDTO editOcrUrlConfigDTO) { + iOcrUrlConfigService.edit(editOcrUrlConfigDTO); + } + + /** + * 批量删除 + * @param deleteOcrUrlConfigDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrUrlConfigDTO deleteOcrUrlConfigDTO) { + return iOcrUrlConfigService.delete(deleteOcrUrlConfigDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigTestController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigTestController.java new file mode 100644 index 0000000..6d5eabf --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrUrlConfigTestController.java @@ -0,0 +1,92 @@ +package com.docus.server.controller; + +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.vo.segmentation.ocrurlconfigtest.OcrUrlConfigTestVO; +import com.docus.server.entity.segmentation.OcrUrlConfigTest; +import com.docus.server.api.segmentation.OcrUrlConfigTestApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrUrlConfigTestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** +* +* ocr路径配置表-调试 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "ocr路径配置表-调试", tags = "ocr路径配置表-调试") +@RestController +public class OcrUrlConfigTestController implements OcrUrlConfigTestApi { + @Resource + private IOcrUrlConfigTestService iOcrUrlConfigTestService; + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrUrlConfigTestVO findById(Long id) { + return iOcrUrlConfigTestService.findById(id); + } + + /** + *查询所有 + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrUrlConfigTestService.findAll(); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrUrlConfigTestService.search(searchDTO); + } + + /** + * 新增 + * @param addOcrUrlConfigTestDTO 编辑参数 + */ + @ApiOperation("新增") + @Override + public void add(AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO) { + iOcrUrlConfigTestService.add(addOcrUrlConfigTestDTO); + } + + /** + * 编辑 + * @param editOcrUrlConfigTestDTO 编辑参数 + */ + @ApiOperation("编辑") + @Override + public void edit(EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO) { + iOcrUrlConfigTestService.edit(editOcrUrlConfigTestDTO); + } + + /** + * 批量删除 + * @param deleteOcrUrlConfigTestDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrUrlConfigTestDTO deleteOcrUrlConfigTestDTO) { + return iOcrUrlConfigTestService.delete(deleteOcrUrlConfigTestDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrVersionController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrVersionController.java index 683c255..1bf0834 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/OcrVersionController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrVersionController.java @@ -1,38 +1,37 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.api.segmentation.OcrVersionApi; import com.docus.server.dto.segmentation.ocrversion.AddOcrVersionDTO; -import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; -import com.docus.server.service.IOcrVersionService; +import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; +import com.docus.server.entity.segmentation.OcrVersion; +import com.docus.server.api.segmentation.OcrVersionApi; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.service.IOcrVersionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.List; /** - * 正式数据版本号管理 控制器类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -@Api(value = "正式数据版本号", tags = "正式数据版本号") +* +* 正式数据版本号管理 控制器类 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Api(value = "正式数据版本号管理", tags = "正式数据版本号管理") @RestController public class OcrVersionController implements OcrVersionApi { @Resource private IOcrVersionService iOcrVersionService; - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @ApiOperation("按主键查询") @Override public OcrVersionVO findById(Long id) { @@ -40,22 +39,20 @@ public class OcrVersionController implements OcrVersionApi { } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @ApiOperation("查询所有") - @Override - public List findAll() { - return iOcrVersionService.findAll(); + @Override + public List findAll() { + return iOcrVersionService.findAll(); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { @@ -63,36 +60,33 @@ public class OcrVersionController implements OcrVersionApi { } /** - * 新增 - * - * @param addOcrVersionDTO 编辑参数 - */ + * 新增 + * @param addOcrVersionDTO 编辑参数 + */ @ApiOperation("新增") - @Override - public void add(AddOcrVersionDTO addOcrVersionDTO) { - iOcrVersionService.add(addOcrVersionDTO); + @Override + public void add(AddOcrVersionDTO addOcrVersionDTO) { + iOcrVersionService.add(addOcrVersionDTO); } /** - * 编辑 - * - * @param editOcrVersionDTO 编辑参数 - */ + * 编辑 + * @param editOcrVersionDTO 编辑参数 + */ @ApiOperation("编辑") - @Override - public void edit(EditOcrVersionDTO editOcrVersionDTO) { - iOcrVersionService.edit(editOcrVersionDTO); + @Override + public void edit(EditOcrVersionDTO editOcrVersionDTO) { + iOcrVersionService.edit(editOcrVersionDTO); } /** - * 批量删除 - * - * @param deleteOcrVersionDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrVersionDTO 删除参数 + * @return 成功或失败 + */ @ApiOperation("批量删除") - @Override - public int delete(DeleteOcrVersionDTO deleteOcrVersionDTO) { - return iOcrVersionService.delete(deleteOcrVersionDTO); + @Override + public int delete(DeleteOcrVersionDTO deleteOcrVersionDTO) { + return iOcrVersionService.delete(deleteOcrVersionDTO); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java index 6a02ff7..1ae9764 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicConvert.java @@ -18,7 +18,7 @@ import java.util.List; * 患者信息表 服务转换器 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrBasicConvert { diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java new file mode 100644 index 0000000..d35d277 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrBasicTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrBasicTest; + 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.vo.segmentation.ocrbasictest.OcrBasicTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* 患者信息表-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrBasicTestConvert { + + OcrBasicTestConvert INSTANCE = Mappers.getMapper(OcrBasicTestConvert.class); + + @Mappings({}) + OcrBasicTest convertDO(AddOcrBasicTestDTO addOcrBasicTestDTO); + + @Mappings({}) + OcrBasicTest convertDO(EditOcrBasicTestDTO editOcrBasicTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrBasicTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrBasicTestDTO); + + @Mappings({}) + OcrBasicTestVO convertVO(OcrBasicTest ocrBasicTest); + + @Mappings({}) + List convertVO(List ocrBasicTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrConfigConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrConfigConvert.java deleted file mode 100644 index c6c96c7..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrConfigConvert.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.docus.server.convert; - -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrConfig; - import com.docus.server.dto.segmentation.ocrconfig.AddOcrConfigDTO; - import com.docus.server.dto.segmentation.ocrconfig.EditOcrConfigDTO; - import com.docus.server.dto.segmentation.ocrconfig.DeleteOcrConfigDTO; -import com.docus.server.vo.segmentation.ocrconfig.OcrConfigVO; - -import org.mapstruct.Mapper; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** -* -* 基础配置表 服务转换器 -* -* @author AutoGenerator -* @since 2023-08-25 -*/ -@Mapper -public interface OcrConfigConvert { - - OcrConfigConvert INSTANCE = Mappers.getMapper(OcrConfigConvert.class); - - @Mappings({}) - OcrConfig convertDO(AddOcrConfigDTO addOcrConfigDTO); - - @Mappings({}) - OcrConfig convertDO(EditOcrConfigDTO editOcrConfigDTO); - - @Mappings({}) - List convertAddDOList(List addOcrConfigDTO); - - @Mappings({}) - List convertEditDOList(List editOcrConfigDTO); - - @Mappings({}) - OcrConfigVO convertVO(OcrConfig ocrConfig); - - @Mappings({}) - List convertVO(List ocrConfigList); - - @Mappings({}) - PageResult convertVO(PageResult pageResult); -} - diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigConvert.java new file mode 100644 index 0000000..dc5b978 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrCutConfig; + 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.vo.segmentation.ocrcutconfig.OcrCutConfigVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* ocr图片剪切配置 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrCutConfigConvert { + + OcrCutConfigConvert INSTANCE = Mappers.getMapper(OcrCutConfigConvert.class); + + @Mappings({}) + OcrCutConfig convertDO(AddOcrCutConfigDTO addOcrCutConfigDTO); + + @Mappings({}) + OcrCutConfig convertDO(EditOcrCutConfigDTO editOcrCutConfigDTO); + + @Mappings({}) + List convertAddDOList(List addOcrCutConfigDTO); + + @Mappings({}) + List convertEditDOList(List editOcrCutConfigDTO); + + @Mappings({}) + OcrCutConfigVO convertVO(OcrCutConfig ocrCutConfig); + + @Mappings({}) + List convertVO(List ocrCutConfigList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigTestConvert.java new file mode 100644 index 0000000..ce2ffaa --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrCutConfigTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrCutConfigTest; + 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.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* ocr图片剪切配置-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrCutConfigTestConvert { + + OcrCutConfigTestConvert INSTANCE = Mappers.getMapper(OcrCutConfigTestConvert.class); + + @Mappings({}) + OcrCutConfigTest convertDO(AddOcrCutConfigTestDTO addOcrCutConfigTestDTO); + + @Mappings({}) + OcrCutConfigTest convertDO(EditOcrCutConfigTestDTO editOcrCutConfigTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrCutConfigTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrCutConfigTestDTO); + + @Mappings({}) + OcrCutConfigTestVO convertVO(OcrCutConfigTest ocrCutConfigTest); + + @Mappings({}) + List convertVO(List ocrCutConfigTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoConvert.java index f08d911..abb2f73 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoConvert.java @@ -1,10 +1,12 @@ 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; @@ -16,7 +18,7 @@ import java.util.List; * ocr文件信息 服务转换器 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrFileInfoConvert { @@ -43,7 +45,7 @@ public interface OcrFileInfoConvert { @Mappings({}) PageResult convertVO(PageResult pageResult); - + @Mappings({}) List convertDO(List files); } diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java new file mode 100644 index 0000000..d7f1f8a --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrFileInfoTest; + 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.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* ocr文件信息-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrFileInfoTestConvert { + + OcrFileInfoTestConvert INSTANCE = Mappers.getMapper(OcrFileInfoTestConvert.class); + + @Mappings({}) + OcrFileInfoTest convertDO(AddOcrFileInfoTestDTO addOcrFileInfoTestDTO); + + @Mappings({}) + OcrFileInfoTest convertDO(EditOcrFileInfoTestDTO editOcrFileInfoTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrFileInfoTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrFileInfoTestDTO); + + @Mappings({}) + OcrFileInfoTestVO convertVO(OcrFileInfoTest ocrFileInfoTest); + + @Mappings({}) + List convertVO(List ocrFileInfoTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleConvert.java index ddac6aa..57a4301 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleConvert.java @@ -18,7 +18,7 @@ import java.util.List; * 匹配策略表 服务转换器 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrRuleConvert { diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleTestConvert.java new file mode 100644 index 0000000..77f649f --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrRuleTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrRuleTest; + 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.vo.segmentation.ocrruletest.OcrRuleTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* 匹配策略表-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrRuleTestConvert { + + OcrRuleTestConvert INSTANCE = Mappers.getMapper(OcrRuleTestConvert.class); + + @Mappings({}) + OcrRuleTest convertDO(AddOcrRuleTestDTO addOcrRuleTestDTO); + + @Mappings({}) + OcrRuleTest convertDO(EditOcrRuleTestDTO editOcrRuleTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrRuleTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrRuleTestDTO); + + @Mappings({}) + OcrRuleTestVO convertVO(OcrRuleTest ocrRuleTest); + + @Mappings({}) + List convertVO(List ocrRuleTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleConvert.java index 94f4a1d..e357f2a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleConvert.java @@ -18,7 +18,7 @@ import java.util.List; * 特殊策略表 服务转换器 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrSpecialRuleConvert { diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleTestConvert.java new file mode 100644 index 0000000..c7eff29 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpecialRuleTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; + 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.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* 特殊策略表-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrSpecialRuleTestConvert { + + OcrSpecialRuleTestConvert INSTANCE = Mappers.getMapper(OcrSpecialRuleTestConvert.class); + + @Mappings({}) + OcrSpecialRuleTest convertDO(AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO); + + @Mappings({}) + OcrSpecialRuleTest convertDO(EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrSpecialRuleTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrSpecialRuleTestDTO); + + @Mappings({}) + OcrSpecialRuleTestVO convertVO(OcrSpecialRuleTest ocrSpecialRuleTest); + + @Mappings({}) + List convertVO(List ocrSpecialRuleTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigConvert.java new file mode 100644 index 0000000..fc34135 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrUrlConfig; + 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.vo.segmentation.ocrurlconfig.OcrUrlConfigVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* ocr路径配置表 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrUrlConfigConvert { + + OcrUrlConfigConvert INSTANCE = Mappers.getMapper(OcrUrlConfigConvert.class); + + @Mappings({}) + OcrUrlConfig convertDO(AddOcrUrlConfigDTO addOcrUrlConfigDTO); + + @Mappings({}) + OcrUrlConfig convertDO(EditOcrUrlConfigDTO editOcrUrlConfigDTO); + + @Mappings({}) + List convertAddDOList(List addOcrUrlConfigDTO); + + @Mappings({}) + List convertEditDOList(List editOcrUrlConfigDTO); + + @Mappings({}) + OcrUrlConfigVO convertVO(OcrUrlConfig ocrUrlConfig); + + @Mappings({}) + List convertVO(List ocrUrlConfigList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigTestConvert.java new file mode 100644 index 0000000..ebc4c59 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrUrlConfigTestConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrUrlConfigTest; + 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.vo.segmentation.ocrurlconfigtest.OcrUrlConfigTestVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* ocr路径配置表-调试 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrUrlConfigTestConvert { + + OcrUrlConfigTestConvert INSTANCE = Mappers.getMapper(OcrUrlConfigTestConvert.class); + + @Mappings({}) + OcrUrlConfigTest convertDO(AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO); + + @Mappings({}) + OcrUrlConfigTest convertDO(EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO); + + @Mappings({}) + List convertAddDOList(List addOcrUrlConfigTestDTO); + + @Mappings({}) + List convertEditDOList(List editOcrUrlConfigTestDTO); + + @Mappings({}) + OcrUrlConfigTestVO convertVO(OcrUrlConfigTest ocrUrlConfigTest); + + @Mappings({}) + List convertVO(List ocrUrlConfigTestList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrVersionConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrVersionConvert.java index 7557df1..71b942f 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrVersionConvert.java +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrVersionConvert.java @@ -18,7 +18,7 @@ import java.util.List; * 正式数据版本号管理 服务转换器 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrVersionConvert { diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicDao.java index 08143db..fa234d1 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicDao.java @@ -1,65 +1,52 @@ package com.docus.server.infrastructure.dao; - +import com.docus.server.entity.segmentation.OcrBasic; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrBasic; - import java.util.List; - /** + * * 患者信息表 数据访问接口 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ public interface IOcrBasicDao extends IBaseDao { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrBasic findById(Long id); - /** - * 新增 - * - * @param ocrBasic 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrBasic 新增参数 + * @return 成功或失败 + */ boolean add(OcrBasic ocrBasic); - /** - * 编辑 - * - * @param ocrBasic 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrBasic 编辑参数 + * @return 成功或失败 + */ boolean edit(OcrBasic ocrBasic); - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ int delete(List ids); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ int findByIdAndName(Long id, String name); } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicTestDao.java new file mode 100644 index 0000000..49872f2 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrBasicTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrBasicTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * 患者信息表-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrBasicTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrBasicTest findById(Long id); + /** + * 新增 + * @param ocrBasicTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrBasicTest ocrBasicTest); + /** + * 编辑 + * @param ocrBasicTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrBasicTest ocrBasicTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrConfigDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrConfigDao.java deleted file mode 100644 index fdc7208..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrConfigDao.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.docus.server.infrastructure.dao; - -import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrConfig; - -import java.util.List; - -/** - * 基础配置表 数据访问接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -public interface IOcrConfigDao extends IBaseDao { - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - OcrConfig findById(Long id); - - /** - * 新增 - * - * @param ocrConfig 新增参数 - * @return 成功或失败 - */ - boolean add(OcrConfig ocrConfig); - - /** - * 编辑 - * - * @param ocrConfig 编辑参数 - * @return 成功或失败 - */ - boolean edit(OcrConfig ocrConfig); - - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ - int delete(List ids); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - PageResult search(SearchDTO searchDTO); - - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ - int findByIdAndName(Long id, String name); -} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigDao.java new file mode 100644 index 0000000..6cc9b2d --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrCutConfig; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * ocr图片剪切配置 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrCutConfigDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrCutConfig findById(Long id); + /** + * 新增 + * @param ocrCutConfig 新增参数 + * @return 成功或失败 + */ + boolean add(OcrCutConfig ocrCutConfig); + /** + * 编辑 + * @param ocrCutConfig 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrCutConfig ocrCutConfig); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigTestDao.java new file mode 100644 index 0000000..1b7a805 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrCutConfigTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrCutConfigTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * ocr图片剪切配置-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrCutConfigTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrCutConfigTest findById(Long id); + /** + * 新增 + * @param ocrCutConfigTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrCutConfigTest ocrCutConfigTest); + /** + * 编辑 + * @param ocrCutConfigTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrCutConfigTest ocrCutConfigTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoDao.java index 85e4bce..8f02d0b 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoDao.java @@ -1,65 +1,52 @@ package com.docus.server.infrastructure.dao; - +import com.docus.server.entity.segmentation.OcrFileInfo; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrFileInfo; - import java.util.List; - /** + * * ocr文件信息 数据访问接口 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ public interface IOcrFileInfoDao extends IBaseDao { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrFileInfo findById(Long id); - /** - * 新增 - * - * @param ocrFileInfo 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrFileInfo 新增参数 + * @return 成功或失败 + */ boolean add(OcrFileInfo ocrFileInfo); - /** - * 编辑 - * - * @param ocrFileInfo 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrFileInfo 编辑参数 + * @return 成功或失败 + */ boolean edit(OcrFileInfo ocrFileInfo); - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ int delete(List ids); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ int findByIdAndName(Long id, String name); } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java new file mode 100644 index 0000000..afe8bd4 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrFileInfoTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * ocr文件信息-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrFileInfoTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrFileInfoTest findById(Long id); + /** + * 新增 + * @param ocrFileInfoTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrFileInfoTest ocrFileInfoTest); + /** + * 编辑 + * @param ocrFileInfoTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrFileInfoTest ocrFileInfoTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleDao.java index 3e8f874..47406ba 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleDao.java @@ -1,65 +1,52 @@ package com.docus.server.infrastructure.dao; - +import com.docus.server.entity.segmentation.OcrRule; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrRule; - import java.util.List; - /** + * * 匹配策略表 数据访问接口 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ public interface IOcrRuleDao extends IBaseDao { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrRule findById(Long id); - /** - * 新增 - * - * @param ocrRule 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrRule 新增参数 + * @return 成功或失败 + */ boolean add(OcrRule ocrRule); - /** - * 编辑 - * - * @param ocrRule 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrRule 编辑参数 + * @return 成功或失败 + */ boolean edit(OcrRule ocrRule); - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ int delete(List ids); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ int findByIdAndName(Long id, String name); } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleTestDao.java new file mode 100644 index 0000000..bee3439 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrRuleTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrRuleTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * 匹配策略表-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrRuleTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrRuleTest findById(Long id); + /** + * 新增 + * @param ocrRuleTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrRuleTest ocrRuleTest); + /** + * 编辑 + * @param ocrRuleTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrRuleTest ocrRuleTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleDao.java index 9c27dda..16b49d0 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleDao.java @@ -1,65 +1,52 @@ package com.docus.server.infrastructure.dao; - +import com.docus.server.entity.segmentation.OcrSpecialRule; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrSpecialRule; - import java.util.List; - /** + * * 特殊策略表 数据访问接口 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ public interface IOcrSpecialRuleDao extends IBaseDao { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrSpecialRule findById(Long id); - /** - * 新增 - * - * @param ocrSpecialRule 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrSpecialRule 新增参数 + * @return 成功或失败 + */ boolean add(OcrSpecialRule ocrSpecialRule); - /** - * 编辑 - * - * @param ocrSpecialRule 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrSpecialRule 编辑参数 + * @return 成功或失败 + */ boolean edit(OcrSpecialRule ocrSpecialRule); - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ int delete(List ids); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ int findByIdAndName(Long id, String name); } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleTestDao.java new file mode 100644 index 0000000..6e872f6 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpecialRuleTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * 特殊策略表-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrSpecialRuleTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrSpecialRuleTest findById(Long id); + /** + * 新增 + * @param ocrSpecialRuleTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrSpecialRuleTest ocrSpecialRuleTest); + /** + * 编辑 + * @param ocrSpecialRuleTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrSpecialRuleTest ocrSpecialRuleTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigDao.java new file mode 100644 index 0000000..5217cc1 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrUrlConfig; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * ocr路径配置表 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrUrlConfigDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrUrlConfig findById(Long id); + /** + * 新增 + * @param ocrUrlConfig 新增参数 + * @return 成功或失败 + */ + boolean add(OcrUrlConfig ocrUrlConfig); + /** + * 编辑 + * @param ocrUrlConfig 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrUrlConfig ocrUrlConfig); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigTestDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigTestDao.java new file mode 100644 index 0000000..d1c17f6 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrUrlConfigTestDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrUrlConfigTest; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * ocr路径配置表-调试 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +public interface IOcrUrlConfigTestDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrUrlConfigTest findById(Long id); + /** + * 新增 + * @param ocrUrlConfigTest 新增参数 + * @return 成功或失败 + */ + boolean add(OcrUrlConfigTest ocrUrlConfigTest); + /** + * 编辑 + * @param ocrUrlConfigTest 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrUrlConfigTest ocrUrlConfigTest); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrVersionDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrVersionDao.java index a65f341..cc1858e 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrVersionDao.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrVersionDao.java @@ -1,65 +1,52 @@ package com.docus.server.infrastructure.dao; - +import com.docus.server.entity.segmentation.OcrVersion; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrVersion; - import java.util.List; - /** + * * 正式数据版本号管理 数据访问接口 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ public interface IOcrVersionDao extends IBaseDao { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrVersion findById(Long id); - /** - * 新增 - * - * @param ocrVersion 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrVersion 新增参数 + * @return 成功或失败 + */ boolean add(OcrVersion ocrVersion); - /** - * 编辑 - * - * @param ocrVersion 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrVersion 编辑参数 + * @return 成功或失败 + */ boolean edit(OcrVersion ocrVersion); - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ int delete(List ids); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ int findByIdAndName(Long id, String name); } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicDaoImpl.java index fa7b66b..f18cedc 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicDaoImpl.java @@ -2,82 +2,78 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrBasic; -import com.docus.server.infrastructure.dao.IOcrBasicDao; import com.docus.server.infrastructure.mapper.OcrBasicMapper; +import com.docus.server.infrastructure.dao.IOcrBasicDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; /** + * * 患者信息表 数据访问实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Repository public class OcrBasicDaoImpl extends BaseDaoImpl implements IOcrBasicDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public OcrBasic findById(Long id) { return super.findById(id); } /** - * 新增 - * - * @param ocrBasic 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrBasic 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(OcrBasic ocrBasic) { + public boolean add(OcrBasic ocrBasic) { return super.save(ocrBasic); } /** - * 编辑 - * - * @param ocrBasic 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrBasic 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(OcrBasic ocrBasic) { + public boolean edit(OcrBasic ocrBasic) { return super.updateById(ocrBasic); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchDTO searchDTO) { //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime if (searchDTO.getBeginTime() != null) { query.ge(OcrBasic::getCreateTime, searchDTO.getBeginTime()); @@ -100,22 +96,20 @@ public class OcrBasicDaoImpl extends BaseDaoImpl imple List list = super.find(query); return new PageResult<>(list); } - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ @Override public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (id != null) { query.ne(OcrBasic::getId, id); } //if (Func.isNotBlank(name)) { - // query.eq(OcrBasic::getName, name); + // query.eq(OcrBasic::getName, name); //} return baseMapper.selectCount(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java new file mode 100644 index 0000000..e633fc2 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrBasicTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrBasicTest; +import com.docus.server.infrastructure.mapper.OcrBasicTestMapper; +import com.docus.server.infrastructure.dao.IOcrBasicTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * 患者信息表-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrBasicTestDaoImpl extends BaseDaoImpl implements IOcrBasicTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrBasicTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrBasicTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrBasicTest ocrBasicTest) { + return super.save(ocrBasicTest); + } + + /** + * 编辑 + * @param ocrBasicTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrBasicTest ocrBasicTest) { + return super.updateById(ocrBasicTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrBasicTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrBasicTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrBasicTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrBasicTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrBasicTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrBasicTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrBasicTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrBasicTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrConfigDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrConfigDaoImpl.java deleted file mode 100644 index 4ed4113..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrConfigDaoImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.docus.server.infrastructure.dao.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.segmentation.OcrConfig; -import com.docus.server.infrastructure.dao.IOcrConfigDao; -import com.docus.server.infrastructure.mapper.OcrConfigMapper; -import com.github.pagehelper.PageHelper; -import org.springframework.stereotype.Repository; - -import java.util.Date; -import java.util.List; - -/** - * 基础配置表 数据访问实现类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -@Repository -public class OcrConfigDaoImpl extends BaseDaoImpl implements IOcrConfigDao { - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrConfig findById(Long id) { - return super.findById(id); - } - - /** - * 新增 - * - * @param ocrConfig 编辑参数 - * @return 成功或失败 - */ - @Override - public boolean add(OcrConfig ocrConfig) { - return super.save(ocrConfig); - } - - /** - * 编辑 - * - * @param ocrConfig 编辑参数 - * @return 成功或失败 - */ - @Override - public boolean edit(OcrConfig ocrConfig) { - return super.updateById(ocrConfig); - } - - /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ - @Override - public int delete(List ids) { - return super.deleteByIds(ids); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - //分页 - PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - //时间范围，默认按createTime - if (searchDTO.getBeginTime() != null) { - query.ge(OcrConfig::getCreateTime, searchDTO.getBeginTime()); - } - if (searchDTO.getEndTime() != null) { - Date endTime = searchDTO.getEndTime(); - query.le(OcrConfig::getCreateTime, endTime); - } - //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { - //单个列用like - //query. like(OcrConfig::getxxx, searchDTO.getKeyword()); - //多个列用like - //query. and(sub -> sub.like(OcrConfig::getxx1, searchDTO.getKeyword()) - // оr(). like(OcrConfig::getXX2, searchDTO.getKeyword())) - //); - //} - //默认createTime倒序排序 - query.orderByDesc(OcrConfig::getCreateTime); - List list = super.find(query); - return new PageResult<>(list); - } - - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ - @Override - public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - if (id != null) { - query.ne(OcrConfig::getId, id); - } - //if (Func.isNotBlank(name)) { - // query.eq(OcrConfig::getName, name); - //} - - return baseMapper.selectCount(query); - } -} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java new file mode 100644 index 0000000..db27ae4 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrCutConfig; +import com.docus.server.infrastructure.mapper.OcrCutConfigMapper; +import com.docus.server.infrastructure.dao.IOcrCutConfigDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * ocr图片剪切配置 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrCutConfigDaoImpl extends BaseDaoImpl implements IOcrCutConfigDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrCutConfig findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrCutConfig 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrCutConfig ocrCutConfig) { + return super.save(ocrCutConfig); + } + + /** + * 编辑 + * @param ocrCutConfig 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrCutConfig ocrCutConfig) { + return super.updateById(ocrCutConfig); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrCutConfig::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrCutConfig::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrCutConfig::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrCutConfig::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrCutConfig::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrCutConfig::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrCutConfig::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrCutConfig::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigTestDaoImpl.java new file mode 100644 index 0000000..7a23671 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrCutConfigTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrCutConfigTest; +import com.docus.server.infrastructure.mapper.OcrCutConfigTestMapper; +import com.docus.server.infrastructure.dao.IOcrCutConfigTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * ocr图片剪切配置-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrCutConfigTestDaoImpl extends BaseDaoImpl implements IOcrCutConfigTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrCutConfigTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrCutConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrCutConfigTest ocrCutConfigTest) { + return super.save(ocrCutConfigTest); + } + + /** + * 编辑 + * @param ocrCutConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrCutConfigTest ocrCutConfigTest) { + return super.updateById(ocrCutConfigTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrCutConfigTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrCutConfigTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrCutConfigTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrCutConfigTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrCutConfigTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrCutConfigTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrCutConfigTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrCutConfigTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java index 54009b2..524c6d1 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoDaoImpl.java @@ -2,82 +2,78 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrFileInfo; -import com.docus.server.infrastructure.dao.IOcrFileInfoDao; import com.docus.server.infrastructure.mapper.OcrFileInfoMapper; +import com.docus.server.infrastructure.dao.IOcrFileInfoDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; /** + * * ocr文件信息 数据访问实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Repository public class OcrFileInfoDaoImpl extends BaseDaoImpl implements IOcrFileInfoDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public OcrFileInfo findById(Long id) { return super.findById(id); } /** - * 新增 - * - * @param ocrFileInfo 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrFileInfo 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(OcrFileInfo ocrFileInfo) { + public boolean add(OcrFileInfo ocrFileInfo) { return super.save(ocrFileInfo); } /** - * 编辑 - * - * @param ocrFileInfo 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrFileInfo 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(OcrFileInfo ocrFileInfo) { + public boolean edit(OcrFileInfo ocrFileInfo) { return super.updateById(ocrFileInfo); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchDTO searchDTO) { //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime if (searchDTO.getBeginTime() != null) { query.ge(OcrFileInfo::getCreateTime, searchDTO.getBeginTime()); @@ -100,22 +96,20 @@ public class OcrFileInfoDaoImpl extends BaseDaoImpl list = super.find(query); return new PageResult<>(list); } - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ @Override public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (id != null) { query.ne(OcrFileInfo::getId, id); } //if (Func.isNotBlank(name)) { - // query.eq(OcrFileInfo::getName, name); + // query.eq(OcrFileInfo::getName, name); //} return baseMapper.selectCount(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java new file mode 100644 index 0000000..d8455a0 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrFileInfoTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.docus.server.infrastructure.mapper.OcrFileInfoTestMapper; +import com.docus.server.infrastructure.dao.IOcrFileInfoTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * ocr文件信息-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrFileInfoTestDaoImpl extends BaseDaoImpl implements IOcrFileInfoTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrFileInfoTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrFileInfoTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrFileInfoTest ocrFileInfoTest) { + return super.save(ocrFileInfoTest); + } + + /** + * 编辑 + * @param ocrFileInfoTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrFileInfoTest ocrFileInfoTest) { + return super.updateById(ocrFileInfoTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrFileInfoTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrFileInfoTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrFileInfoTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrFileInfoTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrFileInfoTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrFileInfoTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrFileInfoTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrFileInfoTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java index 5b98099..5149fea 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleDaoImpl.java @@ -2,82 +2,78 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrRule; -import com.docus.server.infrastructure.dao.IOcrRuleDao; import com.docus.server.infrastructure.mapper.OcrRuleMapper; +import com.docus.server.infrastructure.dao.IOcrRuleDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; /** + * * 匹配策略表 数据访问实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Repository public class OcrRuleDaoImpl extends BaseDaoImpl implements IOcrRuleDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public OcrRule findById(Long id) { return super.findById(id); } /** - * 新增 - * - * @param ocrRule 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrRule 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(OcrRule ocrRule) { + public boolean add(OcrRule ocrRule) { return super.save(ocrRule); } /** - * 编辑 - * - * @param ocrRule 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrRule 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(OcrRule ocrRule) { + public boolean edit(OcrRule ocrRule) { return super.updateById(ocrRule); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchDTO searchDTO) { //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime if (searchDTO.getBeginTime() != null) { query.ge(OcrRule::getCreateTime, searchDTO.getBeginTime()); @@ -100,22 +96,20 @@ public class OcrRuleDaoImpl extends BaseDaoImpl implemen List list = super.find(query); return new PageResult<>(list); } - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ @Override public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (id != null) { query.ne(OcrRule::getId, id); } //if (Func.isNotBlank(name)) { - // query.eq(OcrRule::getName, name); + // query.eq(OcrRule::getName, name); //} return baseMapper.selectCount(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java new file mode 100644 index 0000000..a7f391a --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrRuleTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrRuleTest; +import com.docus.server.infrastructure.mapper.OcrRuleTestMapper; +import com.docus.server.infrastructure.dao.IOcrRuleTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * 匹配策略表-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrRuleTestDaoImpl extends BaseDaoImpl implements IOcrRuleTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrRuleTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrRuleTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrRuleTest ocrRuleTest) { + return super.save(ocrRuleTest); + } + + /** + * 编辑 + * @param ocrRuleTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrRuleTest ocrRuleTest) { + return super.updateById(ocrRuleTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrRuleTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrRuleTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrRuleTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrRuleTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrRuleTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrRuleTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrRuleTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrRuleTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java index 86b093c..5d633bc 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleDaoImpl.java @@ -2,82 +2,78 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrSpecialRule; -import com.docus.server.infrastructure.dao.IOcrSpecialRuleDao; import com.docus.server.infrastructure.mapper.OcrSpecialRuleMapper; +import com.docus.server.infrastructure.dao.IOcrSpecialRuleDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; /** + * * 特殊策略表 数据访问实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Repository public class OcrSpecialRuleDaoImpl extends BaseDaoImpl implements IOcrSpecialRuleDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public OcrSpecialRule findById(Long id) { return super.findById(id); } /** - * 新增 - * - * @param ocrSpecialRule 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrSpecialRule 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(OcrSpecialRule ocrSpecialRule) { + public boolean add(OcrSpecialRule ocrSpecialRule) { return super.save(ocrSpecialRule); } /** - * 编辑 - * - * @param ocrSpecialRule 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrSpecialRule 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(OcrSpecialRule ocrSpecialRule) { + public boolean edit(OcrSpecialRule ocrSpecialRule) { return super.updateById(ocrSpecialRule); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchDTO searchDTO) { //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime if (searchDTO.getBeginTime() != null) { query.ge(OcrSpecialRule::getCreateTime, searchDTO.getBeginTime()); @@ -100,22 +96,20 @@ public class OcrSpecialRuleDaoImpl extends BaseDaoImpl list = super.find(query); return new PageResult<>(list); } - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ @Override public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (id != null) { query.ne(OcrSpecialRule::getId, id); } //if (Func.isNotBlank(name)) { - // query.eq(OcrSpecialRule::getName, name); + // query.eq(OcrSpecialRule::getName, name); //} return baseMapper.selectCount(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleTestDaoImpl.java new file mode 100644 index 0000000..d0c7e98 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpecialRuleTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; +import com.docus.server.infrastructure.mapper.OcrSpecialRuleTestMapper; +import com.docus.server.infrastructure.dao.IOcrSpecialRuleTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * 特殊策略表-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrSpecialRuleTestDaoImpl extends BaseDaoImpl implements IOcrSpecialRuleTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrSpecialRuleTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrSpecialRuleTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrSpecialRuleTest ocrSpecialRuleTest) { + return super.save(ocrSpecialRuleTest); + } + + /** + * 编辑 + * @param ocrSpecialRuleTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrSpecialRuleTest ocrSpecialRuleTest) { + return super.updateById(ocrSpecialRuleTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrSpecialRuleTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrSpecialRuleTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrSpecialRuleTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrSpecialRuleTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrSpecialRuleTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrSpecialRuleTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrSpecialRuleTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrSpecialRuleTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java new file mode 100644 index 0000000..fdc4590 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrUrlConfig; +import com.docus.server.infrastructure.mapper.OcrUrlConfigMapper; +import com.docus.server.infrastructure.dao.IOcrUrlConfigDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * ocr路径配置表 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrUrlConfigDaoImpl extends BaseDaoImpl implements IOcrUrlConfigDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrUrlConfig findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrUrlConfig 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrUrlConfig ocrUrlConfig) { + return super.save(ocrUrlConfig); + } + + /** + * 编辑 + * @param ocrUrlConfig 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrUrlConfig ocrUrlConfig) { + return super.updateById(ocrUrlConfig); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrUrlConfig::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrUrlConfig::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrUrlConfig::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrUrlConfig::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrUrlConfig::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrUrlConfig::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrUrlConfig::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrUrlConfig::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigTestDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigTestDaoImpl.java new file mode 100644 index 0000000..d832813 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrUrlConfigTestDaoImpl.java @@ -0,0 +1,117 @@ +package com.docus.server.infrastructure.dao.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; +import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrUrlConfigTest; +import com.docus.server.infrastructure.mapper.OcrUrlConfigTestMapper; +import com.docus.server.infrastructure.dao.IOcrUrlConfigTestDao; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; +import java.util.Date; +import java.util.List; + +/** + * + * ocr路径配置表-调试 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Repository +public class OcrUrlConfigTestDaoImpl extends BaseDaoImpl implements IOcrUrlConfigTestDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrUrlConfigTest findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrUrlConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrUrlConfigTest ocrUrlConfigTest) { + return super.save(ocrUrlConfigTest); + } + + /** + * 编辑 + * @param ocrUrlConfigTest 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrUrlConfigTest ocrUrlConfigTest) { + return super.updateById(ocrUrlConfigTest); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { + query.ge(OcrUrlConfigTest::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); + query.le(OcrUrlConfigTest::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrUrlConfigTest::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrUrlConfigTest::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrUrlConfigTest::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 + query.orderByDesc(OcrUrlConfigTest::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrUrlConfigTest::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrUrlConfigTest::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrVersionDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrVersionDaoImpl.java index 002afc7..c208285 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrVersionDaoImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrVersionDaoImpl.java @@ -2,82 +2,78 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.docus.core.util.Func; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.segmentation.OcrVersion; -import com.docus.server.infrastructure.dao.IOcrVersionDao; import com.docus.server.infrastructure.mapper.OcrVersionMapper; +import com.docus.server.infrastructure.dao.IOcrVersionDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; /** + * * 正式数据版本号管理 数据访问实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Repository public class OcrVersionDaoImpl extends BaseDaoImpl implements IOcrVersionDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public OcrVersion findById(Long id) { return super.findById(id); } /** - * 新增 - * - * @param ocrVersion 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param ocrVersion 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(OcrVersion ocrVersion) { + public boolean add(OcrVersion ocrVersion) { return super.save(ocrVersion); } /** - * 编辑 - * - * @param ocrVersion 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param ocrVersion 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(OcrVersion ocrVersion) { + public boolean edit(OcrVersion ocrVersion) { return super.updateById(ocrVersion); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override public PageResult search(SearchDTO searchDTO) { //分页 PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime if (searchDTO.getBeginTime() != null) { query.ge(OcrVersion::getCreateTime, searchDTO.getBeginTime()); @@ -100,22 +96,20 @@ public class OcrVersionDaoImpl extends BaseDaoImpl List list = super.find(query); return new PageResult<>(list); } - /** - * 名称不重复 - * - * @param id 主键 - * @param name 名称 - * @return 名称重复数量 - */ + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ @Override public int findByIdAndName(Long id, String name) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (id != null) { query.ne(OcrVersion::getId, id); } //if (Func.isNotBlank(name)) { - // query.eq(OcrVersion::getName, name); + // query.eq(OcrVersion::getName, name); //} return baseMapper.selectCount(query); diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicMapper.java index 6eea480..81fef93 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 患者信息表 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrBasicMapper extends BaseMapper { diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicTestMapper.java new file mode 100644 index 0000000..ff51dc6 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrBasicTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrBasicTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* 患者信息表-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrBasicTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigMapper.java new file mode 100644 index 0000000..fb80d03 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrCutConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* ocr图片剪切配置 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrCutConfigMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigTestMapper.java new file mode 100644 index 0000000..defb5a3 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrCutConfigTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrCutConfigTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* ocr图片剪切配置-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrCutConfigTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoMapper.java index 7ee2ee4..a477f6f 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * ocr文件信息 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrFileInfoMapper extends BaseMapper { diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoTestMapper.java new file mode 100644 index 0000000..643bd9d --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrFileInfoTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* ocr文件信息-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrFileInfoTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleMapper.java index 91fed4e..e9aa48c 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 匹配策略表 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrRuleMapper extends BaseMapper { diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleTestMapper.java new file mode 100644 index 0000000..f787f33 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrRuleTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrRuleTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* 匹配策略表-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrRuleTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleMapper.java index 0fcaa6d..b2e4d0a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 特殊策略表 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrSpecialRuleMapper extends BaseMapper { diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleTestMapper.java new file mode 100644 index 0000000..5355555 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpecialRuleTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* 特殊策略表-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrSpecialRuleTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrConfigMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigMapper.java similarity index 51% rename from docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrConfigMapper.java rename to docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigMapper.java index 87631eb..186e534 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrConfigMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigMapper.java @@ -1,17 +1,17 @@ package com.docus.server.infrastructure.mapper; -import com.docus.server.entity.segmentation.OcrConfig; +import com.docus.server.entity.segmentation.OcrUrlConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** * -* 基础配置表 Mapper 接口 +* ocr路径配置表 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper -public interface OcrConfigMapper extends BaseMapper { +public interface OcrUrlConfigMapper extends BaseMapper { } diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigTestMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigTestMapper.java new file mode 100644 index 0000000..76b2f9a --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrUrlConfigTestMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrUrlConfigTest; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* ocr路径配置表-调试 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +@Mapper +public interface OcrUrlConfigTestMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrVersionMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrVersionMapper.java index 98efc1b..ec1038a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrVersionMapper.java +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrVersionMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 正式数据版本号管理 Mapper 接口 * * @author AutoGenerator -* @since 2023-08-25 +* @since 2023-08-29 */ @Mapper public interface OcrVersionMapper extends BaseMapper { diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java index c68edb4..745d29a 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicService.java @@ -1,65 +1,57 @@ package com.docus.server.service; -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.DeleteOcrBasicDTO; import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; +import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; +import com.docus.server.entity.segmentation.OcrBasic; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; /** - * 患者信息表 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 患者信息表 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ public interface IOcrBasicService { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrBasicVO findById(Long id); - /** - * 查询所有 - * - * @return 实体 - */ + * 查询所有 + * @return 实体 + */ List findAll(); - /** - * 新增 - * - * @param addOcrBasicDTO 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param addOcrBasicDTO 新增参数 + * @return 成功或失败 + */ boolean add(AddOcrBasicDTO addOcrBasicDTO); - /** - * 编辑 - * - * @param editOcrBasicDTO 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param editOcrBasicDTO 编辑参数 + * @return 成功或失败 + */ boolean edit(EditOcrBasicDTO editOcrBasicDTO); - /** - * 批量删除 - * - * @param deleteOcrBasicDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrBasicDTO 删除参数 + * @return 成功或失败 + */ int delete(DeleteOcrBasicDTO deleteOcrBasicDTO); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java new file mode 100644 index 0000000..6974257 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrBasicTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrbasictest.OcrBasicTestVO; +import com.docus.server.entity.segmentation.OcrBasicTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* 患者信息表-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrBasicTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrBasicTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrBasicTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrBasicTestDTO addOcrBasicTestDTO); + /** + * 编辑 + * @param editOcrBasicTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrBasicTestDTO editOcrBasicTestDTO); + /** + * 批量删除 + * @param deleteOcrBasicTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrBasicTestDTO deleteOcrBasicTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrConfigService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrConfigService.java deleted file mode 100644 index 151307a..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrConfigService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.docus.server.service; - -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.segmentation.ocrconfig.AddOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.DeleteOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.EditOcrConfigDTO; -import com.docus.server.vo.segmentation.ocrconfig.OcrConfigVO; - -import java.util.List; - -/** - * 基础配置表 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -public interface IOcrConfigService { - /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ - OcrConfigVO findById(Long id); - - /** - * 查询所有 - * - * @return 实体 - */ - List findAll(); - - /** - * 新增 - * - * @param addOcrConfigDTO 新增参数 - * @return 成功或失败 - */ - boolean add(AddOcrConfigDTO addOcrConfigDTO); - - /** - * 编辑 - * - * @param editOcrConfigDTO 编辑参数 - * @return 成功或失败 - */ - boolean edit(EditOcrConfigDTO editOcrConfigDTO); - - /** - * 批量删除 - * - * @param deleteOcrConfigDTO 删除参数 - * @return 成功或失败 - */ - int delete(DeleteOcrConfigDTO deleteOcrConfigDTO); - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - PageResult search(SearchDTO searchDTO); -} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigService.java new file mode 100644 index 0000000..a2d5828 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrcutconfig.OcrCutConfigVO; +import com.docus.server.entity.segmentation.OcrCutConfig; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* ocr图片剪切配置 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrCutConfigService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrCutConfigVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrCutConfigDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrCutConfigDTO addOcrCutConfigDTO); + /** + * 编辑 + * @param editOcrCutConfigDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrCutConfigDTO editOcrCutConfigDTO); + /** + * 批量删除 + * @param deleteOcrCutConfigDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrCutConfigDTO deleteOcrCutConfigDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigTestService.java new file mode 100644 index 0000000..319669f --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrCutConfigTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO; +import com.docus.server.entity.segmentation.OcrCutConfigTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* ocr图片剪切配置-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrCutConfigTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrCutConfigTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrCutConfigTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrCutConfigTestDTO addOcrCutConfigTestDTO); + /** + * 编辑 + * @param editOcrCutConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrCutConfigTestDTO editOcrCutConfigTestDTO); + /** + * 批量删除 + * @param deleteOcrCutConfigTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrCutConfigTestDTO deleteOcrCutConfigTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoService.java index 5115c07..ebd6bdb 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoService.java @@ -1,66 +1,58 @@ package com.docus.server.service; -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.DeleteOcrFileInfoDTO; 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 com.docus.server.entity.segmentation.OcrFileInfo; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; /** - * ocr文件信息 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* ocr文件信息 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ public interface IOcrFileInfoService { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrFileInfoVO findById(Long id); - /** - * 查询所有 - * - * @return 实体 - */ + * 查询所有 + * @return 实体 + */ List findAll(); - /** - * 新增 - * - * @param addOcrFileInfoDTO 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param addOcrFileInfoDTO 新增参数 + * @return 成功或失败 + */ boolean add(AddOcrFileInfoDTO addOcrFileInfoDTO); - /** - * 编辑 - * - * @param editOcrFileInfoDTO 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param editOcrFileInfoDTO 编辑参数 + * @return 成功或失败 + */ boolean edit(EditOcrFileInfoDTO editOcrFileInfoDTO); - /** - * 批量删除 - * - * @param deleteOcrFileInfoDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrFileInfoDTO 删除参数 + * @return 成功或失败 + */ int delete(DeleteOcrFileInfoDTO deleteOcrFileInfoDTO); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); /** diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java new file mode 100644 index 0000000..dbff4a0 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO; +import com.docus.server.entity.segmentation.OcrFileInfoTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* ocr文件信息-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrFileInfoTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrFileInfoTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrFileInfoTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrFileInfoTestDTO addOcrFileInfoTestDTO); + /** + * 编辑 + * @param editOcrFileInfoTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrFileInfoTestDTO editOcrFileInfoTestDTO); + /** + * 批量删除 + * @param deleteOcrFileInfoTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrFileInfoTestDTO deleteOcrFileInfoTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleService.java index 9472cca..1a918b7 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleService.java @@ -1,65 +1,57 @@ package com.docus.server.service; -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.DeleteOcrRuleDTO; import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; +import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; +import com.docus.server.entity.segmentation.OcrRule; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; /** - * 匹配策略表 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 匹配策略表 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ public interface IOcrRuleService { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrRuleVO findById(Long id); - /** - * 查询所有 - * - * @return 实体 - */ + * 查询所有 + * @return 实体 + */ List findAll(); - /** - * 新增 - * - * @param addOcrRuleDTO 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param addOcrRuleDTO 新增参数 + * @return 成功或失败 + */ boolean add(AddOcrRuleDTO addOcrRuleDTO); - /** - * 编辑 - * - * @param editOcrRuleDTO 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param editOcrRuleDTO 编辑参数 + * @return 成功或失败 + */ boolean edit(EditOcrRuleDTO editOcrRuleDTO); - /** - * 批量删除 - * - * @param deleteOcrRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrRuleDTO 删除参数 + * @return 成功或失败 + */ int delete(DeleteOcrRuleDTO deleteOcrRuleDTO); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java new file mode 100644 index 0000000..bbdacdf --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrRuleTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrruletest.OcrRuleTestVO; +import com.docus.server.entity.segmentation.OcrRuleTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* 匹配策略表-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrRuleTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrRuleTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrRuleTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrRuleTestDTO addOcrRuleTestDTO); + /** + * 编辑 + * @param editOcrRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrRuleTestDTO editOcrRuleTestDTO); + /** + * 批量删除 + * @param deleteOcrRuleTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrRuleTestDTO deleteOcrRuleTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleService.java index 5cbc05d..19e18f5 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleService.java @@ -1,65 +1,57 @@ package com.docus.server.service; -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.DeleteOcrSpecialRuleDTO; import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; +import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; +import com.docus.server.entity.segmentation.OcrSpecialRule; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; /** - * 特殊策略表 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 特殊策略表 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ public interface IOcrSpecialRuleService { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrSpecialRuleVO findById(Long id); - /** - * 查询所有 - * - * @return 实体 - */ + * 查询所有 + * @return 实体 + */ List findAll(); - /** - * 新增 - * - * @param addOcrSpecialRuleDTO 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param addOcrSpecialRuleDTO 新增参数 + * @return 成功或失败 + */ boolean add(AddOcrSpecialRuleDTO addOcrSpecialRuleDTO); - /** - * 编辑 - * - * @param editOcrSpecialRuleDTO 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param editOcrSpecialRuleDTO 编辑参数 + * @return 成功或失败 + */ boolean edit(EditOcrSpecialRuleDTO editOcrSpecialRuleDTO); - /** - * 批量删除 - * - * @param deleteOcrSpecialRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrSpecialRuleDTO 删除参数 + * @return 成功或失败 + */ int delete(DeleteOcrSpecialRuleDTO deleteOcrSpecialRuleDTO); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java new file mode 100644 index 0000000..6cb0059 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpecialRuleTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; +import com.docus.server.entity.segmentation.OcrSpecialRuleTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* 特殊策略表-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrSpecialRuleTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrSpecialRuleTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrSpecialRuleTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO); + /** + * 编辑 + * @param editOcrSpecialRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO); + /** + * 批量删除 + * @param deleteOcrSpecialRuleTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrSpecialRuleTestDTO deleteOcrSpecialRuleTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigService.java new file mode 100644 index 0000000..bc8803a --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrurlconfig.OcrUrlConfigVO; +import com.docus.server.entity.segmentation.OcrUrlConfig; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* ocr路径配置表 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrUrlConfigService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrUrlConfigVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrUrlConfigDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrUrlConfigDTO addOcrUrlConfigDTO); + /** + * 编辑 + * @param editOcrUrlConfigDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrUrlConfigDTO editOcrUrlConfigDTO); + /** + * 批量删除 + * @param deleteOcrUrlConfigDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrUrlConfigDTO deleteOcrUrlConfigDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigTestService.java new file mode 100644 index 0000000..e825d4d --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrUrlConfigTestService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +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.vo.segmentation.ocrurlconfigtest.OcrUrlConfigTestVO; +import com.docus.server.entity.segmentation.OcrUrlConfigTest; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* ocr路径配置表-调试 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ +public interface IOcrUrlConfigTestService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrUrlConfigTestVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrUrlConfigTestDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO); + /** + * 编辑 + * @param editOcrUrlConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO); + /** + * 批量删除 + * @param deleteOcrUrlConfigTestDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrUrlConfigTestDTO deleteOcrUrlConfigTestDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java index c68edaf..4101222 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrVersionService.java @@ -1,65 +1,57 @@ package com.docus.server.service; -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.DeleteOcrVersionDTO; import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; +import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; +import com.docus.server.entity.segmentation.OcrVersion; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; /** - * 正式数据版本号管理 服务接口 - * - * @author AutoGenerator - * @since 2023-08-25 - */ +* +* 正式数据版本号管理 服务接口 +* +* @author AutoGenerator +* @since 2023-08-29 +*/ public interface IOcrVersionService { /** - * 按主键查询 - * - * @param id 主键id - * @return 实体 - */ + * 按主键查询 + * @param id 主键id + * @return 实体 + */ OcrVersionVO findById(Long id); - /** - * 查询所有 - * - * @return 实体 - */ + * 查询所有 + * @return 实体 + */ List findAll(); - /** - * 新增 - * - * @param addOcrVersionDTO 新增参数 - * @return 成功或失败 - */ + * 新增 + * @param addOcrVersionDTO 新增参数 + * @return 成功或失败 + */ boolean add(AddOcrVersionDTO addOcrVersionDTO); - /** - * 编辑 - * - * @param editOcrVersionDTO 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param editOcrVersionDTO 编辑参数 + * @return 成功或失败 + */ boolean edit(EditOcrVersionDTO editOcrVersionDTO); - /** - * 批量删除 - * - * @param deleteOcrVersionDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrVersionDTO 删除参数 + * @return 成功或失败 + */ int delete(DeleteOcrVersionDTO deleteOcrVersionDTO); - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ PageResult search(SearchDTO searchDTO); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java index f52ad87..f1235e7 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java @@ -29,7 +29,7 @@ public class CommonService { addOcrBasicDTO.setPatientId(request.getPatientId()); addOcrBasicDTO.setInpatientNo(request.getInpatientNo()); addOcrBasicDTO.setName(request.getName()); - addOcrBasicDTO.setIsTest(request.getTestData()); + iOcrBasicService.add(addOcrBasicDTO); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java index 07b14d7..f28dd40 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicServiceImpl.java @@ -1,27 +1,32 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrBasicConvert; import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO; -import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; import com.docus.server.dto.segmentation.ocrbasic.EditOcrBasicDTO; -import com.docus.server.entity.segmentation.OcrBasic; +import com.docus.server.dto.segmentation.ocrbasic.DeleteOcrBasicDTO; +import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; + import com.docus.server.entity.segmentation.OcrBasic; +import com.docus.server.convert.OcrBasicConvert; import com.docus.server.infrastructure.dao.IOcrBasicDao; import com.docus.server.service.IOcrBasicService; -import com.docus.server.vo.segmentation.ocrbasic.OcrBasicVO; +import com.docus.core.util.Func; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.time.LocalDateTime; /** + * * 患者信息表 服务实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Service public class OcrBasicServiceImpl implements IOcrBasicService { @@ -31,35 +36,32 @@ public class OcrBasicServiceImpl implements IOcrBasicService { private IdService idService; /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrBasicVO findById(Long id) { + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrBasicVO findById(Long id) { return OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.findById(id)); - } + } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @Override public List findAll() { - return OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.findAll()); + return OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.findAll()); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.search(searchDTO)); + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.search(searchDTO)); //PageResult result = OcrBasicConvert.INSTANCE.convertVO(iOcrBasicDao.search(searchDTO)); @@ -70,26 +72,25 @@ public class OcrBasicServiceImpl implements IOcrBasicService { //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); - //return result; - } + //return result; + } /** - * 新增 - * - * @param addOcrBasicDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrBasicDTO addOcrBasicDTO) { - OcrBasic ocrBasic = OcrBasicConvert.INSTANCE.convertDO(addOcrBasicDTO); - ocrBasic.setId(idService.getDateSeq()); + * 新增 + * @param addOcrBasicDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrBasicDTO addOcrBasicDTO) { + OcrBasic ocrBasic =OcrBasicConvert.INSTANCE.convertDO(addOcrBasicDTO); + ocrBasic.setId(idService.getDateSeq()); return iOcrBasicDao.add(ocrBasic); // String name = addOcrBasicDTO.getName(); @@ -97,29 +98,28 @@ public class OcrBasicServiceImpl implements IOcrBasicService { //OcrBasic ocrBasic = iOcrBasicDao.findOneBy("name", name); //if (Func.notNull(ocrBasic)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "患者信息表已经存在"); - // } + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "患者信息表已经存在"); + // } - // OcrBasic ocrBasic =OcrBasicConvert.INSTANCE.convertDO(addOcrBasicDTO); - // ocrBasic.setId(idService.getDateSeq()); + // OcrBasic ocrBasic =OcrBasicConvert.INSTANCE.convertDO(addOcrBasicDTO); + // ocrBasic.setId(idService.getDateSeq()); - // return iOcrBasicDao.add(schCollector); + // return iOcrBasicDao.add(schCollector); - } + } /** - * 编辑 - * - * @param editOcrBasicDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrBasicDTO editOcrBasicDTO) { - OcrBasic ocrBasic = OcrBasicConvert.INSTANCE.convertDO(editOcrBasicDTO); - return iOcrBasicDao.edit(ocrBasic); - - // Long id = editOcrBasicDTO.getId(); + * 编辑 + * @param editOcrBasicDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrBasicDTO editOcrBasicDTO) { + OcrBasic ocrBasic =OcrBasicConvert.INSTANCE.convertDO(editOcrBasicDTO); + return iOcrBasicDao.edit(ocrBasic); + + // Long id = editOcrBasicDTO.getId(); // OcrBasic ocrBasic = iOcrBasicDao.findById(id); @@ -129,17 +129,16 @@ public class OcrBasicServiceImpl implements IOcrBasicService { // ocrBasic.setUpdateTime(LocalDateTime.now()); // return iOcrBasicDao.edit(ocrBasic); - } + } /** - * 批量删除 - * - * @param deleteOcrBasicDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrBasicDTO 删除参数 + * @return 成功或失败 + */ @Override public int delete(DeleteOcrBasicDTO deleteOcrBasicDTO) { - return iOcrBasicDao.delete(deleteOcrBasicDTO.getIds()); + return iOcrBasicDao.delete(deleteOcrBasicDTO.getIds()); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java new file mode 100644 index 0000000..44950c6 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrBasicTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrbasictest.OcrBasicTestVO; + import com.docus.server.entity.segmentation.OcrBasicTest; +import com.docus.server.convert.OcrBasicTestConvert; +import com.docus.server.infrastructure.dao.IOcrBasicTestDao; +import com.docus.server.service.IOcrBasicTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * 患者信息表-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrBasicTestServiceImpl implements IOcrBasicTestService { + @Resource + private IOcrBasicTestDao iOcrBasicTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrBasicTestVO findById(Long id) { + return OcrBasicTestConvert.INSTANCE.convertVO(iOcrBasicTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrBasicTestConvert.INSTANCE.convertVO(iOcrBasicTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrBasicTestConvert.INSTANCE.convertVO(iOcrBasicTestDao.search(searchDTO)); + + //PageResult result = OcrBasicTestConvert.INSTANCE.convertVO(iOcrBasicTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrBasicTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrBasicTestDTO addOcrBasicTestDTO) { + OcrBasicTest ocrBasicTest =OcrBasicTestConvert.INSTANCE.convertDO(addOcrBasicTestDTO); + ocrBasicTest.setId(idService.getDateSeq()); + return iOcrBasicTestDao.add(ocrBasicTest); + + // String name = addOcrBasicTestDTO.getName(); + + //OcrBasicTest ocrBasicTest = iOcrBasicTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrBasicTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "患者信息表-调试已经存在"); + // } + + // OcrBasicTest ocrBasicTest =OcrBasicTestConvert.INSTANCE.convertDO(addOcrBasicTestDTO); + // ocrBasicTest.setId(idService.getDateSeq()); + + // return iOcrBasicTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrBasicTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrBasicTestDTO editOcrBasicTestDTO) { + OcrBasicTest ocrBasicTest =OcrBasicTestConvert.INSTANCE.convertDO(editOcrBasicTestDTO); + return iOcrBasicTestDao.edit(ocrBasicTest); + + // Long id = editOcrBasicTestDTO.getId(); + + // OcrBasicTest ocrBasicTest = iOcrBasicTestDao.findById(id); + + // if (Func.isNull(ocrBasicTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "患者信息表-调试，无法更新！"); + // } + + // ocrBasicTest.setUpdateTime(LocalDateTime.now()); + // return iOcrBasicTestDao.edit(ocrBasicTest); + } + + /** + * 批量删除 + * @param deleteOcrBasicTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrBasicTestDTO deleteOcrBasicTestDTO) { + return iOcrBasicTestDao.delete(deleteOcrBasicTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrConfigServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrConfigServiceImpl.java deleted file mode 100644 index dcc7207..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrConfigServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.docus.server.service.impl; - -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrConfigConvert; -import com.docus.server.dto.segmentation.ocrconfig.AddOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.DeleteOcrConfigDTO; -import com.docus.server.dto.segmentation.ocrconfig.EditOcrConfigDTO; -import com.docus.server.entity.segmentation.OcrConfig; -import com.docus.server.infrastructure.dao.IOcrConfigDao; -import com.docus.server.service.IOcrConfigService; -import com.docus.server.vo.segmentation.ocrconfig.OcrConfigVO; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 基础配置表 服务实现类 - * - * @author AutoGenerator - * @since 2023-08-25 - */ -@Service -public class OcrConfigServiceImpl implements IOcrConfigService { - @Resource - private IOcrConfigDao iOcrConfigDao; - @Resource - private IdService idService; - - /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrConfigVO findById(Long id) { - return OcrConfigConvert.INSTANCE.convertVO(iOcrConfigDao.findById(id)); - } - - /** - * 查询所有 - * - * @return 实体 - */ - @Override - public List findAll() { - return OcrConfigConvert.INSTANCE.convertVO(iOcrConfigDao.findAll()); - } - - /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrConfigConvert.INSTANCE.convertVO(iOcrConfigDao.search(searchDTO)); - - //PageResult result = OcrConfigConvert.INSTANCE.convertVO(iOcrConfigDao.search(searchDTO)); - - //if (CollectionUtils.isEmpty(result.getList())) { - //return new PageResult<>(); - //} - - //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); - - //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); - - //return result; - } - - /** - * 新增 - * - * @param addOcrConfigDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrConfigDTO addOcrConfigDTO) { - OcrConfig ocrConfig = OcrConfigConvert.INSTANCE.convertDO(addOcrConfigDTO); - ocrConfig.setId(idService.getDateSeq()); - return iOcrConfigDao.add(ocrConfig); - - // String name = addOcrConfigDTO.getName(); - - //OcrConfig ocrConfig = iOcrConfigDao.findOneBy("name", name); - - //if (Func.notNull(ocrConfig)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "基础配置表已经存在"); - // } - - // OcrConfig ocrConfig =OcrConfigConvert.INSTANCE.convertDO(addOcrConfigDTO); - // ocrConfig.setId(idService.getDateSeq()); - - // return iOcrConfigDao.add(schCollector); - - } - - /** - * 编辑 - * - * @param editOcrConfigDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrConfigDTO editOcrConfigDTO) { - OcrConfig ocrConfig = OcrConfigConvert.INSTANCE.convertDO(editOcrConfigDTO); - return iOcrConfigDao.edit(ocrConfig); - - // Long id = editOcrConfigDTO.getId(); - - // OcrConfig ocrConfig = iOcrConfigDao.findById(id); - - // if (Func.isNull(ocrConfig)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "基础配置表，无法更新！"); - // } - - // ocrConfig.setUpdateTime(LocalDateTime.now()); - // return iOcrConfigDao.edit(ocrConfig); - } - - /** - * 批量删除 - * - * @param deleteOcrConfigDTO 删除参数 - * @return 成功或失败 - */ - @Override - public int delete(DeleteOcrConfigDTO deleteOcrConfigDTO) { - return iOcrConfigDao.delete(deleteOcrConfigDTO.getIds()); - } -} - diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigServiceImpl.java new file mode 100644 index 0000000..7e99070 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrcutconfig.OcrCutConfigVO; + import com.docus.server.entity.segmentation.OcrCutConfig; +import com.docus.server.convert.OcrCutConfigConvert; +import com.docus.server.infrastructure.dao.IOcrCutConfigDao; +import com.docus.server.service.IOcrCutConfigService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * ocr图片剪切配置 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrCutConfigServiceImpl implements IOcrCutConfigService { + @Resource + private IOcrCutConfigDao iOcrCutConfigDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrCutConfigVO findById(Long id) { + return OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.search(searchDTO)); + + //PageResult result = OcrCutConfigConvert.INSTANCE.convertVO(iOcrCutConfigDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrCutConfigDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrCutConfigDTO addOcrCutConfigDTO) { + OcrCutConfig ocrCutConfig =OcrCutConfigConvert.INSTANCE.convertDO(addOcrCutConfigDTO); + ocrCutConfig.setId(idService.getDateSeq()); + return iOcrCutConfigDao.add(ocrCutConfig); + + // String name = addOcrCutConfigDTO.getName(); + + //OcrCutConfig ocrCutConfig = iOcrCutConfigDao.findOneBy("name", name); + + //if (Func.notNull(ocrCutConfig)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr图片剪切配置已经存在"); + // } + + // OcrCutConfig ocrCutConfig =OcrCutConfigConvert.INSTANCE.convertDO(addOcrCutConfigDTO); + // ocrCutConfig.setId(idService.getDateSeq()); + + // return iOcrCutConfigDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrCutConfigDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrCutConfigDTO editOcrCutConfigDTO) { + OcrCutConfig ocrCutConfig =OcrCutConfigConvert.INSTANCE.convertDO(editOcrCutConfigDTO); + return iOcrCutConfigDao.edit(ocrCutConfig); + + // Long id = editOcrCutConfigDTO.getId(); + + // OcrCutConfig ocrCutConfig = iOcrCutConfigDao.findById(id); + + // if (Func.isNull(ocrCutConfig)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr图片剪切配置，无法更新！"); + // } + + // ocrCutConfig.setUpdateTime(LocalDateTime.now()); + // return iOcrCutConfigDao.edit(ocrCutConfig); + } + + /** + * 批量删除 + * @param deleteOcrCutConfigDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrCutConfigDTO deleteOcrCutConfigDTO) { + return iOcrCutConfigDao.delete(deleteOcrCutConfigDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigTestServiceImpl.java new file mode 100644 index 0000000..50d46d4 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrCutConfigTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrcutconfigtest.OcrCutConfigTestVO; + import com.docus.server.entity.segmentation.OcrCutConfigTest; +import com.docus.server.convert.OcrCutConfigTestConvert; +import com.docus.server.infrastructure.dao.IOcrCutConfigTestDao; +import com.docus.server.service.IOcrCutConfigTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * ocr图片剪切配置-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrCutConfigTestServiceImpl implements IOcrCutConfigTestService { + @Resource + private IOcrCutConfigTestDao iOcrCutConfigTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrCutConfigTestVO findById(Long id) { + return OcrCutConfigTestConvert.INSTANCE.convertVO(iOcrCutConfigTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrCutConfigTestConvert.INSTANCE.convertVO(iOcrCutConfigTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrCutConfigTestConvert.INSTANCE.convertVO(iOcrCutConfigTestDao.search(searchDTO)); + + //PageResult result = OcrCutConfigTestConvert.INSTANCE.convertVO(iOcrCutConfigTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrCutConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrCutConfigTestDTO addOcrCutConfigTestDTO) { + OcrCutConfigTest ocrCutConfigTest =OcrCutConfigTestConvert.INSTANCE.convertDO(addOcrCutConfigTestDTO); + ocrCutConfigTest.setId(idService.getDateSeq()); + return iOcrCutConfigTestDao.add(ocrCutConfigTest); + + // String name = addOcrCutConfigTestDTO.getName(); + + //OcrCutConfigTest ocrCutConfigTest = iOcrCutConfigTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrCutConfigTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr图片剪切配置-调试已经存在"); + // } + + // OcrCutConfigTest ocrCutConfigTest =OcrCutConfigTestConvert.INSTANCE.convertDO(addOcrCutConfigTestDTO); + // ocrCutConfigTest.setId(idService.getDateSeq()); + + // return iOcrCutConfigTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrCutConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrCutConfigTestDTO editOcrCutConfigTestDTO) { + OcrCutConfigTest ocrCutConfigTest =OcrCutConfigTestConvert.INSTANCE.convertDO(editOcrCutConfigTestDTO); + return iOcrCutConfigTestDao.edit(ocrCutConfigTest); + + // Long id = editOcrCutConfigTestDTO.getId(); + + // OcrCutConfigTest ocrCutConfigTest = iOcrCutConfigTestDao.findById(id); + + // if (Func.isNull(ocrCutConfigTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr图片剪切配置-调试，无法更新！"); + // } + + // ocrCutConfigTest.setUpdateTime(LocalDateTime.now()); + // return iOcrCutConfigTestDao.edit(ocrCutConfigTest); + } + + /** + * 批量删除 + * @param deleteOcrCutConfigTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrCutConfigTestDTO deleteOcrCutConfigTestDTO) { + return iOcrCutConfigTestDao.delete(deleteOcrCutConfigTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java index d587640..cffa6d7 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java @@ -1,27 +1,32 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrFileInfoConvert; import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO; -import com.docus.server.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO; import com.docus.server.dto.segmentation.ocrfileinfo.EditOcrFileInfoDTO; -import com.docus.server.entity.segmentation.OcrFileInfo; +import com.docus.server.dto.segmentation.ocrfileinfo.DeleteOcrFileInfoDTO; +import com.docus.server.vo.segmentation.ocrfileinfo.OcrFileInfoVO; + import com.docus.server.entity.segmentation.OcrFileInfo; +import com.docus.server.convert.OcrFileInfoConvert; import com.docus.server.infrastructure.dao.IOcrFileInfoDao; import com.docus.server.service.IOcrFileInfoService; -import com.docus.server.vo.segmentation.ocrfileinfo.OcrFileInfoVO; +import com.docus.core.util.Func; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.time.LocalDateTime; /** + * * ocr文件信息 服务实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Service public class OcrFileInfoServiceImpl implements IOcrFileInfoService { @@ -31,35 +36,32 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService { private IdService idService; /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrFileInfoVO findById(Long id) { + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrFileInfoVO findById(Long id) { return OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.findById(id)); - } + } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @Override public List findAll() { - return OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.findAll()); + return OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.findAll()); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.search(searchDTO)); + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.search(searchDTO)); //PageResult result = OcrFileInfoConvert.INSTANCE.convertVO(iOcrFileInfoDao.search(searchDTO)); @@ -70,14 +72,14 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService { //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); - //return result; - } + //return result; + } @Transactional(rollbackFor = Exception.class) @Override @@ -91,16 +93,15 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService { } /** - * 新增 - * - * @param addOcrFileInfoDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrFileInfoDTO addOcrFileInfoDTO) { - OcrFileInfo ocrFileInfo = OcrFileInfoConvert.INSTANCE.convertDO(addOcrFileInfoDTO); - ocrFileInfo.setId(idService.getDateSeq()); + * 新增 + * @param addOcrFileInfoDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrFileInfoDTO addOcrFileInfoDTO) { + OcrFileInfo ocrFileInfo =OcrFileInfoConvert.INSTANCE.convertDO(addOcrFileInfoDTO); + ocrFileInfo.setId(idService.getDateSeq()); return iOcrFileInfoDao.add(ocrFileInfo); // String name = addOcrFileInfoDTO.getName(); @@ -108,29 +109,28 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService { //OcrFileInfo ocrFileInfo = iOcrFileInfoDao.findOneBy("name", name); //if (Func.notNull(ocrFileInfo)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr文件信息已经存在"); - // } + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr文件信息已经存在"); + // } - // OcrFileInfo ocrFileInfo =OcrFileInfoConvert.INSTANCE.convertDO(addOcrFileInfoDTO); - // ocrFileInfo.setId(idService.getDateSeq()); + // OcrFileInfo ocrFileInfo =OcrFileInfoConvert.INSTANCE.convertDO(addOcrFileInfoDTO); + // ocrFileInfo.setId(idService.getDateSeq()); - // return iOcrFileInfoDao.add(schCollector); + // return iOcrFileInfoDao.add(schCollector); - } + } /** - * 编辑 - * - * @param editOcrFileInfoDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrFileInfoDTO editOcrFileInfoDTO) { - OcrFileInfo ocrFileInfo = OcrFileInfoConvert.INSTANCE.convertDO(editOcrFileInfoDTO); - return iOcrFileInfoDao.edit(ocrFileInfo); - - // Long id = editOcrFileInfoDTO.getId(); + * 编辑 + * @param editOcrFileInfoDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrFileInfoDTO editOcrFileInfoDTO) { + OcrFileInfo ocrFileInfo =OcrFileInfoConvert.INSTANCE.convertDO(editOcrFileInfoDTO); + return iOcrFileInfoDao.edit(ocrFileInfo); + + // Long id = editOcrFileInfoDTO.getId(); // OcrFileInfo ocrFileInfo = iOcrFileInfoDao.findById(id); @@ -140,17 +140,16 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService { // ocrFileInfo.setUpdateTime(LocalDateTime.now()); // return iOcrFileInfoDao.edit(ocrFileInfo); - } + } /** - * 批量删除 - * - * @param deleteOcrFileInfoDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrFileInfoDTO 删除参数 + * @return 成功或失败 + */ @Override public int delete(DeleteOcrFileInfoDTO deleteOcrFileInfoDTO) { - return iOcrFileInfoDao.delete(deleteOcrFileInfoDTO.getIds()); + return iOcrFileInfoDao.delete(deleteOcrFileInfoDTO.getIds()); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java new file mode 100644 index 0000000..19259b7 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO; + import com.docus.server.entity.segmentation.OcrFileInfoTest; +import com.docus.server.convert.OcrFileInfoTestConvert; +import com.docus.server.infrastructure.dao.IOcrFileInfoTestDao; +import com.docus.server.service.IOcrFileInfoTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * ocr文件信息-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrFileInfoTestServiceImpl implements IOcrFileInfoTestService { + @Resource + private IOcrFileInfoTestDao iOcrFileInfoTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrFileInfoTestVO findById(Long id) { + return OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.search(searchDTO)); + + //PageResult result = OcrFileInfoTestConvert.INSTANCE.convertVO(iOcrFileInfoTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrFileInfoTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrFileInfoTestDTO addOcrFileInfoTestDTO) { + OcrFileInfoTest ocrFileInfoTest =OcrFileInfoTestConvert.INSTANCE.convertDO(addOcrFileInfoTestDTO); + ocrFileInfoTest.setId(idService.getDateSeq()); + return iOcrFileInfoTestDao.add(ocrFileInfoTest); + + // String name = addOcrFileInfoTestDTO.getName(); + + //OcrFileInfoTest ocrFileInfoTest = iOcrFileInfoTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrFileInfoTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr文件信息-调试已经存在"); + // } + + // OcrFileInfoTest ocrFileInfoTest =OcrFileInfoTestConvert.INSTANCE.convertDO(addOcrFileInfoTestDTO); + // ocrFileInfoTest.setId(idService.getDateSeq()); + + // return iOcrFileInfoTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrFileInfoTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrFileInfoTestDTO editOcrFileInfoTestDTO) { + OcrFileInfoTest ocrFileInfoTest =OcrFileInfoTestConvert.INSTANCE.convertDO(editOcrFileInfoTestDTO); + return iOcrFileInfoTestDao.edit(ocrFileInfoTest); + + // Long id = editOcrFileInfoTestDTO.getId(); + + // OcrFileInfoTest ocrFileInfoTest = iOcrFileInfoTestDao.findById(id); + + // if (Func.isNull(ocrFileInfoTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr文件信息-调试，无法更新！"); + // } + + // ocrFileInfoTest.setUpdateTime(LocalDateTime.now()); + // return iOcrFileInfoTestDao.edit(ocrFileInfoTest); + } + + /** + * 批量删除 + * @param deleteOcrFileInfoTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrFileInfoTestDTO deleteOcrFileInfoTestDTO) { + return iOcrFileInfoTestDao.delete(deleteOcrFileInfoTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java index aaa834a..f385909 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java @@ -1,27 +1,32 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrRuleConvert; import com.docus.server.dto.segmentation.ocrrule.AddOcrRuleDTO; -import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; import com.docus.server.dto.segmentation.ocrrule.EditOcrRuleDTO; -import com.docus.server.entity.segmentation.OcrRule; +import com.docus.server.dto.segmentation.ocrrule.DeleteOcrRuleDTO; +import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; + import com.docus.server.entity.segmentation.OcrRule; +import com.docus.server.convert.OcrRuleConvert; import com.docus.server.infrastructure.dao.IOcrRuleDao; import com.docus.server.service.IOcrRuleService; -import com.docus.server.vo.segmentation.ocrrule.OcrRuleVO; +import com.docus.core.util.Func; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.time.LocalDateTime; /** + * * 匹配策略表 服务实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Service public class OcrRuleServiceImpl implements IOcrRuleService { @@ -31,35 +36,32 @@ public class OcrRuleServiceImpl implements IOcrRuleService { private IdService idService; /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrRuleVO findById(Long id) { + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrRuleVO findById(Long id) { return OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.findById(id)); - } + } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @Override public List findAll() { - return OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.findAll()); + return OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.findAll()); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.search(searchDTO)); + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.search(searchDTO)); //PageResult result = OcrRuleConvert.INSTANCE.convertVO(iOcrRuleDao.search(searchDTO)); @@ -70,26 +72,25 @@ public class OcrRuleServiceImpl implements IOcrRuleService { //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); - //return result; - } + //return result; + } /** - * 新增 - * - * @param addOcrRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrRuleDTO addOcrRuleDTO) { - OcrRule ocrRule = OcrRuleConvert.INSTANCE.convertDO(addOcrRuleDTO); - ocrRule.setId(idService.getDateSeq()); + * 新增 + * @param addOcrRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrRuleDTO addOcrRuleDTO) { + OcrRule ocrRule =OcrRuleConvert.INSTANCE.convertDO(addOcrRuleDTO); + ocrRule.setId(idService.getDateSeq()); return iOcrRuleDao.add(ocrRule); // String name = addOcrRuleDTO.getName(); @@ -97,29 +98,28 @@ public class OcrRuleServiceImpl implements IOcrRuleService { //OcrRule ocrRule = iOcrRuleDao.findOneBy("name", name); //if (Func.notNull(ocrRule)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "匹配策略表已经存在"); - // } + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "匹配策略表已经存在"); + // } - // OcrRule ocrRule =OcrRuleConvert.INSTANCE.convertDO(addOcrRuleDTO); - // ocrRule.setId(idService.getDateSeq()); + // OcrRule ocrRule =OcrRuleConvert.INSTANCE.convertDO(addOcrRuleDTO); + // ocrRule.setId(idService.getDateSeq()); - // return iOcrRuleDao.add(schCollector); + // return iOcrRuleDao.add(schCollector); - } + } /** - * 编辑 - * - * @param editOcrRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrRuleDTO editOcrRuleDTO) { - OcrRule ocrRule = OcrRuleConvert.INSTANCE.convertDO(editOcrRuleDTO); - return iOcrRuleDao.edit(ocrRule); - - // Long id = editOcrRuleDTO.getId(); + * 编辑 + * @param editOcrRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrRuleDTO editOcrRuleDTO) { + OcrRule ocrRule =OcrRuleConvert.INSTANCE.convertDO(editOcrRuleDTO); + return iOcrRuleDao.edit(ocrRule); + + // Long id = editOcrRuleDTO.getId(); // OcrRule ocrRule = iOcrRuleDao.findById(id); @@ -129,17 +129,16 @@ public class OcrRuleServiceImpl implements IOcrRuleService { // ocrRule.setUpdateTime(LocalDateTime.now()); // return iOcrRuleDao.edit(ocrRule); - } + } /** - * 批量删除 - * - * @param deleteOcrRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrRuleDTO 删除参数 + * @return 成功或失败 + */ @Override public int delete(DeleteOcrRuleDTO deleteOcrRuleDTO) { - return iOcrRuleDao.delete(deleteOcrRuleDTO.getIds()); + return iOcrRuleDao.delete(deleteOcrRuleDTO.getIds()); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java new file mode 100644 index 0000000..68bb185 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrruletest.OcrRuleTestVO; + import com.docus.server.entity.segmentation.OcrRuleTest; +import com.docus.server.convert.OcrRuleTestConvert; +import com.docus.server.infrastructure.dao.IOcrRuleTestDao; +import com.docus.server.service.IOcrRuleTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * 匹配策略表-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrRuleTestServiceImpl implements IOcrRuleTestService { + @Resource + private IOcrRuleTestDao iOcrRuleTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrRuleTestVO findById(Long id) { + return OcrRuleTestConvert.INSTANCE.convertVO(iOcrRuleTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrRuleTestConvert.INSTANCE.convertVO(iOcrRuleTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrRuleTestConvert.INSTANCE.convertVO(iOcrRuleTestDao.search(searchDTO)); + + //PageResult result = OcrRuleTestConvert.INSTANCE.convertVO(iOcrRuleTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrRuleTestDTO addOcrRuleTestDTO) { + OcrRuleTest ocrRuleTest =OcrRuleTestConvert.INSTANCE.convertDO(addOcrRuleTestDTO); + ocrRuleTest.setId(idService.getDateSeq()); + return iOcrRuleTestDao.add(ocrRuleTest); + + // String name = addOcrRuleTestDTO.getName(); + + //OcrRuleTest ocrRuleTest = iOcrRuleTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrRuleTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "匹配策略表-调试已经存在"); + // } + + // OcrRuleTest ocrRuleTest =OcrRuleTestConvert.INSTANCE.convertDO(addOcrRuleTestDTO); + // ocrRuleTest.setId(idService.getDateSeq()); + + // return iOcrRuleTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrRuleTestDTO editOcrRuleTestDTO) { + OcrRuleTest ocrRuleTest =OcrRuleTestConvert.INSTANCE.convertDO(editOcrRuleTestDTO); + return iOcrRuleTestDao.edit(ocrRuleTest); + + // Long id = editOcrRuleTestDTO.getId(); + + // OcrRuleTest ocrRuleTest = iOcrRuleTestDao.findById(id); + + // if (Func.isNull(ocrRuleTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "匹配策略表-调试，无法更新！"); + // } + + // ocrRuleTest.setUpdateTime(LocalDateTime.now()); + // return iOcrRuleTestDao.edit(ocrRuleTest); + } + + /** + * 批量删除 + * @param deleteOcrRuleTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrRuleTestDTO deleteOcrRuleTestDTO) { + return iOcrRuleTestDao.delete(deleteOcrRuleTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java index a3830a2..9d2c3e8 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleServiceImpl.java @@ -1,27 +1,32 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrSpecialRuleConvert; import com.docus.server.dto.segmentation.ocrspecialrule.AddOcrSpecialRuleDTO; -import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; import com.docus.server.dto.segmentation.ocrspecialrule.EditOcrSpecialRuleDTO; -import com.docus.server.entity.segmentation.OcrSpecialRule; +import com.docus.server.dto.segmentation.ocrspecialrule.DeleteOcrSpecialRuleDTO; +import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; + import com.docus.server.entity.segmentation.OcrSpecialRule; +import com.docus.server.convert.OcrSpecialRuleConvert; import com.docus.server.infrastructure.dao.IOcrSpecialRuleDao; import com.docus.server.service.IOcrSpecialRuleService; -import com.docus.server.vo.segmentation.ocrspecialrule.OcrSpecialRuleVO; +import com.docus.core.util.Func; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.time.LocalDateTime; /** + * * 特殊策略表 服务实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Service public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { @@ -31,35 +36,32 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { private IdService idService; /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrSpecialRuleVO findById(Long id) { + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrSpecialRuleVO findById(Long id) { return OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.findById(id)); - } + } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @Override public List findAll() { - return OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.findAll()); + return OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.findAll()); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.search(searchDTO)); + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.search(searchDTO)); //PageResult result = OcrSpecialRuleConvert.INSTANCE.convertVO(iOcrSpecialRuleDao.search(searchDTO)); @@ -70,26 +72,25 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); - //return result; - } + //return result; + } /** - * 新增 - * - * @param addOcrSpecialRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrSpecialRuleDTO addOcrSpecialRuleDTO) { - OcrSpecialRule ocrSpecialRule = OcrSpecialRuleConvert.INSTANCE.convertDO(addOcrSpecialRuleDTO); - ocrSpecialRule.setId(idService.getDateSeq()); + * 新增 + * @param addOcrSpecialRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrSpecialRuleDTO addOcrSpecialRuleDTO) { + OcrSpecialRule ocrSpecialRule =OcrSpecialRuleConvert.INSTANCE.convertDO(addOcrSpecialRuleDTO); + ocrSpecialRule.setId(idService.getDateSeq()); return iOcrSpecialRuleDao.add(ocrSpecialRule); // String name = addOcrSpecialRuleDTO.getName(); @@ -97,29 +98,28 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { //OcrSpecialRule ocrSpecialRule = iOcrSpecialRuleDao.findOneBy("name", name); //if (Func.notNull(ocrSpecialRule)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表已经存在"); - // } + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表已经存在"); + // } - // OcrSpecialRule ocrSpecialRule =OcrSpecialRuleConvert.INSTANCE.convertDO(addOcrSpecialRuleDTO); - // ocrSpecialRule.setId(idService.getDateSeq()); + // OcrSpecialRule ocrSpecialRule =OcrSpecialRuleConvert.INSTANCE.convertDO(addOcrSpecialRuleDTO); + // ocrSpecialRule.setId(idService.getDateSeq()); - // return iOcrSpecialRuleDao.add(schCollector); + // return iOcrSpecialRuleDao.add(schCollector); - } + } /** - * 编辑 - * - * @param editOcrSpecialRuleDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrSpecialRuleDTO editOcrSpecialRuleDTO) { - OcrSpecialRule ocrSpecialRule = OcrSpecialRuleConvert.INSTANCE.convertDO(editOcrSpecialRuleDTO); - return iOcrSpecialRuleDao.edit(ocrSpecialRule); - - // Long id = editOcrSpecialRuleDTO.getId(); + * 编辑 + * @param editOcrSpecialRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrSpecialRuleDTO editOcrSpecialRuleDTO) { + OcrSpecialRule ocrSpecialRule =OcrSpecialRuleConvert.INSTANCE.convertDO(editOcrSpecialRuleDTO); + return iOcrSpecialRuleDao.edit(ocrSpecialRule); + + // Long id = editOcrSpecialRuleDTO.getId(); // OcrSpecialRule ocrSpecialRule = iOcrSpecialRuleDao.findById(id); @@ -129,17 +129,16 @@ public class OcrSpecialRuleServiceImpl implements IOcrSpecialRuleService { // ocrSpecialRule.setUpdateTime(LocalDateTime.now()); // return iOcrSpecialRuleDao.edit(ocrSpecialRule); - } + } /** - * 批量删除 - * - * @param deleteOcrSpecialRuleDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrSpecialRuleDTO 删除参数 + * @return 成功或失败 + */ @Override public int delete(DeleteOcrSpecialRuleDTO deleteOcrSpecialRuleDTO) { - return iOcrSpecialRuleDao.delete(deleteOcrSpecialRuleDTO.getIds()); + return iOcrSpecialRuleDao.delete(deleteOcrSpecialRuleDTO.getIds()); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java new file mode 100644 index 0000000..7430a3e --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpecialRuleTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrspecialruletest.OcrSpecialRuleTestVO; + import com.docus.server.entity.segmentation.OcrSpecialRuleTest; +import com.docus.server.convert.OcrSpecialRuleTestConvert; +import com.docus.server.infrastructure.dao.IOcrSpecialRuleTestDao; +import com.docus.server.service.IOcrSpecialRuleTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * 特殊策略表-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrSpecialRuleTestServiceImpl implements IOcrSpecialRuleTestService { + @Resource + private IOcrSpecialRuleTestDao iOcrSpecialRuleTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrSpecialRuleTestVO findById(Long id) { + return OcrSpecialRuleTestConvert.INSTANCE.convertVO(iOcrSpecialRuleTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrSpecialRuleTestConvert.INSTANCE.convertVO(iOcrSpecialRuleTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrSpecialRuleTestConvert.INSTANCE.convertVO(iOcrSpecialRuleTestDao.search(searchDTO)); + + //PageResult result = OcrSpecialRuleTestConvert.INSTANCE.convertVO(iOcrSpecialRuleTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrSpecialRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrSpecialRuleTestDTO addOcrSpecialRuleTestDTO) { + OcrSpecialRuleTest ocrSpecialRuleTest =OcrSpecialRuleTestConvert.INSTANCE.convertDO(addOcrSpecialRuleTestDTO); + ocrSpecialRuleTest.setId(idService.getDateSeq()); + return iOcrSpecialRuleTestDao.add(ocrSpecialRuleTest); + + // String name = addOcrSpecialRuleTestDTO.getName(); + + //OcrSpecialRuleTest ocrSpecialRuleTest = iOcrSpecialRuleTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrSpecialRuleTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表-调试已经存在"); + // } + + // OcrSpecialRuleTest ocrSpecialRuleTest =OcrSpecialRuleTestConvert.INSTANCE.convertDO(addOcrSpecialRuleTestDTO); + // ocrSpecialRuleTest.setId(idService.getDateSeq()); + + // return iOcrSpecialRuleTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrSpecialRuleTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrSpecialRuleTestDTO editOcrSpecialRuleTestDTO) { + OcrSpecialRuleTest ocrSpecialRuleTest =OcrSpecialRuleTestConvert.INSTANCE.convertDO(editOcrSpecialRuleTestDTO); + return iOcrSpecialRuleTestDao.edit(ocrSpecialRuleTest); + + // Long id = editOcrSpecialRuleTestDTO.getId(); + + // OcrSpecialRuleTest ocrSpecialRuleTest = iOcrSpecialRuleTestDao.findById(id); + + // if (Func.isNull(ocrSpecialRuleTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表-调试，无法更新！"); + // } + + // ocrSpecialRuleTest.setUpdateTime(LocalDateTime.now()); + // return iOcrSpecialRuleTestDao.edit(ocrSpecialRuleTest); + } + + /** + * 批量删除 + * @param deleteOcrSpecialRuleTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrSpecialRuleTestDTO deleteOcrSpecialRuleTestDTO) { + return iOcrSpecialRuleTestDao.delete(deleteOcrSpecialRuleTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigServiceImpl.java new file mode 100644 index 0000000..a85edf0 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrurlconfig.OcrUrlConfigVO; + import com.docus.server.entity.segmentation.OcrUrlConfig; +import com.docus.server.convert.OcrUrlConfigConvert; +import com.docus.server.infrastructure.dao.IOcrUrlConfigDao; +import com.docus.server.service.IOcrUrlConfigService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * ocr路径配置表 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrUrlConfigServiceImpl implements IOcrUrlConfigService { + @Resource + private IOcrUrlConfigDao iOcrUrlConfigDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrUrlConfigVO findById(Long id) { + return OcrUrlConfigConvert.INSTANCE.convertVO(iOcrUrlConfigDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrUrlConfigConvert.INSTANCE.convertVO(iOcrUrlConfigDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrUrlConfigConvert.INSTANCE.convertVO(iOcrUrlConfigDao.search(searchDTO)); + + //PageResult result = OcrUrlConfigConvert.INSTANCE.convertVO(iOcrUrlConfigDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrUrlConfigDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrUrlConfigDTO addOcrUrlConfigDTO) { + OcrUrlConfig ocrUrlConfig =OcrUrlConfigConvert.INSTANCE.convertDO(addOcrUrlConfigDTO); + ocrUrlConfig.setId(idService.getDateSeq()); + return iOcrUrlConfigDao.add(ocrUrlConfig); + + // String name = addOcrUrlConfigDTO.getName(); + + //OcrUrlConfig ocrUrlConfig = iOcrUrlConfigDao.findOneBy("name", name); + + //if (Func.notNull(ocrUrlConfig)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr路径配置表已经存在"); + // } + + // OcrUrlConfig ocrUrlConfig =OcrUrlConfigConvert.INSTANCE.convertDO(addOcrUrlConfigDTO); + // ocrUrlConfig.setId(idService.getDateSeq()); + + // return iOcrUrlConfigDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrUrlConfigDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrUrlConfigDTO editOcrUrlConfigDTO) { + OcrUrlConfig ocrUrlConfig =OcrUrlConfigConvert.INSTANCE.convertDO(editOcrUrlConfigDTO); + return iOcrUrlConfigDao.edit(ocrUrlConfig); + + // Long id = editOcrUrlConfigDTO.getId(); + + // OcrUrlConfig ocrUrlConfig = iOcrUrlConfigDao.findById(id); + + // if (Func.isNull(ocrUrlConfig)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr路径配置表，无法更新！"); + // } + + // ocrUrlConfig.setUpdateTime(LocalDateTime.now()); + // return iOcrUrlConfigDao.edit(ocrUrlConfig); + } + + /** + * 批量删除 + * @param deleteOcrUrlConfigDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrUrlConfigDTO deleteOcrUrlConfigDTO) { + return iOcrUrlConfigDao.delete(deleteOcrUrlConfigDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigTestServiceImpl.java new file mode 100644 index 0000000..52268ac --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrUrlConfigTestServiceImpl.java @@ -0,0 +1,144 @@ +package com.docus.server.service.impl; + +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.vo.segmentation.ocrurlconfigtest.OcrUrlConfigTestVO; + import com.docus.server.entity.segmentation.OcrUrlConfigTest; +import com.docus.server.convert.OcrUrlConfigTestConvert; +import com.docus.server.infrastructure.dao.IOcrUrlConfigTestDao; +import com.docus.server.service.IOcrUrlConfigTestService; +import com.docus.core.util.Func; +import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; +import java.util.List; +import java.time.LocalDateTime; + +/** + * + * ocr路径配置表-调试 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-29 + */ +@Service +public class OcrUrlConfigTestServiceImpl implements IOcrUrlConfigTestService { + @Resource + private IOcrUrlConfigTestDao iOcrUrlConfigTestDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrUrlConfigTestVO findById(Long id) { + return OcrUrlConfigTestConvert.INSTANCE.convertVO(iOcrUrlConfigTestDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrUrlConfigTestConvert.INSTANCE.convertVO(iOcrUrlConfigTestDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrUrlConfigTestConvert.INSTANCE.convertVO(iOcrUrlConfigTestDao.search(searchDTO)); + + //PageResult result = OcrUrlConfigTestConvert.INSTANCE.convertVO(iOcrUrlConfigTestDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrUrlConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrUrlConfigTestDTO addOcrUrlConfigTestDTO) { + OcrUrlConfigTest ocrUrlConfigTest =OcrUrlConfigTestConvert.INSTANCE.convertDO(addOcrUrlConfigTestDTO); + ocrUrlConfigTest.setId(idService.getDateSeq()); + return iOcrUrlConfigTestDao.add(ocrUrlConfigTest); + + // String name = addOcrUrlConfigTestDTO.getName(); + + //OcrUrlConfigTest ocrUrlConfigTest = iOcrUrlConfigTestDao.findOneBy("name", name); + + //if (Func.notNull(ocrUrlConfigTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr路径配置表-调试已经存在"); + // } + + // OcrUrlConfigTest ocrUrlConfigTest =OcrUrlConfigTestConvert.INSTANCE.convertDO(addOcrUrlConfigTestDTO); + // ocrUrlConfigTest.setId(idService.getDateSeq()); + + // return iOcrUrlConfigTestDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrUrlConfigTestDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrUrlConfigTestDTO editOcrUrlConfigTestDTO) { + OcrUrlConfigTest ocrUrlConfigTest =OcrUrlConfigTestConvert.INSTANCE.convertDO(editOcrUrlConfigTestDTO); + return iOcrUrlConfigTestDao.edit(ocrUrlConfigTest); + + // Long id = editOcrUrlConfigTestDTO.getId(); + + // OcrUrlConfigTest ocrUrlConfigTest = iOcrUrlConfigTestDao.findById(id); + + // if (Func.isNull(ocrUrlConfigTest)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "ocr路径配置表-调试，无法更新！"); + // } + + // ocrUrlConfigTest.setUpdateTime(LocalDateTime.now()); + // return iOcrUrlConfigTestDao.edit(ocrUrlConfigTest); + } + + /** + * 批量删除 + * @param deleteOcrUrlConfigTestDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrUrlConfigTestDTO deleteOcrUrlConfigTestDTO) { + return iOcrUrlConfigTestDao.delete(deleteOcrUrlConfigTestDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java index 5fb6b49..4475406 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrVersionServiceImpl.java @@ -1,27 +1,32 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.redis.service.IdService; -import com.docus.infrastructure.web.request.SearchDTO; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.OcrVersionConvert; import com.docus.server.dto.segmentation.ocrversion.AddOcrVersionDTO; -import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; import com.docus.server.dto.segmentation.ocrversion.EditOcrVersionDTO; -import com.docus.server.entity.segmentation.OcrVersion; +import com.docus.server.dto.segmentation.ocrversion.DeleteOcrVersionDTO; +import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; + import com.docus.server.entity.segmentation.OcrVersion; +import com.docus.server.convert.OcrVersionConvert; import com.docus.server.infrastructure.dao.IOcrVersionDao; import com.docus.server.service.IOcrVersionService; -import com.docus.server.vo.segmentation.ocrversion.OcrVersionVO; +import com.docus.core.util.Func; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.exception.ApiException; +import com.docus.infrastructure.web.exception.ExceptionCode; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; +import java.time.LocalDateTime; /** + * * 正式数据版本号管理 服务实现类 * * @author AutoGenerator - * @since 2023-08-25 + * @since 2023-08-29 */ @Service public class OcrVersionServiceImpl implements IOcrVersionService { @@ -31,35 +36,32 @@ public class OcrVersionServiceImpl implements IOcrVersionService { private IdService idService; /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ - @Override - public OcrVersionVO findById(Long id) { + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrVersionVO findById(Long id) { return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.findById(id)); - } + } /** - * 查询所有 - * - * @return 实体 - */ + *查询所有 + * @return 实体 + */ @Override public List findAll() { - return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.findAll()); + return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.findAll()); } /** - * 关键字搜索 - * - * @param searchDTO 搜索参数 - * @return 分页列表 - */ - @Override - public PageResult search(SearchDTO searchDTO) { - return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.search(searchDTO)); + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.search(searchDTO)); //PageResult result = OcrVersionConvert.INSTANCE.convertVO(iOcrVersionDao.search(searchDTO)); @@ -70,26 +72,25 @@ public class OcrVersionServiceImpl implements IOcrVersionService { //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); //result.getList().forEach(p -> { - // String collectorId = String.valueOf(p.getCollectorId()); - // if (map.containsKey(collectorId)) { - // p.setCollectorName(map.get(collectorId).getParamName()); - // } - //}); + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); - //return result; - } + //return result; + } /** - * 新增 - * - * @param addOcrVersionDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean add(AddOcrVersionDTO addOcrVersionDTO) { - OcrVersion ocrVersion = OcrVersionConvert.INSTANCE.convertDO(addOcrVersionDTO); - ocrVersion.setId(idService.getDateSeq()); + * 新增 + * @param addOcrVersionDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrVersionDTO addOcrVersionDTO) { + OcrVersion ocrVersion =OcrVersionConvert.INSTANCE.convertDO(addOcrVersionDTO); + ocrVersion.setId(idService.getDateSeq()); return iOcrVersionDao.add(ocrVersion); // String name = addOcrVersionDTO.getName(); @@ -97,29 +98,28 @@ public class OcrVersionServiceImpl implements IOcrVersionService { //OcrVersion ocrVersion = iOcrVersionDao.findOneBy("name", name); //if (Func.notNull(ocrVersion)) { - // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "正式数据版本号管理已经存在"); - // } + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "正式数据版本号管理已经存在"); + // } - // OcrVersion ocrVersion =OcrVersionConvert.INSTANCE.convertDO(addOcrVersionDTO); - // ocrVersion.setId(idService.getDateSeq()); + // OcrVersion ocrVersion =OcrVersionConvert.INSTANCE.convertDO(addOcrVersionDTO); + // ocrVersion.setId(idService.getDateSeq()); - // return iOcrVersionDao.add(schCollector); + // return iOcrVersionDao.add(schCollector); - } + } /** - * 编辑 - * - * @param editOcrVersionDTO 编辑参数 - * @return 成功或失败 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public boolean edit(EditOcrVersionDTO editOcrVersionDTO) { - OcrVersion ocrVersion = OcrVersionConvert.INSTANCE.convertDO(editOcrVersionDTO); - return iOcrVersionDao.edit(ocrVersion); - - // Long id = editOcrVersionDTO.getId(); + * 编辑 + * @param editOcrVersionDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrVersionDTO editOcrVersionDTO) { + OcrVersion ocrVersion =OcrVersionConvert.INSTANCE.convertDO(editOcrVersionDTO); + return iOcrVersionDao.edit(ocrVersion); + + // Long id = editOcrVersionDTO.getId(); // OcrVersion ocrVersion = iOcrVersionDao.findById(id); @@ -129,17 +129,16 @@ public class OcrVersionServiceImpl implements IOcrVersionService { // ocrVersion.setUpdateTime(LocalDateTime.now()); // return iOcrVersionDao.edit(ocrVersion); - } + } /** - * 批量删除 - * - * @param deleteOcrVersionDTO 删除参数 - * @return 成功或失败 - */ + * 批量删除 + * @param deleteOcrVersionDTO 删除参数 + * @return 成功或失败 + */ @Override public int delete(DeleteOcrVersionDTO deleteOcrVersionDTO) { - return iOcrVersionDao.delete(deleteOcrVersionDTO.getIds()); + return iOcrVersionDao.delete(deleteOcrVersionDTO.getIds()); } } diff --git a/docus-segmentation/src/main/resources/mapper/OcrBasicMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrBasicMapper.xml index 9972fe9..1a214fc 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrBasicMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrBasicMapper.xml @@ -9,21 +9,21 @@ - + + - - id, patient_id, inpatient_no, name, ocr_finish_time, admiss_date, admiss_dept, admiss_dept_name, dis_date, dis_dept, dis_dept_name, create_time, update_time, is_test + id, patient_id, inpatient_no, name, admiss_date, admiss_dept, admiss_dept_name, dis_date, dis_dept, dis_dept_name, ocr_statue, ocr_finish_time, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrBasicTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrBasicTestMapper.xml new file mode 100644 index 0000000..ebebc30 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrBasicTestMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, patient_id, inpatient_no, name, admiss_date, admiss_dept, admiss_dept_name, dis_date, dis_dept, dis_dept_name, ocr_statue, ocr_finish_time, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrCutConfigMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrCutConfigMapper.xml new file mode 100644 index 0000000..51c9488 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrCutConfigMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + id, height, width_start, width_end, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrCutConfigTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrCutConfigTestMapper.xml new file mode 100644 index 0000000..5ce45f2 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrCutConfigTestMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + id, height, width_start, width_end, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml index 3e08a28..7d0c6d3 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrFileInfoMapper.xml @@ -16,7 +16,7 @@ - + @@ -29,7 +29,7 @@ - id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, finsh_time, ocr_status, assort_id, assort_name, rule_id, key, rate, create_time, update_time + id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id, key, rate, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml new file mode 100644 index 0000000..eb06312 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrFileInfoTestMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, patient_id, file_title, pic_name, file_type, sort, serial_number, pic_url, pic_cut_url, angle, ocr_text, ocr_finish_time, ocr_status, assort_id, assort_name, rule_id, key, rate, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrRuleMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrRuleMapper.xml index 075989d..e79e098 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrRuleMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrRuleMapper.xml @@ -11,7 +11,6 @@ - @@ -19,7 +18,7 @@ - id, assort_id, match_ratio, key_word, json, version, is_test, is_use_second, create_time, update_time + id, assort_id, match_ratio, key_word, json, version, is_use_second, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrRuleTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrRuleTestMapper.xml new file mode 100644 index 0000000..e1644f0 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrRuleTestMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + id, assort_id, match_ratio, key_word, json, version, is_use_second, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleMapper.xml index 8be949b..d9e3586 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleMapper.xml @@ -6,16 +6,18 @@ + + + + - - - id, assort_id, create_time, update_time, version, is_test + id, name, assort_id, start_json, end_json, version, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrConfigMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleTestMapper.xml similarity index 54% rename from docus-segmentation/src/main/resources/mapper/OcrConfigMapper.xml rename to docus-segmentation/src/main/resources/mapper/OcrSpecialRuleTestMapper.xml index 4055230..e7746ed 100644 --- a/docus-segmentation/src/main/resources/mapper/OcrConfigMapper.xml +++ b/docus-segmentation/src/main/resources/mapper/OcrSpecialRuleTestMapper.xml @@ -1,22 +1,23 @@ - + + type="com.docus.server.entity.segmentation.OcrSpecialRuleTest"> - - + + + + + - - - id, config_key, config_json, create_time, update_time, version, is_test + id, name, assort_id, start_json, end_json, version, create_time, update_time diff --git a/docus-segmentation/src/main/resources/mapper/OcrUrlConfigMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrUrlConfigMapper.xml new file mode 100644 index 0000000..e739736 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrUrlConfigMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + id, url, create_time, update_time + + + diff --git a/docus-segmentation/src/main/resources/mapper/OcrUrlConfigTestMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrUrlConfigTestMapper.xml new file mode 100644 index 0000000..c6b9e93 --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrUrlConfigTestMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + id, url, create_time, update_time + + +