diff --git a/docker/docker-compose/init.sql b/docker/docker-compose/init.sql index 9933ed0..0de3b99 100644 --- a/docker/docker-compose/init.sql +++ b/docker/docker-compose/init.sql @@ -75,7 +75,7 @@ CREATE TABLE `com_dictionary` ( `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型', `status` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '1' COMMENT '状态 0：不可用，1：可用', `note` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `priority` int(11) DEFAULT '0' COMMENT '顺序', + `priority` int(11) NULL DEFAULT 0 COMMENT '顺序', `creator` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', @@ -90,57 +90,57 @@ CREATE TABLE `com_dictionary` ( -- ---------------------------- -- Records of com_dictionary -- ---------------------------- -INSERT INTO `com_dictionary` VALUES (1, NULL, '案件类型', 0, 'case_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (2, '1', '工程类合同诈骗案', 1, 'case_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (3, NULL, '指标来源', 0, 'index_source', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (4, '1', '人工定义', 3, 'index_source', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (5, '2', '数据库查询', 3, 'index_source', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (6, '3', '图谱生成', 3, 'index_source', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (7, '4', '大模型', 3, 'index_source', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (8, NULL, '状态', 0, 'connect_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (9, '1', '已关联', 8, 'connect_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (10, '2', '未关联', 8, 'connect_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (11, NULL, '判断结果', 0, 'judge_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (14, '3', '存在', 11, 'judge_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (15, '4', '不存在', 11, 'judge_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (16, '5', '未知', 11, 'judge_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (17, NULL, '指标类别', 0, 'index_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (18, '1', '共性指标', 17, 'index_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (19, '2', '入罪指标', 17, 'index_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (20, '3', '出罪指标', 17, 'index_type', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (21, NULL, '作案方式', 0, 'crime_mode', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (22, '1', '自动投案', 21, 'crime_mode', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (23, NULL, '案件状态', 0, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (24, '1', '已立案', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (25, NULL, '认定结果', 0, 'identify_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (26, '1', '证据不足', 25, 'identify_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (27, '2', '事实不清', 25, 'identify_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (28, '3', '证据充分', 25, 'identify_result', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (29, NULL, '逻辑运算符', 0, 'logic_symbol', '1', NULL, NULL, NULL, '2024-07-06 15:10:29', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (30, '1', '且', 29, 'logic_symbol', '1', NULL, NULL, NULL, '2024-07-06 15:11:02', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (31, '2', '或', 29, 'logic_symbol', '1', NULL, NULL, NULL, '2024-07-06 15:11:38', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (32, NULL, '案件角色', 0, 'case_role', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (33, '1', '行为人', 32, 'case_role', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (34, '2', '嫌疑人', 32, 'case_role', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (35, '3', '受害人', 32, 'case_role', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (36, '4', '证人', 32, 'case_role', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (40, NULL, '证据类型', 0, 'evidence_type', '1', NULL, NULL, '2024-07-16 11:28:16', '2024-07-16 11:28:16', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (41, '1', '书证', 40, 'evidence_type', '1', NULL, NULL, '2024-07-16 11:34:18', '2024-07-16 11:34:18', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (42, '2', '物证', 40, 'evidence_type', '1', NULL, NULL, '2024-08-06 15:10:31', '2024-07-16 11:36:33', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (43, '3', '供述', 40, 'evidence_type', '1', NULL, NULL, '2024-08-06 15:23:35', '2024-07-16 11:36:43', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (45, '4', '电子数据', 40, 'evidence_type', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (46, '5', '鉴定意见', 40, 'evidence_type', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (47, '6', '证人证言', 40, 'evidence_type', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (48, '7', '视听资料', 40, 'evidence_type', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (49, '8', '勘验笔录', 40, 'evidence_type', '1', NULL, NULL, NULL, NULL, NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (50, '2', '已起诉', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (51, '3', '未批捕取保', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (52, '4', '未采取强制', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (53, '5', '已逮捕未起诉', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (54, '6', '直保', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (55, '7', '刑事拘留', 23, 'case_status', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (56, '2', '口头传唤', 21, 'crime_mode', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -INSERT INTO `com_dictionary` VALUES (57, '3', '强制传唤', 21, 'crime_mode', '1', NULL, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (1, NULL, '案件类型', 0, 'case_type', '1', '1', 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (2, '1', '工程类合同诈骗案', 1, 'case_type', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (3, NULL, '指标来源', 0, 'index_source', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (4, '1', '人工定义', 3, 'index_source', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (5, '2', '数据库查询', 3, 'index_source', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (6, '3', '图谱生成', 3, 'index_source', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (7, '4', '大模型', 3, 'index_source', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (8, NULL, '状态', 0, 'connect_status', '1', 'ere', 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (9, '1', '已关联', 8, 'connect_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (10, '2', '未关联', 8, 'connect_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (11, NULL, '判断结果', 0, 'judge_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (14, '3', '存在', 11, 'judge_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (15, '4', '不存在', 11, 'judge_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (16, '5', '未知', 11, 'judge_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (17, NULL, '指标类别', 0, 'index_type', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (18, '1', '共性指标', 17, 'index_type', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (19, '2', '入罪指标', 17, 'index_type', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (20, '3', '出罪指标', 17, 'index_type', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (21, NULL, '作案方式', 0, 'crime_mode', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (22, '1', '自动投案', 21, 'crime_mode', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (23, NULL, '案件状态', 0, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (24, '1', '已立案', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (25, NULL, '认定结果', 0, 'identify_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (26, '1', '证据不足', 25, 'identify_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (27, '2', '事实不清', 25, 'identify_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (28, '3', '证据充分', 25, 'identify_result', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (29, NULL, '逻辑运算符', 0, 'logic_symbol', '1', NULL, 0, NULL, NULL, '2024-07-06 15:10:29', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (30, '1', '且', 29, 'logic_symbol', '1', NULL, 0, NULL, '2024-08-26 15:53:36', '2024-07-06 15:11:02', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (31, '2', '或', 29, 'logic_symbol', '1', NULL, 0, NULL, NULL, '2024-07-06 15:11:38', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (32, NULL, '案件角色', 0, 'case_role', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (33, '1', '行为人', 32, 'case_role', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (34, '2', '嫌疑人', 32, 'case_role', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (35, '3', '受害人', 32, 'case_role', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (36, '4', '证人', 32, 'case_role', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (40, NULL, '证据类型', 0, 'evidence_type', '1', NULL, 0, NULL, '2024-07-16 11:28:16', '2024-07-16 11:28:16', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (41, '1', '书证', 40, 'evidence_type', '1', NULL, 0, NULL, '2024-07-16 11:34:18', '2024-07-16 11:34:18', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (42, '2', '物证', 40, 'evidence_type', '1', NULL, 0, NULL, '2024-08-06 15:10:31', '2024-07-16 11:36:33', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (43, '3', '供述', 40, 'evidence_type', '1', NULL, 0, NULL, '2024-08-06 15:23:35', '2024-07-16 11:36:43', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (45, '4', '电子数据', 40, 'evidence_type', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (46, '5', '鉴定意见', 40, 'evidence_type', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (47, '6', '证人证言', 40, 'evidence_type', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (48, '7', '视听资料', 40, 'evidence_type', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (49, '8', '勘验笔录', 40, 'evidence_type', '1', NULL, 0, NULL, NULL, NULL, NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (50, '2', '已起诉', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (51, '3', '未批捕取保', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (52, '4', '未采取强制', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (53, '5', '已逮捕未起诉', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (54, '6', '直保', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (55, '7', '刑事拘留', 23, 'case_status', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (56, '2', '口头传唤', 21, 'crime_mode', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); +INSERT INTO `com_dictionary` VALUES (57, '3', '强制传唤', 21, 'crime_mode', '1', NULL, 0, NULL, NULL, '2024-07-01 11:24:22', NULL, '1', NULL, NULL); -- ---------------------------- -- Table structure for evidence_file diff --git a/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java index 25ab937..e9dabab 100644 --- a/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ExtractTripleInfoServiceImpl.java @@ -37,7 +37,6 @@ public class ExtractTripleInfoServiceImpl implements ExtractTripleInfoService { private NoteRecordSplitService noteRecordSplitService; - @Async @Transactional(transactionManager = "dataSourceTransactionManager", rollbackFor = Exception.class) public void extractTripleInfo(String caseId, String name, String recordSplitId) { // 首先获取所有切分后的笔录 diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordServiceImpl.java index 8ad4441..54f3720 100644 --- a/src/main/java/com/supervision/police/service/impl/NoteRecordServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/NoteRecordServiceImpl.java @@ -105,6 +105,12 @@ public class NoteRecordServiceImpl extends ServiceImpl