From 4914d0bdd73c5008ba704f228927b2b5c8b32c63 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Mon, 2 Sep 2024 10:59:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0ocr=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose/init.sql | 34 +++++++++----- .../police/domain/EvidenceProperty.java | 46 ++++++++++++++----- .../police/mapper/EvidencePropertyMapper.java | 2 +- .../service/EvidencePropertyService.java | 2 +- .../impl/EvidencePropertyServiceImpl.java | 2 +- .../mapper/EvidencePropertyMapper.xml | 16 +++++-- 6 files changed, 72 insertions(+), 30 deletions(-) diff --git a/docker/docker-compose/init.sql b/docker/docker-compose/init.sql index 496c6c5..e2c02df 100644 --- a/docker/docker-compose/init.sql +++ b/docker/docker-compose/init.sql @@ -1576,18 +1576,28 @@ CREATE TABLE `triple_info` ( /* 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 evidence_property +( + id varchar(64) not null comment '主键' + primary key, + evidence_id varchar(64) not null comment '证据id', + evidence_name varchar(128) null comment '证据名称', + evidence_type varchar(32) not null comment '证据类型', + victim varchar(256) null comment '受害人', + contract_subject_matter varchar(64) null comment '合同标的物', + contract_signing_time varchar(64) null comment '合同签订时间', + price decimal null comment '金额', + 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 '主键', diff --git a/src/main/java/com/supervision/police/domain/EvidenceProperty.java b/src/main/java/com/supervision/police/domain/EvidenceProperty.java index 7ec9660..3ec2944 100644 --- a/src/main/java/com/supervision/police/domain/EvidenceProperty.java +++ b/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) diff --git a/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java b/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java index 0936d03..f628fb2 100644 --- a/src/main/java/com/supervision/police/mapper/EvidencePropertyMapper.java +++ b/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 { diff --git a/src/main/java/com/supervision/police/service/EvidencePropertyService.java b/src/main/java/com/supervision/police/service/EvidencePropertyService.java index 9030f3a..deac9a4 100644 --- a/src/main/java/com/supervision/police/service/EvidencePropertyService.java +++ b/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 { diff --git a/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java index c07f7a8..195cd72 100644 --- a/src/main/java/com/supervision/police/service/impl/EvidencePropertyServiceImpl.java +++ b/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 diff --git a/src/main/resources/mapper/EvidencePropertyMapper.xml b/src/main/resources/mapper/EvidencePropertyMapper.xml index ab33e4d..eeed217 100644 --- a/src/main/resources/mapper/EvidencePropertyMapper.xml +++ b/src/main/resources/mapper/EvidencePropertyMapper.xml @@ -7,8 +7,14 @@ - - + + + + + + + + @@ -16,8 +22,10 @@ - id,evidence_id,property_name, - property_value,create_user_id,create_time, + id,evidence_id,evidence_name, + evidence_type,victim,contract_subject_matter, + contract_signing_time,price,evidence_result, + remark,create_user_id,create_time, update_user_id,update_time