Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/hzims-big-model/src/main/resources/db/2.0.0.sql

@@ -63,3 +63,31 @@ CREATE TABLE IF NOT EXISTS `HZIMS_DATASOURCE` (
     PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='模型函数参数';
 
+-- 智谱大模型配置信息
+CREATE TABLE `hzims_analysis_info`  (
+    `ID` bigint(20) NOT NULL COMMENT '主键ID',
+    `CODE` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '策略编码',
+    `NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '策略名称',
+    `MODEL` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '调用模型名称',
+    `REQUEST_CONTENT` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模型交互内容',
+    `REQUEST_CONSTRAINS` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模型交互约束',
+    `REQUEST_OUTPUT_FORMAT` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '模型交互返回格式定义',
+    `RESULT_STRATEGY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '结果解析策略',
+    `RESULT_TYPE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '结果类型',
+    `RESULT_KEY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '结果查询key值',
+    `RESULT_CONDITION` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '结果对比内容',
+    `RESULT_JUDGE_MODEL` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '对比方式',
+    `CHECK_TYPE_SON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '对应字典表“AI识别类型”的key值',
+    `MESSAGE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '消息',
+    `TENANT_ID` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '租户ID',
+    `STATUS` tinyint(4) NULL DEFAULT NULL COMMENT '状态',
+    `CREATE_DEPT` bigint(20) NULL DEFAULT NULL COMMENT '创建单位',
+    `CREATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_USER` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
+    `UPDATE_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
+    `IS_DELETED` tinyint(4) NOT NULL COMMENT '是否删除',
+    `IS_REQUIRE` tinyint(2) NULL DEFAULT NULL COMMENT '是否必须',
+    PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '大模型分析信息' ROW_FORMAT = Dynamic;
+

hzims-service/inspect/src/main/resources/db/2.0.0.sql

@@ -233,4 +233,9 @@ ALTER TABLE `hz_st_ex_task_user` ADD COLUMN `user_name` varchar(255) CHARACTER S
 -- 巡检摄像头管理添加设备编号
 alter table `hz_st_robot` add column `station_code` varchar(50) default null comment '站点编号';
 alter table `hz_st_robot` add column `is_device_instance` tinyint(2) default 0 comment '是否绑定设备实例';
-alter table `hz_st_re_object` change COLUMN `EM_CODE` `EM_CODE` VARCHAR(50) COMMENT '设备编号';
+alter table `hz_st_re_object` change COLUMN `EM_CODE` `EM_CODE` VARCHAR(50) COMMENT '设备编号';
+-- 大模型分析增加多选字段
+ALTER TABLE `hz_st_re_content` ADD COLUMN `MULTI_CHECK_TYPE_SON` VARCHAR ( 255 ) NULL COMMENT '存字典表key 检测类型子类 多个数据之间使用逗号分隔开' AFTER `CHECK_TYPE_SON`;
+ALTER TABLE `hz_st_re_content_definition` ADD COLUMN `MULTI_CHECK_TYPE_SON` VARCHAR ( 255 ) NULL COMMENT '存字典表key 检测类型子类 多个数据之间使用逗号分隔开' AFTER `CHECK_TYPE_SON`;
+ALTER TABLE `hz_st_re_content` ADD COLUMN `ANALYSER_TYPE` VARCHAR ( 255 ) NULL COMMENT 'ai识别分析方式，设备或大模型' AFTER `MULTI_CHECK_TYPE_SON`;
+ALTER TABLE `hz_st_re_content_definition` ADD COLUMN `ANALYSER_TYPE` VARCHAR ( 255 ) NULL COMMENT 'ai识别分析方式，设备或大模型' AFTER `MULTI_CHECK_TYPE_SON`;