1. 添加ocr识别业务表

docker/docker-compose/init.sql

@@ -1576,18 +1576,28 @@ CREATE TABLE `triple_info`  (
 /*
   ocr识别功能添加表
  */
-CREATE TABLE `evidence_property` (
+create table evidence_property
-                                     `id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '主键',
+(
-                                     `evidence_id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '证据id',
+    id                      varchar(64)                        not null comment '主键'
-                                     `property_name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '属性名',
+        primary key,
-                                     `property_value` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '属性值',
+    evidence_id             varchar(64)                        not null comment '证据id',
-                                     `create_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '创建人ID',
+    evidence_name           varchar(128)                       null comment '证据名称',
-                                     `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    evidence_type           varchar(32)                        not null comment '证据类型',
-                                     `update_user_id` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新人',
+    victim                  varchar(256)                       null comment '受害人',
-                                     `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    contract_subject_matter varchar(64)                        null comment '合同标的物',
-                                     PRIMARY KEY (`id`),
+    contract_signing_time   varchar(64)                        null comment '合同签订时间',
-                                     KEY `evidence_property_evidence_id_index` (`evidence_id`)
+    price                   decimal                            null comment '金额',
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+    evidence_result         varchar(256)                       null comment '证据结果',
+    remark                  varchar(1024)                      null comment '备注',
+    create_user_id          varchar(64)                        null comment '创建人ID',
+    create_time             datetime default CURRENT_TIMESTAMP null comment '创建时间',
+    update_user_id          varchar(64)                        null comment '更新人',
+    update_time             datetime default CURRENT_TIMESTAMP null on update CURRENT_TIMESTAMP comment '更新时间'
+)
+    collate = utf8mb4_bin;
+
+create index evidence_property_evidence_id_index
+    on evidence_property (evidence_id);
 
 CREATE TABLE `file_ocr_process` (
                                     `id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '主键',

src/main/java/com/supervision/police/domain/EvidenceProperty.java

@@ -1,13 +1,11 @@
 package com.supervision.police.domain;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+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 java.io.Serializable;
 import java.time.LocalDateTime;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -29,14 +27,44 @@ public class EvidenceProperty implements Serializable {
     private String evidenceId;
 
     /**
-     * 属性名
+     * 证据名称
+     */
+    private String evidenceName;
+
+    /**
+     * 证据类型
+     */
+    private String evidenceType;
+
+    /**
+     * 受害人
+     */
+    private String victim;
+
+    /**
+     * 合同标的物
+     */
+    private String contractSubjectMatter;
+
+    /**
+     * 合同签订时间
+     */
+    private String contractSigningTime;
+
+    /**
+     * 金额
+     */
+    private Integer price;
+
+    /**
+     * 证据结果
      */
-    private String propertyName;
+    private String evidenceResult;
 
     /**
-     * 属性值
+     * 备注
      */
-    private String propertyValue;
+    private String remark;
 
     /**
      * 创建人ID
@@ -46,8 +74,6 @@ public class EvidenceProperty implements Serializable {
     /**
      * 创建时间
      */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
@@ -58,8 +84,6 @@ public class EvidenceProperty implements Serializable {
     /**
      * 更新时间
      */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     @TableField(exist = false)

src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
 * @author Administrator
 * @description 针对表【evidence_property】的数据库操作Mapper
-* @createDate 2024-08-30 17:35:23
+* @createDate 2024-09-02 10:58:22
 * @Entity com.supervision.police.domain.EvidenceProperty
 */
 public interface EvidencePropertyMapper extends BaseMapper<EvidenceProperty> {

src/main/java/com/supervision/police/service/EvidencePropertyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
 * @author Administrator
 * @description 针对表【evidence_property】的数据库操作Service
-* @createDate 2024-08-30 17:35:23
+* @createDate 2024-09-02 10:58:22
 */
 public interface EvidencePropertyService extends IService<EvidenceProperty> {
 

src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 /**
 * @author Administrator
 * @description 针对表【evidence_property】的数据库操作Service实现
-* @createDate 2024-08-30 17:35:23
+* @createDate 2024-09-02 10:58:22
 */
 @Service
 public class EvidencePropertyServiceImpl extends ServiceImpl<EvidencePropertyMapper, EvidenceProperty>

src/main/resources/mapper/EvidencePropertyMapper.xml

@@ -7,8 +7,14 @@
     <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="evidenceName" column="evidence_name" jdbcType="VARCHAR"/>
-            <result property="propertyValue" column="property_value" jdbcType="VARCHAR"/>
+            <result property="evidenceType" column="evidence_type" jdbcType="VARCHAR"/>
+            <result property="victim" column="victim" jdbcType="VARCHAR"/>
+            <result property="contractSubjectMatter" column="contract_subject_matter" jdbcType="VARCHAR"/>
+            <result property="contractSigningTime" column="contract_signing_time" jdbcType="VARCHAR"/>
+            <result property="price" column="price" jdbcType="DECIMAL"/>
+            <result property="evidenceResult" column="evidence_result" jdbcType="VARCHAR"/>
+            <result property="remark" column="remark" 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"/>
@@ -16,8 +22,10 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,evidence_id,property_name,
+        id,evidence_id,evidence_name,
-        property_value,create_user_id,create_time,
+        evidence_type,victim,contract_subject_matter,
+        contract_signing_time,price,evidence_result,
+        remark,create_user_id,create_time,
         update_user_id,update_time
     </sql>
 </mapper>