[improvement][project] supersonic 0.7.2 version backend update (#28)

Co-authored-by: jipengli <jipengli@tencent.com>

chat/knowledge/src/main/resources/mapper/DictConfMapper.xml

@@ -5,9 +5,9 @@
 <mapper namespace="com.tencent.supersonic.knowledge.persistence.mapper.DictConfMapper">
 
     <resultMap id="DictConfPO"
-               type="com.tencent.supersonic.knowledge.persistence.dataobject.DictConfDO">
+            type="com.tencent.supersonic.knowledge.persistence.dataobject.DictConfDO">
         <id column="id" property="id"/>
-        <result column="domain_id" property="domainId"/>
+        <result column="model_id" property="modelId"/>
         <result column="dim_value_infos" property="dimValueInfos"/>
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
@@ -18,35 +18,35 @@
     <insert id="createDictConf">
         insert into s2_dictionary
         (`domain_id`, dim_value_infos, created_at, updated_at, created_by, updated_by)
-        values
-        (#{domainId}, #{dimValueInfos}, #{createdAt}, #{updatedAt}, #{createdBy}, #{updatedBy})
+        values (#{modelId}, #{dimValueInfos}, #{createdAt}, #{updatedAt}, #{createdBy},
+                #{updatedBy})
     </insert>
 
     <insert id="upsertDictInfo">
-         insert into s2_dictionary
-        (`domain_id`, dim_value_infos, created_at, updated_at, created_by, updated_by)
-        values
-        (#{domainId}, #{dimValueInfos}, #{createdAt}, #{updatedAt}, #{createdBy}, #{updatedBy})
-        on duplicate key update
-        dim_value_infos = #{dimValueInfos},
-        updated_at = #{updatedAt},
-        updated_by = #{updatedBy}
+        insert into s2_dictionary
+        (`model_id`, dim_value_infos, created_at, updated_at, created_by, updated_by)
+        values (#{modelId}, #{dimValueInfos}, #{createdAt}, #{updatedAt}, #{createdBy},
+                #{updatedBy}) on duplicate key
+        update
+            dim_value_infos = #{dimValueInfos},
+            updated_at = #{updatedAt},
+            updated_by = #{updatedBy}
     </insert>
 
     <update id="editDictConf">
         update s2_dictionary
         set dim_value_infos = #{dimValueInfos},
-        updated_at = #{updatedAt},
-        updated_by = #{updatedBy}
-        where domain_id = #{domainId}
-        and status = 0
+            updated_at      = #{updatedAt},
+            updated_by      = #{updatedBy}
+        where model_id = #{modelId}
+          and status = 0
     </update>
 
-    <select id="getDictInfoByDomainId" resultMap="DictConfPO">
+    <select id="getDictInfoByModelId" resultMap="DictConfPO">
         select *
         from s2_dictionary
-        where domain_id = #{domainId}
-        and status = 0
+        where model_id = #{modelId}
+          and status = 0
     </select>
 
 

chat/knowledge/src/main/resources/mapper/DictTaskMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.tencent.supersonic.knowledge.persistence.mapper.DictTaskMapper">
 
     <resultMap id="DimValueDictTaskPO"
-               type="com.tencent.supersonic.knowledge.persistence.dataobject.DictTaskDO">
+            type="com.tencent.supersonic.knowledge.persistence.dataobject.DictTaskDO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="description" property="description"/>
@@ -21,8 +21,8 @@
     <insert id="createDimValueTask">
         insert into s2_dictionary_task
         (`name`, description, command, command_md5, status, created_by, progress, elapsed_ms)
-        values
-        (#{name}, #{description}, #{command}, #{commandMd5}, #{status}, #{createdBy}, #{progress}, #{elapsedMs})
+        values (#{name}, #{description}, #{command}, #{commandMd5}, #{status}, #{createdBy},
+                #{progress}, #{elapsedMs})
     </insert>
 
     <update id="updateTaskStatus">
@@ -54,7 +54,7 @@
                 and id >= #{id}
             </if>
             <if test="name != null and name !=''">
-                and `name` like  "%"#{name}"%"
+                and `name` like "%"#{name}"%"
             </if>
             <if test="createdBy != null and createdBy !=''">
                 and created_by = #{createdBy}

chat/knowledge/src/main/resources/sql.ddl/s2_dictionary.sql

@@ -1,15 +1,40 @@
-CREATE TABLE IF NOT EXISTS `s2_dictionary` (
-`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-`item_id` bigint(20) DEFAULT NULL COMMENT '对应维度id、指标id等',
-`type` varchar(50) DEFAULT NULL COMMENT '对应维度、指标等',
-`black_list` mediumtext COMMENT '字典黑名单',
-`white_list` mediumtext COMMENT '字典白名单',
-`rule_list` mediumtext COMMENT '字典规则',
-`is_dict_Info` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1-开启写入字典，0-不开启',
-`created_at` datetime  NOT NULL COMMENT '创建时间',
-`updated_at` datetime  NOT NULL COMMENT '更新时间',
-`created_by` varchar(100) NOT NULL COMMENT '创建人',
-`updated_by` varchar(100) DEFAULT NULL COMMENT '更新人',
-`is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1-删除,0-可用',
-  PRIMARY KEY (`id`)
-) COMMENT='字典配置信息表'
+CREATE TABLE IF NOT EXISTS `s2_dictionary`
+(
+    `id` bigint
+(
+    20
+) unsigned NOT NULL AUTO_INCREMENT,
+    `item_id` bigint
+(
+    20
+) DEFAULT NULL COMMENT '对应维度id、指标id等',
+    `type` varchar
+(
+    50
+) DEFAULT NULL COMMENT '对应维度、指标等',
+    `black_list` mediumtext COMMENT '字典黑名单',
+    `white_list` mediumtext COMMENT '字典白名单',
+    `rule_list` mediumtext COMMENT '字典规则',
+    `is_dict_Info` tinyint
+(
+    1
+) NOT NULL DEFAULT '0' COMMENT '1-开启写入字典，0-不开启',
+    `created_at` datetime NOT NULL COMMENT '创建时间',
+    `updated_at` datetime NOT NULL COMMENT '更新时间',
+    `created_by` varchar
+(
+    100
+) NOT NULL COMMENT '创建人',
+    `updated_by` varchar
+(
+    100
+) DEFAULT NULL COMMENT '更新人',
+    `is_deleted` tinyint
+(
+    1
+) NOT NULL DEFAULT '0' COMMENT '1-删除,0-可用',
+    PRIMARY KEY
+(
+    `id`
+)
+    ) COMMENT='字典配置信息表'

chat/knowledge/src/main/resources/sql.ddl/s2_dictionary_task.sql

@@ -1,11 +1,33 @@
-CREATE TABLE IF NOT EXISTS `s2_dictionary_task` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL COMMENT '任务名称',
-  `description` varchar(255) NOT NULL COMMENT '任务描述',
-  `command` mediumtext  NOT NULL COMMENT '任务请求参数',
-  `status` int(10) NOT NULL COMMENT '任务最终运行状态',
-  `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `created_by` varchar(100) NOT NULL COMMENT '创建人',
-  `elapsed_ms` bigint(10) DEFAULT NULL COMMENT '任务耗时',
-  PRIMARY KEY (`id`)
-)COMMENT='字典任务信息表'
+CREATE TABLE IF NOT EXISTS `s2_dictionary_task`
+(
+    `id` bigint
+(
+    20
+) unsigned NOT NULL AUTO_INCREMENT,
+    `name` varchar
+(
+    255
+) NOT NULL COMMENT '任务名称',
+    `description` varchar
+(
+    255
+) NOT NULL COMMENT '任务描述',
+    `command` mediumtext NOT NULL COMMENT '任务请求参数',
+    `status` int
+(
+    10
+) NOT NULL COMMENT '任务最终运行状态',
+    `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `created_by` varchar
+(
+    100
+) NOT NULL COMMENT '创建人',
+    `elapsed_ms` bigint
+(
+    10
+) DEFAULT NULL COMMENT '任务耗时',
+    PRIMARY KEY
+(
+    `id`
+)
+    ) COMMENT='字典任务信息表'