From 76d2c2081afe0de4b0d4ee8e110388235278a0bf Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 8 Oct 2024 17:23:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=8F=98=E6=9B=B4=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/domain/CaseEvidence.java | 13 +++- .../police/domain/EvidenceCategory.java | 71 +++++++++++++++++++ .../police/domain/EvidenceDirectory.java | 66 +++++++++++++++++ .../police/domain/EvidenceFile.java | 5 ++ .../police/domain/ModelAtomicIndex.java | 12 +++- .../supervision/police/domain/NotePrompt.java | 49 +++++++++++++ .../police/mapper/EvidenceCategoryMapper.java | 18 +++++ .../mapper/EvidenceDirectoryMapper.java | 18 +++++ .../service/EvidenceCategoryService.java | 13 ++++ .../service/EvidenceDirectoryService.java | 13 ++++ .../impl/EvidenceCategoryServiceImpl.java | 22 ++++++ .../impl/EvidenceDirectoryServiceImpl.java | 22 ++++++ .../resources/mapper/CaseEvidenceMapper.xml | 9 ++- .../mapper/EvidenceCategoryMapper.xml | 26 +++++++ .../mapper/EvidenceDirectoryMapper.xml | 24 +++++++ .../resources/mapper/EvidenceFileMapper.xml | 5 +- 16 files changed, 378 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/supervision/police/domain/EvidenceCategory.java create mode 100644 src/main/java/com/supervision/police/domain/EvidenceDirectory.java create mode 100644 src/main/java/com/supervision/police/mapper/EvidenceCategoryMapper.java create mode 100644 src/main/java/com/supervision/police/mapper/EvidenceDirectoryMapper.java create mode 100644 src/main/java/com/supervision/police/service/EvidenceCategoryService.java create mode 100644 src/main/java/com/supervision/police/service/EvidenceDirectoryService.java create mode 100644 src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java create mode 100644 src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java create mode 100644 src/main/resources/mapper/EvidenceCategoryMapper.xml create mode 100644 src/main/resources/mapper/EvidenceDirectoryMapper.xml diff --git a/src/main/java/com/supervision/police/domain/CaseEvidence.java b/src/main/java/com/supervision/police/domain/CaseEvidence.java index ae64952..57d4a2c 100644 --- a/src/main/java/com/supervision/police/domain/CaseEvidence.java +++ b/src/main/java/com/supervision/police/domain/CaseEvidence.java @@ -9,6 +9,7 @@ import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.json.JSONArray; /** * 案件证据表 @@ -38,6 +39,16 @@ public class CaseEvidence implements Serializable { */ private String evidenceType; + /** + * 流程状态 0:待处理 1：处理中 2：处理成功 3：处理失败 + */ + private String processStatus; + + /** + * 属性 + */ + private JSONArray property; + /** * 证据提供人 */ @@ -68,7 +79,6 @@ public class CaseEvidence implements Serializable { /** * 更新人 */ - private String updateUserId; /** @@ -80,5 +90,4 @@ public class CaseEvidence implements Serializable { @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/EvidenceCategory.java b/src/main/java/com/supervision/police/domain/EvidenceCategory.java new file mode 100644 index 0000000..f6cc10f --- /dev/null +++ b/src/main/java/com/supervision/police/domain/EvidenceCategory.java @@ -0,0 +1,71 @@ +package com.supervision.police.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 证据类别表 + * @TableName evidence_category + */ +@TableName(value ="evidence_category") +@Data +public class EvidenceCategory implements Serializable { + /** + * 主键id + */ + @TableId + private String id; + + /** + * 编码 + */ + private String code; + + /** + * 案件类型 + */ + private String caseType; + + /** + * 分类名 + */ + private String categoryName; + + /** + * 图标url + */ + private String iconURl; + + /** + * 父级类别id + */ + private String parentId; + + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + 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/EvidenceDirectory.java b/src/main/java/com/supervision/police/domain/EvidenceDirectory.java new file mode 100644 index 0000000..cd37142 --- /dev/null +++ b/src/main/java/com/supervision/police/domain/EvidenceDirectory.java @@ -0,0 +1,66 @@ +package com.supervision.police.domain; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * 证据目录表 + * @TableName evidence_directory + */ +@TableName(value ="evidence_directory") +@Data +public class EvidenceDirectory implements Serializable { + /** + * 主键id + */ + @TableId + private String id; + + /** + * 案件id + */ + private String caseId; + + /** + * 目录名 + */ + private String directoryName; + + /** + * 证据分类id，对应evidence_category表的id + */ + private String categoryId; + + /** + * 上级目录id + */ + private String parentId; + + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + 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/EvidenceFile.java b/src/main/java/com/supervision/police/domain/EvidenceFile.java index fa855ae..3262f5c 100644 --- a/src/main/java/com/supervision/police/domain/EvidenceFile.java +++ b/src/main/java/com/supervision/police/domain/EvidenceFile.java @@ -34,6 +34,11 @@ public class EvidenceFile implements Serializable { */ private String fileId; + /** + * 目录id + */ + private String directoryId; + /** * 创建人ID */ diff --git a/src/main/java/com/supervision/police/domain/ModelAtomicIndex.java b/src/main/java/com/supervision/police/domain/ModelAtomicIndex.java index 264ca7e..75972ed 100644 --- a/src/main/java/com/supervision/police/domain/ModelAtomicIndex.java +++ b/src/main/java/com/supervision/police/domain/ModelAtomicIndex.java @@ -66,7 +66,17 @@ public class ModelAtomicIndex implements Serializable { * 查询语句 */ private String queryLang; - + + /** + * 提示词id + */ + private String promptId; + + /** + * 属性 多个属性用逗号隔开 + */ + private String properties; + /** * 笔录类型 */ diff --git a/src/main/java/com/supervision/police/domain/NotePrompt.java b/src/main/java/com/supervision/police/domain/NotePrompt.java index ff09ed7..7e73a56 100644 --- a/src/main/java/com/supervision/police/domain/NotePrompt.java +++ b/src/main/java/com/supervision/police/domain/NotePrompt.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.supervision.police.dto.TripleInfoDTO; import com.supervision.police.dto.TypeDTO; import lombok.Data; +import org.json.JSONArray; import java.io.Serializable; import java.time.LocalDateTime; @@ -38,16 +39,34 @@ public class NotePrompt implements Serializable { */ private String prompt; + /** + * 开始节点类型 + */ private String startEntityType; + /** + * 开始节点占位符 + */ private String startEntityTemplate; + /** + * 关系类型 + */ private String relType; + /** + * 关系占位符 + */ private String relTemplate; + /** + * 结束节点类型 + */ private String endEntityType; + /** + * 结束节点占位符 + */ private String endEntityTemplate; @@ -79,6 +98,36 @@ public class NotePrompt implements Serializable { @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime updateTime; + /** + * + */ + private String name; + + /** + * + */ + private String caseType; + + /** + * + */ + private String type; + + /** + * + */ + private JSONArray keys; + + /** + * + */ + private JSONArray extractAttributes; + + /** + * + */ + private String evidenceCategoryId; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/supervision/police/mapper/EvidenceCategoryMapper.java b/src/main/java/com/supervision/police/mapper/EvidenceCategoryMapper.java new file mode 100644 index 0000000..80520fc --- /dev/null +++ b/src/main/java/com/supervision/police/mapper/EvidenceCategoryMapper.java @@ -0,0 +1,18 @@ +package com.supervision.police.mapper; + +import com.supervision.police.domain.EvidenceCategory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【evidence_category(证据类别表)】的数据库操作Mapper +* @createDate 2024-10-08 16:33:47 +* @Entity com.supervision.police.domain.EvidenceCategory +*/ +public interface EvidenceCategoryMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/police/mapper/EvidenceDirectoryMapper.java b/src/main/java/com/supervision/police/mapper/EvidenceDirectoryMapper.java new file mode 100644 index 0000000..5fa1160 --- /dev/null +++ b/src/main/java/com/supervision/police/mapper/EvidenceDirectoryMapper.java @@ -0,0 +1,18 @@ +package com.supervision.police.mapper; + +import com.supervision.police.domain.EvidenceDirectory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【evidence_directory(证据目录表)】的数据库操作Mapper +* @createDate 2024-10-08 16:33:47 +* @Entity com.supervision.police.domain.EvidenceDirectory +*/ +public interface EvidenceDirectoryMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/supervision/police/service/EvidenceCategoryService.java b/src/main/java/com/supervision/police/service/EvidenceCategoryService.java new file mode 100644 index 0000000..ca40175 --- /dev/null +++ b/src/main/java/com/supervision/police/service/EvidenceCategoryService.java @@ -0,0 +1,13 @@ +package com.supervision.police.service; + +import com.supervision.police.domain.EvidenceCategory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【evidence_category(证据类别表)】的数据库操作Service +* @createDate 2024-10-08 16:33:47 +*/ +public interface EvidenceCategoryService extends IService { + +} diff --git a/src/main/java/com/supervision/police/service/EvidenceDirectoryService.java b/src/main/java/com/supervision/police/service/EvidenceDirectoryService.java new file mode 100644 index 0000000..2f59621 --- /dev/null +++ b/src/main/java/com/supervision/police/service/EvidenceDirectoryService.java @@ -0,0 +1,13 @@ +package com.supervision.police.service; + +import com.supervision.police.domain.EvidenceDirectory; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【evidence_directory(证据目录表)】的数据库操作Service +* @createDate 2024-10-08 16:33:47 +*/ +public interface EvidenceDirectoryService extends IService { + +} diff --git a/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java new file mode 100644 index 0000000..a85fb02 --- /dev/null +++ b/src/main/java/com/supervision/police/service/impl/EvidenceCategoryServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.police.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.police.domain.EvidenceCategory; +import com.supervision.police.service.EvidenceCategoryService; +import com.supervision.police.mapper.EvidenceCategoryMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【evidence_category(证据类别表)】的数据库操作Service实现 +* @createDate 2024-10-08 16:33:47 +*/ +@Service +public class EvidenceCategoryServiceImpl extends ServiceImpl + implements EvidenceCategoryService{ + +} + + + + diff --git a/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java new file mode 100644 index 0000000..51f214a --- /dev/null +++ b/src/main/java/com/supervision/police/service/impl/EvidenceDirectoryServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.police.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.police.domain.EvidenceDirectory; +import com.supervision.police.service.EvidenceDirectoryService; +import com.supervision.police.mapper.EvidenceDirectoryMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【evidence_directory(证据目录表)】的数据库操作Service实现 +* @createDate 2024-10-08 16:33:47 +*/ +@Service +public class EvidenceDirectoryServiceImpl extends ServiceImpl + implements EvidenceDirectoryService{ + +} + + + + diff --git a/src/main/resources/mapper/CaseEvidenceMapper.xml b/src/main/resources/mapper/CaseEvidenceMapper.xml index aa99a8b..8ec044d 100644 --- a/src/main/resources/mapper/CaseEvidenceMapper.xml +++ b/src/main/resources/mapper/CaseEvidenceMapper.xml @@ -9,6 +9,8 @@ + + @@ -20,9 +22,10 @@ id,case_id,evidence_name, - evidence_type,provider,party_a, - party_b,create_user_id,create_time, - update_user_id,update_time + evidence_type,process_status,property, + provider,party_a,party_b, + create_user_id,create_time,update_user_id, + update_time diff --git a/src/main/resources/mapper/EvidenceCategoryMapper.xml b/src/main/resources/mapper/EvidenceCategoryMapper.xml new file mode 100644 index 0000000..dd2d4cd --- /dev/null +++ b/src/main/resources/mapper/EvidenceCategoryMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + id,code,case_type, + category_name,icon_url,parent_id, + create_user_id,create_time,update_user_id, + update_time + + diff --git a/src/main/resources/mapper/EvidenceDirectoryMapper.xml b/src/main/resources/mapper/EvidenceDirectoryMapper.xml new file mode 100644 index 0000000..04b726b --- /dev/null +++ b/src/main/resources/mapper/EvidenceDirectoryMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + id,case_id,directory_name, + category_id,parent_id,create_user_id, + create_time,update_user_id,update_time + + diff --git a/src/main/resources/mapper/EvidenceFileMapper.xml b/src/main/resources/mapper/EvidenceFileMapper.xml index 84cbba4..ba56044 100644 --- a/src/main/resources/mapper/EvidenceFileMapper.xml +++ b/src/main/resources/mapper/EvidenceFileMapper.xml @@ -8,6 +8,7 @@ + @@ -16,8 +17,8 @@ id,evidence_id,file_id, - create_user_id,create_time,update_user_id, - update_time + directory_id,create_user_id,create_time, + update_user_id,update_time