github/JeecgBoot
1
0
Fork 0
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-08-08 13:58:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

升级积木报表，支持报表和大屏的新版AI助手

Browse Source
This commit is contained in:
JEECG 2026-06-29 10:06:00 +08:00
parent c3099aba0d
commit faca0d058e
5 changed files with 129 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
jeecg-boot/db/jeecgboot-mysql-5.7.sql
View File

File diff suppressed because one or more lines are too long

6
jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -236,6 +236,12 @@ public class ShiroConfig {
registration.addUrlPatterns("/drag/onlDragDatasetHead/generateChartSse");
registration.addUrlPatterns("/drag/onlDragDatasetHead/updateChartOptSse");
registration.addUrlPatterns("/drag/onlDragDatasetHead/generateSqlSse");
//大屏AI生成/修改/讨论 SSE 接口的异步支持
registration.addUrlPatterns("/drag/page/aiGenerateScreenSse");
registration.addUrlPatterns("/drag/page/aiModifyScreenSse");
registration.addUrlPatterns("/drag/page/aiDiscussScreenSse");
registration.addUrlPatterns("/jmreport/ai/assistant/*");
registration.addUrlPatterns("/jimu/chat2bi/table-meta/syncTables");
//支持异步
registration.setAsyncSupported(true);
registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);

15
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

@ -327,7 +327,20 @@ jeecg:
#大屏报表参数设置
jmreport:
#多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
saasMode:
saasMode:
ai:
# OpenAI 兼容 base 地址（必填）
base-url: https://api.deepseek.com
# API Key（必填，留空则 AI 不可用）
api-key:
# 模型名
model: deepseek-v4-pro
#确定性输出，默认temperature=0
temperature: 0
#单次输出最大 token 数，DeepSeek 合法范围[1,393216]
max-tokens: 16384
# AI自动建表（安全警告: 此功能会直接操作数据库DDL/DML，生产环境请勿启用）
autoTableEnabled: false
# 平台上线安全配置(v1.6.2+ 新增)
firewall:
# 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)

29
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.9.2_1__upgrade_jimureport.sql Normal file
View File

@ -0,0 +1,29 @@
CREATE TABLE `chat2bi_table_meta` (
`id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键',
`db_source_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '数据源来源表标识, 如: db_source / api_source / file_source / system_source',
`db_source_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '对应来源表的主键ID',
`schema_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'Schema名',
`table_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '表名',
`source_comment` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '表注释-源(同步写入, 每次同步覆盖)',
`table_comment` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '表注释-用户(用户手动填写, 同步不覆盖)',
`columns_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '列定义[{name,type,source_comment,comment,is_primary,sample_values,nulltable}]',
`relations_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '关联关系[{column,ref_table,ref_column,type}]',
`is_enabled` tinyint(4) NOT NULL DEFAULT 1 COMMENT '对LLM可见: 0=否 1=是',
`synced_time` datetime NULL DEFAULT NULL COMMENT '最近同步时间',
`create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
`update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
`tenant_id` int(11) NULL DEFAULT NULL COMMENT '多租户标识',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `uk_source_table`(`db_source_type`, `db_source_id`, `schema_name`, `table_name`) USING BTREE,
INDEX `idx_source`(`db_source_type`, `db_source_id`) USING BTREE,
INDEX `idx_table_name`(`table_name`) USING BTREE,
INDEX `idx_table_name_comment`(`table_name`, `source_comment`(320), `table_comment`(320)) USING BTREE,
INDEX `idx_table_comment`(`table_comment`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '表元数据(同步+手动维护, 支持多数据源表)' ROW_FORMAT = DYNAMIC;
-- 修复错误接口数据
UPDATE onl_drag_dataset_head
SET query_sql = REPLACE(query_sql, 'https://apijeecgcom/', 'http://api.jeecg.com/')
WHERE query_sql LIKE '%https://apijeecgcom/%';

4
jeecg-boot/pom.xml
View File

@ -55,8 +55,8 @@
<dm8.version>8.1.3.140</dm8.version>
<!-- 积木报表-->
<jimureport-spring-boot-starter.version>2.3.4</jimureport-spring-boot-starter.version>
<jimubi-spring-boot-starter.version>2.3.2</jimubi-spring-boot-starter.version>
<jimureport-spring-boot-starter.version>2.5.0</jimureport-spring-boot-starter.version>
<jimubi-spring-boot-starter.version>2.5.0</jimubi-spring-boot-starter.version>
<minidao.version>1.10.20</minidao.version>
<autopoi-web.version>2.0.4</autopoi-web.version>