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 0e3be8e..985238f 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,26 +6,21 @@ 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 -*/ + * 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") @@ -88,5 +83,30 @@ public class AddOcrFileInfoDTO implements Serializable { @ApiModelProperty(value = "更新时间") private Date updateTime; + // + + @ApiModelProperty(value = "文件名称") + private String fileName; + + @ApiModelProperty(value = "文件大小") + private Long fileSize; + + @ApiModelProperty(value = "高度") + private int height; + + @ApiModelProperty(value = "宽度") + private int width; + + @ApiModelProperty(value = "横坐标") + private int x; + + @ApiModelProperty(value = "纵坐标") + private int y; + + @ApiModelProperty(value = "原图片路径保存前缀") + private String saveFilePath; + + @ApiModelProperty(value = "剪切图片路径保存前缀") + private String saveCutFilePath; } 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 index a6ae559..a4c69a5 100644 --- 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 @@ -6,26 +6,21 @@ 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 -*/ + * ocr文件信息-调试 AddDTO + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value="AddOcrFileInfoTestDTO对象", description="ocr文件信息-调试") +@ApiModel(value = "AddOcrFileInfoTestDTO对象", description = "ocr文件信息-调试") public class AddOcrFileInfoTestDTO implements Serializable { @ApiModelProperty(value = "id") @@ -88,5 +83,30 @@ public class AddOcrFileInfoTestDTO implements Serializable { @ApiModelProperty(value = "更新时间") private Date updateTime; + // + + @ApiModelProperty(value = "文件名称") + private String fileName; + + @ApiModelProperty(value = "文件大小") + private Long fileSize; + + @ApiModelProperty(value = "高度") + private int height; + + @ApiModelProperty(value = "宽度") + private int width; + + @ApiModelProperty(value = "横坐标") + private int x; + + @ApiModelProperty(value = "纵坐标") + private int y; + + @ApiModelProperty(value = "原图片路径保存前缀") + private String saveFilePath; + + @ApiModelProperty(value = "剪切图片路径保存前缀") + private String saveCutFilePath; } 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 783fa3b..c0bf071 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,36 +1,33 @@ 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 com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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 lombok.NoArgsConstructor; -import com.docus.server.enums.*; +import java.io.Serializable; +import java.util.Date; /** -* -* ocr文件信息 -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * 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") @@ -105,6 +102,30 @@ public class OcrFileInfo implements Serializable { @TableField("rate") private Float rate; + @ApiModelProperty(value = "文件名称") + @TableField("key") + private String fileName; + + @ApiModelProperty(value = "文件大小") + @TableField("file_size") + private Long fileSize; + + @ApiModelProperty(value = "高度") + @TableField("height") + private int height; + + @ApiModelProperty(value = "宽度") + @TableField("width") + private int width; + + @ApiModelProperty(value = "横坐标") + @TableField("x") + private int x; + + @ApiModelProperty(value = "纵坐标") + @TableField("y") + private int y; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; 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 index 5506f89..c885709 100644 --- 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 @@ -1,36 +1,33 @@ 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 com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; 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 lombok.NoArgsConstructor; -import com.docus.server.enums.*; +import java.io.Serializable; +import java.util.Date; /** -* -* ocr文件信息-调试 -* -* @author AutoGenerator -* @since 2023-08-29 -*/ + * ocr文件信息-调试 + * + * @author AutoGenerator + * @since 2023-08-29 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) @TableName("ocr_file_info_test") -@ApiModel(value="OcrFileInfoTest对象", description="ocr文件信息-调试") +@ApiModel(value = "OcrFileInfoTest对象", description = "ocr文件信息-调试") public class OcrFileInfoTest implements Serializable { @ApiModelProperty(value = "id") @@ -105,6 +102,26 @@ public class OcrFileInfoTest implements Serializable { @TableField("rate") private Float rate; + @ApiModelProperty(value = "文件大小") + @TableField("file_size") + private Long fileSize; + + @ApiModelProperty(value = "高度") + @TableField("height") + private int height; + + @ApiModelProperty(value = "宽度") + @TableField("width") + private int width; + + @ApiModelProperty(value = "横坐标") + @TableField("x") + private int x; + + @ApiModelProperty(value = "纵坐标") + @TableField("y") + private int y; + @ApiModelProperty(value = "创建时间") @TableField("create_time") private Date createTime; 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 5351cb3..f770db7 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 @@ -56,6 +56,11 @@ public class CommonService { addOcrFileInfoDTO.setSerialNumber(UUID.randomUUID().toString().replace("-", "")); addOcrFileInfoDTO.setPicUrl(uploadFileVO.getSaveFilePath() + uploadFileVO.getFilePath()); addOcrFileInfoDTO.setPicCutUrl(uploadFileVO.getSaveCutFilePath() + uploadFileVO.getFilePath()); + addOcrFileInfoDTO.setFileSize(uploadFileVO.getFileSize()); + addOcrFileInfoDTO.setHeight(uploadFileVO.getHeight()); + addOcrFileInfoDTO.setWidth(uploadFileVO.getWidth()); + addOcrFileInfoDTO.setX(uploadFileVO.getX()); + addOcrFileInfoDTO.setY(uploadFileVO.getY()); files.add(addOcrFileInfoDTO); } @@ -84,10 +89,14 @@ public class CommonService { addOcrFileInfoDTO.setSerialNumber(UUID.randomUUID().toString().replace("-", "")); addOcrFileInfoDTO.setPicUrl(uploadFileVO.getSaveFilePath() + uploadFileVO.getFilePath()); addOcrFileInfoDTO.setPicCutUrl(uploadFileVO.getSaveCutFilePath() + uploadFileVO.getFilePath()); + addOcrFileInfoDTO.setFileSize(uploadFileVO.getFileSize()); + addOcrFileInfoDTO.setHeight(uploadFileVO.getHeight()); + addOcrFileInfoDTO.setWidth(uploadFileVO.getWidth()); + addOcrFileInfoDTO.setX(uploadFileVO.getX()); + addOcrFileInfoDTO.setY(uploadFileVO.getY()); files.add(addOcrFileInfoDTO); } - iOcrFileInfoService.addBatch(files); return files;