1. 添加ocr识别业务表

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;

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<Map<String, Object>> queryRecords(@RequestBody NoteRecord noteRecord,
                                                @RequestParam(required = false, defaultValue = "1") Integer page,

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;
+}

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;
+}

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<EvidenceProperty> {
+
+}
+
+
+
+

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<FileOcrProcess> {
+
+}
+
+
+
+

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<EvidenceProperty> {
+
+}

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<FileOcrProcess> {
+
+}

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<EvidencePropertyMapper, EvidenceProperty>
+    implements EvidencePropertyService{
+
+}
+
+
+
+

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<FileOcrProcessMapper, FileOcrProcess>
+    implements FileOcrProcessService{
+
+}
+
+
+
+

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:

src/main/resources/mapper/EvidencePropertyMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.police.mapper.EvidencePropertyMapper">
+
+    <resultMap id="BaseResultMap" type="com.supervision.police.domain.EvidenceProperty">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="evidenceId" column="evidence_id" jdbcType="VARCHAR"/>
+            <result property="propertyName" column="property_name" jdbcType="VARCHAR"/>
+            <result property="propertyValue" column="property_value" jdbcType="VARCHAR"/>
+            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,evidence_id,property_name,
+        property_value,create_user_id,create_time,
+        update_user_id,update_time
+    </sql>
+</mapper>

src/main/resources/mapper/FileOcrProcessMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.supervision.police.mapper.FileOcrProcessMapper">
+
+    <resultMap id="BaseResultMap" type="com.supervision.police.domain.FileOcrProcess">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="fileId" column="file_id" jdbcType="VARCHAR"/>
+            <result property="status" column="status" jdbcType="INTEGER"/>
+            <result property="drawImgId" column="draw_img_id" jdbcType="VARCHAR"/>
+            <result property="ocrText" column="ocr_text" jdbcType="VARCHAR"/>
+            <result property="reviseText" column="revise_text" jdbcType="VARCHAR"/>
+            <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,file_id,status,
+        draw_img_id,ocr_text,revise_text,
+        create_user_id,create_time,update_user_id,
+        update_time
+    </sql>
+</mapper>