diff --git a/README.md b/README.md index 0187c7c..fca31d1 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,15 @@ ## 新特性 - 增加笔录和证据上传OCR识别功能 +- 首页数据统计接口 +- 日志输出规范配置 + +## 变更 +- 案件查询列表查询条件变更 + - 增加过滤条件已分析、未分析、全部 + - 增加按照分数排序的规则 +## 优化 +- 数据库提示词优化 ## 安装方式 @@ -66,6 +75,26 @@ CREATE TABLE `file_ocr_process` ( PRIMARY KEY (`id`), KEY `file_ocr_process_file_id_index` (`file_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='文件ocr识别进度表'; + + + +create table file_evidence_property +( + id varchar(64) not null comment '主键' + primary key, + evidence_id varchar(64) null comment '证据id', + file_id varchar(64) not null comment '文件id', + property_name varchar(128) null comment '属性名', + property_value varchar(512) not 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 file_evidence_property (evidence_id); ``` 2. 修改.env 和docker-compose-base.yml 文件 3. 加载镜像 paddleocr:v2.1 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7bbda40..612df7e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,14 +5,12 @@ spring: # 文档地址 https://docs.spring.io/spring-ai/reference/1.0-SNAPSHOT/api/chat/ollama-chat.html ollama: # base-url: http://113.128.242.110:11434 +# base-url: http://112.81.86.50:11434 base-url: http://192.168.10.70:11434 -# base-url: http://124.220.94.55:8060 chat: enabled: true options: - #model: qwen2:7b - model: llama3-chinese:8b -# model: qwen2:72b + model: qwen2:7b # 控制模型在请求后加载到内存中的时间(稍微长一点的时间,避免重复加载浪费性能,加快处理速度) keep_alive: 30m # 例如0.3 @@ -51,6 +49,9 @@ spring: log-slow-sql: true # 是否开启 慢SQL 记录,默认false slow-sql-millis: 5000 # 慢 SQL 的标准,默认 3000,单位:毫秒 merge-sql: false # 合并多个连接池的监控数据,默认false + socket-timeout: 60000 + query-timeout: 60000 + transaction-query-timeout: 60000 data: neo4j: database: neo4j diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6aa6b87..05778ac 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -45,6 +45,9 @@ spring: log-slow-sql: true # 是否开启 慢SQL 记录,默认false slow-sql-millis: 5000 # 慢 SQL 的标准,默认 3000,单位:毫秒 merge-sql: false # 合并多个连接池的监控数据,默认false + socket-timeout: 60000 + query-timeout: 60000 + transaction-query-timeout: 60000 data: neo4j: database: neo4j diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 973a541..de6f3cb 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -45,6 +45,9 @@ spring: log-slow-sql: true # 是否开启 慢SQL 记录,默认false slow-sql-millis: 5000 # 慢 SQL 的标准,默认 3000,单位:毫秒 merge-sql: false # 合并多个连接池的监控数据,默认false + socket-timeout: 60000 + query-timeout: 60000 + transaction-query-timeout: 60000 data: neo4j: database: neo4j diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 867a146..0353948 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,7 +16,7 @@ mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl call-setters-on-nulls: true server: port: 8097 @@ -28,9 +28,9 @@ case: fu-hsi-config: thread-pool: triple: - core: 2 + core: 1 type: - core: 2 + core: 1 logging: level: