linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增分段状态

Browse Source
segment2.0
linrf 2 years ago
parent bb8a847c35
commit d726e20de4
10 changed files with 62 additions and 18 deletions
Show Stats Download Patch File Download Diff File

3
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/AddOcrFileInfoDTO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.dto.segmentation.ocrfileinfo;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -60,7 +61,7 @@ public class AddOcrFileInfoDTO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

3
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfo/EditOcrFileInfoDTO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.dto.segmentation.ocrfileinfo;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -60,7 +61,7 @@ public class EditOcrFileInfoDTO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

3
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/AddOcrFileInfoTestDTO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.dto.segmentation.ocrfileinfotest;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -60,7 +61,7 @@ public class AddOcrFileInfoTestDTO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

3
docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrfileinfotest/EditOcrFileInfoTestDTO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.dto.segmentation.ocrfileinfotest;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -61,7 +62,7 @@ public class EditOcrFileInfoTestDTO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

5
docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfo.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -78,9 +79,9 @@ public class OcrFileInfo implements Serializable {
@TableField("ocr_finish_time")
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
@ApiModelProperty(value = "分段状态 0未开始 1分段中,2完成分段")
@TableField("ocr_status")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
@TableField("assort_id")

8
docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrFileInfoTest.java
Unescape Escape View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.infrastructure.core.db.enums.IntegerEnumHandler;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -78,9 +80,9 @@ public class OcrFileInfoTest implements Serializable {
@TableField("ocr_finish_time")
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
@TableField("ocr_status")
private Boolean ocrStatus;
@ApiModelProperty(value = "分段状态 0未开始 1分段中,2完成分段")
@TableField(value = "ocr_status", typeHandler = IntegerEnumHandler.class)
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
@TableField("assort_id")

33
docus-client-interface/src/main/java/com/docus/server/enums/OcrStatusEnum.java
Unescape Escape View File

@ -0,0 +1,33 @@
package com.docus.server.enums;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
/**
* 忙闲状态
*/
public enum OcrStatusEnum implements IIntegerEnum {
NO_START(0, "未开始"),
STARTING(1, "分段中"),
COMPLETE(1, "完成分段");
private Integer value;
private String display;
OcrStatusEnum(Integer value, String display) {
this.value = value;
this.display = display;
}
@Override
public Integer getValue() {
return value;
}
@Override
public String getDisplay() {
return display;
}
}

3
docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfo/OcrFileInfoVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.vo.segmentation.ocrfileinfo;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -60,7 +61,7 @@ public class OcrFileInfoVO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

4
docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrfileinfotest/OcrFileInfoTestVO.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.docus.server.vo.segmentation.ocrfileinfotest;
import com.docus.server.enums.OcrStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -11,7 +12,6 @@ import java.io.Serializable;
import java.util.Date;
/**
*
* ocr文件信息-调试 VO
*
* @author AutoGenerator
@ -61,7 +61,7 @@ public class OcrFileInfoTestVO implements Serializable {
private Date ocrFinishTime;
@ApiModelProperty(value = "分段状态 0未开始 1完成分段")
private Boolean ocrStatus;
private OcrStatusEnum ocrStatus;
@ApiModelProperty(value = "分段id")
private Integer assortId;

3
docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO;
import com.docus.server.dto.segmentation.ocrbasictest.AddOcrBasicTestDTO;
import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO;
import com.docus.server.dto.segmentation.ocrfileinfotest.AddOcrFileInfoTestDTO;
import com.docus.server.enums.OcrStatusEnum;
import com.docus.server.service.IOcrBasicService;
import com.docus.server.service.IOcrBasicTestService;
import com.docus.server.service.IOcrFileInfoService;
@ -60,6 +61,7 @@ public class CommonService {
addOcrFileInfoDTO.setWidth(uploadFileVO.getWidth());
addOcrFileInfoDTO.setX(uploadFileVO.getX());
addOcrFileInfoDTO.setY(uploadFileVO.getY());
addOcrFileInfoDTO.setOcrStatus(OcrStatusEnum.NO_START);
files.add(addOcrFileInfoDTO);
}
@ -93,6 +95,7 @@ public class CommonService {
addOcrFileInfoDTO.setWidth(uploadFileVO.getWidth());
addOcrFileInfoDTO.setX(uploadFileVO.getX());
addOcrFileInfoDTO.setY(uploadFileVO.getY());
addOcrFileInfoDTO.setOcrStatus(OcrStatusEnum.NO_START);
files.add(addOcrFileInfoDTO);
}

Write Preview
Loading…
Cancel
Save