diff --git a/docker/docker-compose/init.sql b/docker/docker-compose/init.sql index b07185b..496c6c5 100644 --- a/docker/docker-compose/init.sql +++ b/docker/docker-compose/init.sql @@ -1573,4 +1573,35 @@ CREATE TABLE `triple_info` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '三元组信息表' ROW_FORMAT = Dynamic; +/* + ocr识别功能添加表 + */ +CREATE TABLE `evidence_property` ( + `id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '主键', + `evidence_id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '证据id', + `property_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '属性名', + `property_value` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '属性值', + `create_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人ID', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `evidence_property_evidence_id_index` (`evidence_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + +CREATE TABLE `file_ocr_process` ( + `id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '主键', + `file_id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '文件id', + `status` int(11) DEFAULT '0' COMMENT '识别状态 0：正在识别 1：识别成功 2：识别失败', + `draw_img_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'ocr识别标注后的图片文件id', + `ocr_text` text COLLATE utf8mb4_bin COMMENT '识别出的文本内容', + `revise_text` text COLLATE utf8mb4_bin COMMENT '修正后的文本', + `create_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人ID', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `file_ocr_process_file_id_index` (`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='文件ocr识别进度表'; + SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/main/java/com/supervision/police/controller/RecordController.java b/src/main/java/com/supervision/police/controller/RecordController.java index 929709f..2013b1b 100644 --- a/src/main/java/com/supervision/police/controller/RecordController.java +++ b/src/main/java/com/supervision/police/controller/RecordController.java @@ -112,12 +112,13 @@ public class RecordController { /** * 查询笔录，按姓名为父目录 - * + * Deprecated：since：2024-08-29 笔录列表不需要添加父目录，改为平铺数据@see queryRecordList * @param noteRecord * @param page * @param size * @return */ + @Deprecated @PostMapping("/queryRecords") public R> queryRecords(@RequestBody NoteRecord noteRecord, @RequestParam(required = false, defaultValue = "1") Integer page, diff --git a/src/main/java/com/supervision/police/domain/EvidenceProperty.java b/src/main/java/com/supervision/police/domain/EvidenceProperty.java new file mode 100644 index 0000000..7ec9660 --- /dev/null +++ b/src/main/java/com/supervision/police/domain/EvidenceProperty.java @@ -0,0 +1,67 @@ +package com.supervision.police.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +/** + * + * @TableName evidence_property + */ +@TableName(value ="evidence_property") +@Data +public class EvidenceProperty implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 证据id + */ + private String evidenceId; + + /** + * 属性名 + */ + private String propertyName; + + /** + * 属性值 + */ + private String propertyValue; + + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime updateTime; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/police/domain/FileOcrProcess.java b/src/main/java/com/supervision/police/domain/FileOcrProcess.java new file mode 100644 index 0000000..04111fd --- /dev/null +++ b/src/main/java/com/supervision/police/domain/FileOcrProcess.java @@ -0,0 +1,75 @@ +package com.supervision.police.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +/** + * 文件ocr识别进度表 + * @TableName file_ocr_process + */ +@TableName(value ="file_ocr_process") +@Data +public class FileOcrProcess implements Serializable { + /** + * 主键 + */ + @TableId + private String id; + + /** + * 文件id + */ + private String fileId; + + /** + * 识别状态 0：正在识别 1：识别成功 2：识别失败 + */ + private Integer status; + + /** + * ocr识别标注后的图片文件id + */ + private String drawImgId; + + /** + * 识别出的文本内容 + */ + private String ocrText; + + /** + * 修正后的文本 + */ + private String reviseText; + + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime updateTime; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java b/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java new file mode 100644 index 0000000..0936d03 --- /dev/null +++ b/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java @@ -0,0 +1,18 @@ +package com.supervision.police.mapper; + +import com.supervision.police.domain.EvidenceProperty; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【evidence_property】的数据库操作Mapper +* @createDate 2024-08-30 17:35:23 +* @Entity com.supervision.police.domain.EvidenceProperty +*/ +public interface EvidencePropertyMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/police/mapper/FileOcrProcessMapper.java b/src/main/java/com/supervision/police/mapper/FileOcrProcessMapper.java new file mode 100644 index 0000000..cbe6d9f --- /dev/null +++ b/src/main/java/com/supervision/police/mapper/FileOcrProcessMapper.java @@ -0,0 +1,18 @@ +package com.supervision.police.mapper; + +import com.supervision.police.domain.FileOcrProcess; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【file_ocr_process(文件ocr识别进度表)】的数据库操作Mapper +* @createDate 2024-08-30 17:35:23 +* @Entity com.supervision.police.domain.FileOcrProcess +*/ +public interface FileOcrProcessMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/police/service/EvidencePropertyService.java b/src/main/java/com/supervision/police/service/EvidencePropertyService.java new file mode 100644 index 0000000..9030f3a --- /dev/null +++ b/src/main/java/com/supervision/police/service/EvidencePropertyService.java @@ -0,0 +1,13 @@ +package com.supervision.police.service; + +import com.supervision.police.domain.EvidenceProperty; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【evidence_property】的数据库操作Service +* @createDate 2024-08-30 17:35:23 +*/ +public interface EvidencePropertyService extends IService { + +} diff --git a/src/main/java/com/supervision/police/service/FileOcrProcessService.java b/src/main/java/com/supervision/police/service/FileOcrProcessService.java new file mode 100644 index 0000000..9797923 --- /dev/null +++ b/src/main/java/com/supervision/police/service/FileOcrProcessService.java @@ -0,0 +1,13 @@ +package com.supervision.police.service; + +import com.supervision.police.domain.FileOcrProcess; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【file_ocr_process(文件ocr识别进度表)】的数据库操作Service +* @createDate 2024-08-30 17:35:23 +*/ +public interface FileOcrProcessService extends IService { + +} diff --git a/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java new file mode 100644 index 0000000..c07f7a8 --- /dev/null +++ b/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.police.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.police.domain.EvidenceProperty; +import com.supervision.police.service.EvidencePropertyService; +import com.supervision.police.mapper.EvidencePropertyMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【evidence_property】的数据库操作Service实现 +* @createDate 2024-08-30 17:35:23 +*/ +@Service +public class EvidencePropertyServiceImpl extends ServiceImpl + implements EvidencePropertyService{ + +} + + + + diff --git a/src/main/java/com/supervision/police/service/impl/FileOcrProcessServiceImpl.java b/src/main/java/com/supervision/police/service/impl/FileOcrProcessServiceImpl.java new file mode 100644 index 0000000..5a81b52 --- /dev/null +++ b/src/main/java/com/supervision/police/service/impl/FileOcrProcessServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.police.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.police.domain.FileOcrProcess; +import com.supervision.police.service.FileOcrProcessService; +import com.supervision.police.mapper.FileOcrProcessMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【file_ocr_process(文件ocr识别进度表)】的数据库操作Service实现 +* @createDate 2024-08-30 17:35:23 +*/ +@Service +public class FileOcrProcessServiceImpl extends ServiceImpl + implements FileOcrProcessService{ + +} + + + + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 5b6f462..2e15b79 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -54,12 +54,6 @@ spring: data: neo4j: database: neo4j - -# neo4j: -# uri: bolt://113.128.242.110:7687 -# authentication: -# username: neo4j -# password: Sushengtian@sdjn2023 neo4j: uri: bolt://192.168.10.137:7687 authentication: diff --git a/src/main/resources/mapper/EvidencePropertyMapper.xml b/src/main/resources/mapper/EvidencePropertyMapper.xml new file mode 100644 index 0000000..ab33e4d --- /dev/null +++ b/src/main/resources/mapper/EvidencePropertyMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + id,evidence_id,property_name, + property_value,create_user_id,create_time, + update_user_id,update_time + + diff --git a/src/main/resources/mapper/FileOcrProcessMapper.xml b/src/main/resources/mapper/FileOcrProcessMapper.xml new file mode 100644 index 0000000..ce13c80 --- /dev/null +++ b/src/main/resources/mapper/FileOcrProcessMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + id,file_id,status, + draw_img_id,ocr_text,revise_text, + create_user_id,create_time,update_user_id, + update_time + +