From 830a5b146495ea7970dc4ceb4793c919320c95fa Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 8 Jul 2024 15:27:02 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E8=A1=8C=E6=9D=83=E9=99=90=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=98=E9=87=8F=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dataset/manage/PermissionManage.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
index 0477ea743e..78a7019ece 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java
@@ -195,15 +195,22 @@ public class PermissionManage {
                 DatasetRowPermissionsTreeObj tree = JsonUtil.parseObject(record.getExpressionTree(), DatasetRowPermissionsTreeObj.class);
                 List<DatasetRowPermissionsTreeItem> items = new ArrayList<>();
                 for (DatasetRowPermissionsTreeItem datasetRowPermissionsTreeItem : tree.getItems()) {
-                    if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userId}")) {
+                    if (StringUtils.isNotEmpty(userEntity.getAccount()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userId}")) {
                         datasetRowPermissionsTreeItem.setValue(userEntity.getAccount());
+                        items.add(datasetRowPermissionsTreeItem);
+                        continue;
                     }
-                    if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userEmail}")) {
+                    if (StringUtils.isNotEmpty(userEntity.getEmail()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userEmail}")) {
                         datasetRowPermissionsTreeItem.setValue(userEntity.getEmail());
+                        items.add(datasetRowPermissionsTreeItem);
+                        continue;
                     }
-                    if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("\\$\\{sysParams\\.userName}")) {
+                    if (StringUtils.isNotEmpty(userEntity.getName()) && datasetRowPermissionsTreeItem.getValue().equalsIgnoreCase("${sysParams.userName}")) {
                         datasetRowPermissionsTreeItem.setValue(userEntity.getName());
+                        items.add(datasetRowPermissionsTreeItem);
+                        continue;
                     }
+
                     String value = handleSysVariable(userEntity, datasetRowPermissionsTreeItem.getValue());
                     if (value == null) {
                         continue;

From ef2d3e4f3cc53c0bdd95cef8aec353f08bf550d3 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 8 Jul 2024 15:51:00 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=20=E5=B5=8C=E5=85=A5=E5=BC=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=87=B3=E6=9C=AC=E5=9C=B0=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B0=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/chart/components/js/util.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/util.ts b/core/core-frontend/src/views/chart/components/js/util.ts
index 281397d5ac..222d2eba12 100644
--- a/core/core-frontend/src/views/chart/components/js/util.ts
+++ b/core/core-frontend/src/views/chart/components/js/util.ts
@@ -4,7 +4,7 @@ import { equalsAny, includesAny } from '../editor/util/StringUtils'
 import { FeatureCollection } from '@antv/l7plot/dist/esm/plots/choropleth/types'
 import { useMapStoreWithOut } from '@/store/modules/map'
 import { getGeoJson } from '@/api/map'
-import { toRaw } from 'vue'
+import { computed, toRaw } from 'vue'
 import { Options } from '@antv/g2plot/esm'
 import { PickOptions } from '@antv/g2plot/esm/core/plot'
 import { innerExportDetails } from '@/api/chart'
@@ -12,6 +12,8 @@ import { ElMessage } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useLinkStoreWithOut } from '@/store/modules/link'
 
+const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
+
 const { t } = useI18n()
 // 同时支持将hex和rgb，转换成rgba
 export function hexColorToRGBA(hex, alpha) {
@@ -511,7 +513,7 @@ export const exportExcelDownload = (chart, callBack?) => {
 
   innerExportDetails(request)
     .then(res => {
-      if (linkStore.getLinkToken) {
+      if (linkStore.getLinkToken || isDataEaseBi.value) {
         const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
         const link = document.createElement('a')
         link.style.display = 'none'

From 14d7cdaf7b23fb7e4307b3bcd1acb72149067c92 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 8 Jul 2024 17:31:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E6=97=A0=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 6295001ace..9695ff5848 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 6295001ace48d7ca800b42bab215c85a4cb4e4fa
+Subproject commit 9695ff58484674dc2e1ba81d564224fc12dad9eb

From 01c63652ef823ef47747abb48bf2bcb2d1ae980f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 8 Jul 2024 18:09:50 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E5=9B=BE=E7=89=87=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=91=E5=AE=9A=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E7=AD=89=E5=B9=B6=E7=94=B1?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=BB=84=E4=BB=B6=E7=82=B9=E5=87=BB=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/RealTimeTreeGather.vue | 11 ++++
 .../canvas/ComponentWrapper.vue               | 11 ++--
 .../canvas/ContextMenuDetails.vue             | 13 ++++-
 .../custom-component/common/CommonAttr.vue    | 14 +++++
 .../custom-component/common/CommonEvent.vue   | 56 +++++++++++++++++++
 .../src/custom-component/component-list.ts    | 15 ++++-
 .../custom-component/picture/Component.vue    | 13 ++++-
 .../store/modules/data-visualization/event.ts | 11 +++-
 core/core-frontend/src/utils/canvasUtils.ts   |  7 +++
 9 files changed, 141 insertions(+), 10 deletions(-)
 create mode 100644 core/core-frontend/src/components/data-visualization/RealTimeTreeGather.vue
 create mode 100644 core/core-frontend/src/custom-component/common/CommonEvent.vue

diff --git a/core/core-frontend/src/components/data-visualization/RealTimeTreeGather.vue b/core/core-frontend/src/components/data-visualization/RealTimeTreeGather.vue
new file mode 100644
index 0000000000..0a8d203dd1
--- /dev/null
+++ b/core/core-frontend/src/components/data-visualization/RealTimeTreeGather.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index a7a7520bb3..c06fd71c1e 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -113,11 +113,12 @@ onMounted(() => {
 })
 
 const onClick = () => {
-  const events = config.value.events
-  Object.keys(events).forEach(event => {
-    currentInstance.ctx[event](events[event])
-  })
-  eventBus.emit('v-click', config.value.id)
+  // do event click
+  // const events = config.value.events
+  // Object.keys(events).forEach(event => {
+  //   currentInstance.ctx[event](events[event])
+  // })
+  // eventBus.emit('v-click', config.value.id)
 }
 
 const getComponentStyleDefault = style => {
diff --git a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
index 4f258f4683..4936baf5c3 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
@@ -80,7 +80,12 @@ const show = () => {
   layerStore.showComponent()
   menuOpt('show')
 }
-
+const categoryChange = type => {
+  if (curComponent.value) {
+    snapshotStore.recordSnapshotCache()
+    curComponent.value['category'] = type
+  }
+}
 const rename = () => {
   emit('rename')
   menuOpt('rename')
@@ -222,6 +227,12 @@ const editQueryCriteria = () => {
           <el-divider class="custom-divider" />
           <li @click="hide" v-show="curComponent['isShow']">隐藏</li>
           <li @click="show" v-show="!curComponent['isShow']">取消隐藏</li>
+          <li @click="categoryChange('hidden')" v-show="curComponent['category'] === 'base'">
+            转为隐藏组件
+          </li>
+          <li @click="categoryChange('base')" v-show="curComponent['category'] === 'hidden'">
+            转为基础组件
+          </li>
           <li @click="lock">锁定</li>
           <el-divider class="custom-divider" />
           <li v-if="activePosition === 'aside'" @click="rename">重命名</li>
diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index 5ab4fd0063..6bad08932a 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -9,6 +9,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import CommonStyleSet from '@/custom-component/common/CommonStyleSet.vue'
+import CommonEvent from '@/custom-component/common/CommonEvent.vue'
 const snapshotStore = snapshotStoreWithOut()
 
 const { t } = useI18n()
@@ -87,6 +88,10 @@ const colorPickerWidth = computed(() => {
   }
 })
 
+const eventsShow = computed(() => {
+  return !dashboardActive.value && ['Picture'].includes(element.value.component)
+})
+
 const backgroundCustomShow = computed(() => {
   return (
     dashboardActive.value ||
@@ -149,6 +154,15 @@ const stopEvent = e => {
           :element="element"
         ></common-style-set>
       </el-collapse-item>
+      <el-collapse-item
+        v-if="element && element.events && eventsShow"
+        :effect="themes"
+        title="事件"
+        name="style"
+        class="common-style-area"
+      >
+        <common-event :themes="themes" :element="element"></common-event>
+      </el-collapse-item>
     </el-collapse>
   </div>
 </template>
diff --git a/core/core-frontend/src/custom-component/common/CommonEvent.vue b/core/core-frontend/src/custom-component/common/CommonEvent.vue
new file mode 100644
index 0000000000..1961804252
--- /dev/null
+++ b/core/core-frontend/src/custom-component/common/CommonEvent.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { computed, toRefs } from 'vue'
+import { ElFormItem } from 'element-plus-secondary'
+import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
+
+const snapshotStore = snapshotStoreWithOut()
+
+const props = withDefaults(
+  defineProps<{
+    themes?: EditorTheme
+    element: any
+  }>(),
+  {
+    themes: 'dark'
+  }
+)
+const { themes, element } = toRefs(props)
+
+const eventsInfo = computed(() => {
+  return element.value.events
+})
+
+const onEventChange = () => {
+  snapshotStore.recordSnapshotCache('renderChart')
+}
+</script>
+
+<template>
+  <el-row class="custom-row">
+    <el-form label-position="top">
+      <el-form-item class="form-item" :class="'form-item-' + themes">
+        <el-checkbox
+          :effect="themes"
+          size="small"
+          v-model="eventsInfo.checked"
+          @change="onEventChange"
+          >开启事件绑定</el-checkbox
+        >
+      </el-form-item>
+
+      <el-form-item class="form-item" :class="'form-item-' + themes" style="margin-bottom: 8px">
+        <el-radio-group
+          :effect="themes"
+          v-model="eventsInfo.type"
+          class="radio-span"
+          @change="onEventChange"
+        >
+          <el-radio label="displayChange" :effect="themes"> 开启隐藏组件 </el-radio>
+          <el-radio label="jump" :effect="themes"> 跳转 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+  </el-row>
+</template>
+
+<style scoped lang="less"></style>
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 1bc0c1488a..5f39561fd0 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -8,6 +8,18 @@ export const commonStyle = {
   opacity: 1
 }
 
+export const BASE_EVENTS = {
+  checked: false,
+  type: 'displayChange', // openHidden  jump
+  jump: {
+    value: null
+  },
+  displayChange: {
+    value: true, // 事件当前值 false
+    target: 'all'
+  }
+}
+
 // 流媒体视频信息配置
 export const STREAMMEDIALINKS = {
   videoType: 'flv',
@@ -159,12 +171,13 @@ export const COMMON_COMPONENT_BACKGROUND_MAP = {
 export const commonAttr = {
   animations: [],
   canvasId: 'canvas-main',
-  events: {},
+  events: BASE_EVENTS,
   groupStyle: {}, // 当一个组件成为 Group 的子组件时使用
   isLock: false, // 是否锁定组件
   maintainRadio: false, // 布局时保持宽高比例
   aspectRatio: 1, // 锁定时的宽高比例
   isShow: true, // 是否显示组件
+  category: 'base', //组件类型 base 基础组件 hidden隐藏组件
   // 当前组件动作
   dragging: false,
   resizing: false,
diff --git a/core/core-frontend/src/custom-component/picture/Component.vue b/core/core-frontend/src/custom-component/picture/Component.vue
index cb1a13f241..293258deeb 100644
--- a/core/core-frontend/src/custom-component/picture/Component.vue
+++ b/core/core-frontend/src/custom-component/picture/Component.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pic-main">
+  <div class="pic-main" @click="onPictureClick">
     <img
       draggable="false"
       v-if="propValue['url']"
@@ -20,6 +20,8 @@
 import { CSSProperties, computed, nextTick, toRefs } from 'vue'
 import { imgUrlTrans } from '@/utils/imgUtils'
 import eventBus from '@/utils/eventBus'
+import { eventStoreWithOut } from '@/store/modules/data-visualization/event'
+const eventStore = eventStoreWithOut()
 const props = defineProps({
   propValue: {
     type: String,
@@ -52,7 +54,14 @@ const imageAdapter = computed(() => {
   }
   return style as CSSProperties
 })
-
+const onPictureClick = e => {
+  if (element.value.events && element.value.events.checked) {
+    if (element.value.events.type === 'displayChange') {
+      // 打开隐藏组件
+      eventStore.displayEventChange(element.value)
+    }
+  }
+}
 const uploadImg = () => {
   nextTick(() => {
     eventBus.emit('uploadImg')
diff --git a/core/core-frontend/src/store/modules/data-visualization/event.ts b/core/core-frontend/src/store/modules/data-visualization/event.ts
index 887820bdfd..0f423ba002 100644
--- a/core/core-frontend/src/store/modules/data-visualization/event.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/event.ts
@@ -3,7 +3,7 @@ import { store } from '../../index'
 import { dvMainStoreWithOut } from './dvMain'
 
 const dvMainStore = dvMainStoreWithOut()
-const { curComponent } = storeToRefs(dvMainStore)
+const { curComponent, componentData } = storeToRefs(dvMainStore)
 
 export const eventStore = defineStore('event', {
   actions: {
@@ -13,6 +13,15 @@ export const eventStore = defineStore('event', {
 
     removeEvent(event) {
       delete curComponent.value.events[event]
+    },
+
+    displayEventChange(component) {
+      component.events.displayChange.value = !component.events.displayChange.value
+      componentData.value.forEach(item => {
+        if (item.category === 'hidden') {
+          item.isShow = component.events.displayChange.value
+        }
+      })
     }
   }
 })
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 19f6f606c5..259ee9bfba 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -1,6 +1,7 @@
 import { cloneDeep } from 'lodash-es'
 import componentList, {
   ACTION_SELECTION,
+  BASE_EVENTS,
   COMMON_COMPONENT_BACKGROUND_DARK,
   COMMON_COMPONENT_BACKGROUND_LIGHT
 } from '@/custom-component/component-list'
@@ -153,6 +154,12 @@ export function historyAdaptor(
     if ((!canvasVersion || canvasVersion === 2) && canvasInfo.type === 'dashboard') {
       matrixAdaptor(componentItem)
     }
+    // 组件事件适配
+    componentItem.events =
+      componentItem.events && componentItem.events.checked !== undefined
+        ? componentItem.events
+        : deepCopy(BASE_EVENTS)
+    componentItem['category'] = componentItem['category'] || 'base'
   })
 }
 

From 4bd3dbcd7516aab5dac6344931be284978563a4b Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Mon, 8 Jul 2024 19:16:27 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1=20#9589?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts       |  2 +
 .../src/models/chart/chart-attr.d.ts          |  8 +++
 .../components/editor/common/TableTooltip.vue | 39 +++++++++--
 .../components/BasicStyleSelector.vue         | 27 +++++++
 .../chart/components/editor/util/chart.ts     |  4 +-
 .../js/panel/charts/table/table-normal.ts     | 70 ++++++++++++++++---
 .../components/js/panel/types/impl/s2.ts      |  4 ++
 .../views/components/ChartComponentS2.vue     |  1 -
 8 files changed, 138 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index c1e0b56671..4a0f3732f1 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -733,6 +733,8 @@ export default {
     table_show_col_tooltip: '开启列头提示',
     table_show_cell_tooltip: '开启单元格提示',
     table_show_header_tooltip: '开启表头提示',
+    table_show_summary: '显示总计',
+    table_summary_label: '总计标签',
     stripe: '斑马纹',
     start_angle: '起始角度',
     end_angle: '结束角度',
diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts
index b725a79615..a056b401cd 100644
--- a/core/core-frontend/src/models/chart/chart-attr.d.ts
+++ b/core/core-frontend/src/models/chart/chart-attr.d.ts
@@ -256,6 +256,14 @@ declare interface ChartBasicStyle {
    * 对称柱状图方向
    */
   layout?: 'horizontal' | 'vertical'
+  /**
+   * 汇总表显示总计
+   */
+  showSummary: boolean
+  /**
+   * 汇总表总计标签
+   */
+  summaryLabel: string
 }
 /**
  * 表头属性
diff --git a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
index 48640d00f2..0bf1d5fc43 100644
--- a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
+++ b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue
@@ -2,8 +2,9 @@
 import { SpreadSheet, Node } from '@antv/s2'
 import { PropType } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
-import { S2Event } from '@antv/s2'
+import { S2Event, SortFuncParam } from '@antv/s2'
 import { SortUp, SortDown, Sort } from '@element-plus/icons-vue'
+import { cloneDeep } from 'lodash-es'
 
 const { t } = useI18n()
 const props = defineProps({
@@ -12,15 +13,45 @@ const props = defineProps({
     required: true
   },
   meta: {
-    type: Object as PropType<Node>
+    type: Object as PropType<Node>,
+    required: true
   }
 })
-const sort = type => {
+const sortFunc = (sortParams: SortFuncParam) => {
+  if (!sortParams.sortMethod) {
+    return sortParams.data
+  }
+  const data = cloneDeep(sortParams.data)
+  return data.sort((a, b) => {
+    // 总计行放最后
+    if (a['SUMMARY']) {
+      return 1
+    }
+    const field = sortParams.sortFieldId
+    const aValue = a[field]
+    const bValue = b[field]
+    if (aValue === bValue) {
+      return 0
+    }
+    if (sortParams.sortMethod === 'asc') {
+      if (typeof aValue === 'number') {
+        return aValue - bValue
+      }
+      return aValue < bValue ? 1 : -1
+    }
+    if (typeof aValue === 'number') {
+      return bValue - aValue
+    }
+    return aValue > bValue ? 1 : -1
+  })
+}
+const sort = (type?) => {
   props.table.updateSortMethodMap(props.meta.field, type, true)
   props.table.emit(S2Event.RANGE_SORT, [
     {
       sortFieldId: props.meta.field,
-      sortMethod: type
+      sortMethod: type,
+      sortFunc
     }
   ])
 }
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 11a9ada0f6..fd8a3694bf 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -957,6 +957,33 @@ onMounted(() => {
         <template #append>%</template>
       </el-input>
     </el-form-item>
+    <el-form-item
+      v-if="showProperty('showSummary')"
+      class="form-item"
+      :class="'form-item-' + themes"
+    >
+      <el-checkbox
+        size="small"
+        :effect="themes"
+        v-model="state.basicStyleForm.showSummary"
+        @change="changeBasicStyle('showSummary')"
+      >
+        {{ t('chart.table_show_summary') }}
+      </el-checkbox>
+    </el-form-item>
+    <el-form-item
+      v-if="showProperty('summaryLabel') && state.basicStyleForm.showSummary"
+      :label="$t('chart.table_summary_label')"
+      :class="'form-item-' + themes"
+      class="form-item"
+    >
+      <el-input
+        v-model="state.basicStyleForm.summaryLabel"
+        type="text"
+        :max-length="10"
+        @blur="changeBasicStyle('summaryLabel')"
+      />
+    </el-form-item>
     <!--table2 end-->
     <!--gauge start-->
     <el-form-item
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 895ee6b5ea..b48d6d62b7 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -1483,7 +1483,9 @@ export const DEFAULT_BASIC_STYLE: ChartBasicStyle = {
   topN: 5,
   topNLabel: '其他',
   gaugeAxisLine: true,
-  gaugePercentLabel: true
+  gaugePercentLabel: true,
+  showSummary: false,
+  summaryLabel: '总计'
 }
 
 export const BASE_VIEW_CONFIG = {
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
index ee9ee2d3d2..f1aafb80ab 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts
@@ -1,15 +1,11 @@
-import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2'
-import { S2Event, S2Options, TableSheet, TableColCell, ViewMeta, TableDataCell } from '@antv/s2'
-import { parseJson } from '@/views/chart/components/js/util'
-import { formatterItem, valueFormatter } from '@/views/chart/components/js/formatter'
-import {
-  copyContent,
-  getCurrentField,
-  SortTooltip
-} from '@/views/chart/components/js/panel/common/common_table'
-import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common'
 import { useI18n } from '@/hooks/web/useI18n'
+import { formatterItem, valueFormatter } from '@/views/chart/components/js/formatter'
+import { copyContent, SortTooltip } from '@/views/chart/components/js/panel/common/common_table'
+import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2'
+import { parseJson } from '@/views/chart/components/js/util'
+import { S2Event, S2Options, TableColCell, TableDataCell, TableSheet, ViewMeta } from '@antv/s2'
 import { isNumber } from 'lodash-es'
+import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common'
 
 const { t } = useI18n()
 /**
@@ -17,12 +13,17 @@ const { t } = useI18n()
  */
 export class TableNormal extends S2ChartView<TableSheet> {
   properties = TABLE_EDITOR_PROPERTY
-  propertyInner = {
+  propertyInner: EditorPropertyInner = {
     ...TABLE_EDITOR_PROPERTY_INNER,
     'table-header-selector': [
       ...TABLE_EDITOR_PROPERTY_INNER['table-header-selector'],
       'tableHeaderSort',
       'showTableHeader'
+    ],
+    'basic-style-selector': [
+      ...TABLE_EDITOR_PROPERTY_INNER['basic-style-selector'],
+      'showSummary',
+      'summaryLabel'
     ]
   }
   axis: AxisType[] = ['xAxis', 'yAxis', 'drill', 'filter']
@@ -160,6 +161,43 @@ export class TableNormal extends S2ChartView<TableSheet> {
       // header interaction
       this.configHeaderInteraction(chart, s2Options)
     }
+
+    // 总计
+    if (customAttr.basicStyle.showSummary) {
+      // 设置汇总行高度和表头一致
+      const heightByField = {}
+      heightByField[newData.length] = customAttr.tableHeader.tableTitleHeight
+      s2Options.style.rowCfg = { heightByField }
+      // 计算汇总加入到数据里，冻结最后一行
+      s2Options.frozenTrailingRowCount = 1
+      const yAxis = chart.yAxis
+      const xAxis = chart.xAxis
+      const summaryObj = newData.reduce(
+        (p, n) => {
+          yAxis.forEach(axis => {
+            p[axis.dataeaseName] = (n[axis.dataeaseName] || 0) + (p[axis.dataeaseName] || 0)
+          })
+          return p
+        },
+        { SUMMARY: true }
+      )
+      newData.push(summaryObj)
+      s2Options.dataCell = viewMeta => {
+        if (viewMeta.rowIndex !== newData.length - 1) {
+          return new TableDataCell(viewMeta, viewMeta.spreadsheet)
+        }
+        if (viewMeta.colIndex === 0) {
+          if (customAttr.tableHeader.showIndex) {
+            viewMeta.fieldValue = customAttr.basicStyle.summaryLabel ?? '总计'
+          } else {
+            if (xAxis.length) {
+              viewMeta.fieldValue = customAttr.basicStyle.summaryLabel ?? '总计'
+            }
+          }
+        }
+        return new SummaryCell(viewMeta, viewMeta.spreadsheet)
+      }
+    }
     // 开始渲染
     const newChart = new TableSheet(containerDom, s2DataConfig, s2Options)
 
@@ -211,3 +249,13 @@ export class TableNormal extends S2ChartView<TableSheet> {
     super('table-normal', [])
   }
 }
+
+class SummaryCell extends TableDataCell {
+  getTextStyle() {
+    return this.theme.colCell.bolderText
+  }
+  getBackgroundColor() {
+    const { backgroundColor, backgroundColorOpacity } = this.theme.colCell.cell
+    return { backgroundColor, backgroundColorOpacity }
+  }
+}
diff --git a/core/core-frontend/src/views/chart/components/js/panel/types/impl/s2.ts b/core/core-frontend/src/views/chart/components/js/panel/types/impl/s2.ts
index 3188b96972..05cedb33a6 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/types/impl/s2.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/types/impl/s2.ts
@@ -69,6 +69,10 @@ export abstract class S2ChartView<P extends SpreadSheet> extends AntVAbstractCha
     let field
     switch (cell.cellType) {
       case 'dataCell':
+        if (meta.valueField === SERIES_NUMBER_FIELD) {
+          content = meta.fieldValue
+          break
+        }
         field = find(metaConfig, item => item.field === meta.valueField)
         if (meta.fieldValue === 0) {
           content = '0'
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 234193682c..3917c5d975 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -116,7 +116,6 @@ const calcData = (view: Chart, callback, resetPageInfo = true) => {
   } else {
     delete view.chartExtRequest.pageSize
   }
-  console.log(view)
   if (view.tableId || view['dataFrom'] === 'template') {
     isError.value = false
     const v = JSON.parse(JSON.stringify(view))

From 49c3e012d811a81eb1c19434df62ed13e762d91d Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 9 Jul 2024 11:27:47 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=80=8F=E8=A7=86=E8=A1=A8=E8=AE=A1=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B1=87=E6=80=BB=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=20#10499?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/js/panel/charts/table/table-pivot.ts    | 10 +++++-----
 .../chart/components/js/panel/common/common_table.ts   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
index 55fcd7eb23..5aeb7911da 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
@@ -344,30 +344,30 @@ function customCalcFunc(query, data, totalCfgMap) {
   switch (aggregation) {
     case 'SUM': {
       return data.reduce((p, n) => {
-        return p + n[query[EXTRA_FIELD]]
+        return p + parseFloat(n[query[EXTRA_FIELD]])
       }, 0)
     }
     case 'AVG': {
       const sum = data.reduce((p, n) => {
-        return p + n[query[EXTRA_FIELD]]
+        return p + parseFloat(n[query[EXTRA_FIELD]])
       }, 0)
       return sum / data.length
     }
     case 'MIN': {
       const result = minBy(data, n => {
-        return n[query[EXTRA_FIELD]]
+        return parseFloat(n[query[EXTRA_FIELD]])
       })
       return result?.[query[EXTRA_FIELD]]
     }
     case 'MAX': {
       const result = maxBy(data, n => {
-        return n[query[EXTRA_FIELD]]
+        return parseFloat(n[query[EXTRA_FIELD]])
       })
       return result?.[query[EXTRA_FIELD]]
     }
     default: {
       return data.reduce((p, n) => {
-        return p + n[query[EXTRA_FIELD]]
+        return p + parseFloat(n[query[EXTRA_FIELD]])
       }, 0)
     }
   }
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index fd3aca5f28..6e48c50c4c 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -598,7 +598,7 @@ export function mappingColor(value, defaultColor, field, type) {
 }
 
 export function handleTableEmptyStrategy(chart: Chart) {
-  let newData = chart.data?.tableRow as Record<string, any>[]
+  let newData = (chart.data?.tableRow || []) as Record<string, any>[]
   let intersectionArr = []
   const senior = parseJson(chart.senior)
   let emptyDataStrategy = senior?.functionCfg?.emptyDataStrategy

From 1020d2375b32a6ee1445f69f6662a8c6dedeba4a Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 9 Jul 2024 11:48:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Ecopilot=E6=89=80?=
 =?UTF-8?q?=E9=9C=80=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/copilot/api/CopilotAPI.java   | 104 +++++
 .../dao/auto/entity/CoreCopilotConfig.java    |  71 ++++
 .../dao/auto/entity/CoreCopilotMsg.java       | 276 +++++++++++++
 .../dao/auto/entity/CoreCopilotToken.java     |  74 ++++
 .../auto/mapper/CoreCopilotConfigMapper.java  |  18 +
 .../dao/auto/mapper/CoreCopilotMsgMapper.java |  18 +
 .../auto/mapper/CoreCopilotTokenMapper.java   |  18 +
 .../copilot/manage/CopilotManage.java         | 377 ++++++++++++++++++
 .../io/dataease/copilot/manage/MsgManage.java | 100 +++++
 .../dataease/copilot/manage/TokenManage.java  |  36 ++
 .../copilot/service/CopilotService.java       |  40 ++
 .../main/resources/db/migration/V2.9__ddl.sql |  48 +++
 .../io/dataease/api/copilot/CopilotApi.java   |  30 ++
 .../io/dataease/api/copilot/dto/AxisDTO.java  |  12 +
 .../io/dataease/api/copilot/dto/ChartDTO.java |  13 +
 .../api/copilot/dto/DEReceiveDTO.java         |  13 +
 .../dataease/api/copilot/dto/DESendDTO.java   |  16 +
 .../dataease/api/copilot/dto/HistoryDTO.java  |  12 +
 .../io/dataease/api/copilot/dto/MsgDTO.java   |  53 +++
 .../dataease/api/copilot/dto/ReceiveDTO.java  |  18 +
 .../io/dataease/api/copilot/dto/SendDTO.java  |  16 +
 .../io/dataease/api/copilot/dto/TokenDTO.java |  16 +
 22 files changed, 1379 insertions(+)
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java
 create mode 100644 core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java
 create mode 100644 core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java

diff --git a/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java b/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java
new file mode 100644
index 0000000000..f46c204c17
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/api/CopilotAPI.java
@@ -0,0 +1,104 @@
+package io.dataease.copilot.api;
+
+import io.dataease.api.copilot.dto.ReceiveDTO;
+import io.dataease.api.copilot.dto.SendDTO;
+import io.dataease.copilot.dao.auto.entity.CoreCopilotConfig;
+import io.dataease.copilot.dao.auto.mapper.CoreCopilotConfigMapper;
+import io.dataease.exception.DEException;
+import io.dataease.utils.HttpClientConfig;
+import io.dataease.utils.HttpClientUtil;
+import io.dataease.utils.JsonUtil;
+import jakarta.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.json.simple.JSONObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Base64;
+import java.util.Map;
+
+/**
+ * @Author Junjun
+ */
+@Component
+public class CopilotAPI {
+
+    public static final String TOKEN = "/auth/token/license";
+
+    public static final String FREE_TOKEN = "/auth/token/free";
+
+    public static final String API = "/copilot/v1";
+
+    public static final String CHART = "/generate-chart";
+
+    public static final String RATE_LIMIT = "/rate-limit";
+
+    @Resource
+    private CoreCopilotConfigMapper coreCopilotConfigMapper;
+
+    public String basicAuth(String userName, String password) {
+        String auth = userName + ":" + password;
+        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
+        return "Basic " + encodedAuth;
+    }
+
+    public String bearerAuth(String token) {
+        return "Bearer " + token;
+    }
+
+    public CoreCopilotConfig getConfig() {
+        CoreCopilotConfig coreCopilotConfig = coreCopilotConfigMapper.selectById(1);
+        coreCopilotConfig.setPwd(new String(Base64.getDecoder().decode(coreCopilotConfig.getPwd())));
+        return coreCopilotConfig;
+    }
+
+    public String getToken(String license) throws Exception {
+        String url = getConfig().getCopilotUrl() + TOKEN;
+        JSONObject json = new JSONObject();
+        json.put("licenseText", license);
+        HttpClientConfig httpClientConfig = new HttpClientConfig();
+        httpClientConfig.addHeader("Authorization", basicAuth(getConfig().getUsername(), getConfig().getPwd()));
+        String tokenJson = HttpClientUtil.post(url, json.toString(), httpClientConfig);
+        return (String) JsonUtil.parse(tokenJson, Map.class).get("accessToken");
+    }
+
+    public String getFreeToken() throws Exception {
+        String url = getConfig().getCopilotUrl() + FREE_TOKEN;
+        HttpClientConfig httpClientConfig = new HttpClientConfig();
+        httpClientConfig.addHeader("Authorization", basicAuth(getConfig().getUsername(), getConfig().getPwd()));
+        String tokenJson = HttpClientUtil.post(url, "", httpClientConfig);
+        return (String) JsonUtil.parse(tokenJson, Map.class).get("accessToken");
+    }
+
+    public ReceiveDTO generateChart(String token, SendDTO sendDTO) {
+        String url = getConfig().getCopilotUrl() + API + CHART;
+        String request = (String) JsonUtil.toJSONString(sendDTO);
+        HttpClientConfig httpClientConfig = new HttpClientConfig();
+        httpClientConfig.addHeader("Authorization", bearerAuth(token));
+        String result = HttpClientUtil.post(url, request, httpClientConfig);
+        return JsonUtil.parseObject(result, ReceiveDTO.class);
+    }
+
+    public void checkRateLimit(String token) {
+        String url = getConfig().getCopilotUrl() + API + RATE_LIMIT;
+        HttpClientConfig httpClientConfig = new HttpClientConfig();
+        httpClientConfig.addHeader("Authorization", bearerAuth(token));
+        HttpResponse httpResponse = HttpClientUtil.postWithHeaders(url, null, httpClientConfig);
+        Header[] allHeaders = httpResponse.getAllHeaders();
+
+        String limit = "";
+        String seconds = "";
+        for (Header header : allHeaders) {
+            if (StringUtils.equalsIgnoreCase(header.getName(), "x-rate-limit-remaining")) {
+                limit = header.getValue();
+            }
+            if (StringUtils.equalsIgnoreCase(header.getName(), "x-rate-limit-retry-after-seconds")) {
+                seconds = header.getValue();
+            }
+        }
+        if (Long.parseLong(limit) <= 0) {
+            DEException.throwException(String.format("当前请求频率已达上限，请在%s秒后重试", seconds));
+        }
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java
new file mode 100644
index 0000000000..7b7177b0c9
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotConfig.java
@@ -0,0 +1,71 @@
+package io.dataease.copilot.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-08
+ */
+@TableName("core_copilot_config")
+public class CoreCopilotConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    private String copilotUrl;
+
+    private String username;
+
+    private String pwd;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCopilotUrl() {
+        return copilotUrl;
+    }
+
+    public void setCopilotUrl(String copilotUrl) {
+        this.copilotUrl = copilotUrl;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    @Override
+    public String toString() {
+        return "CoreCopilotConfig{" +
+        "id = " + id +
+        ", copilotUrl = " + copilotUrl +
+        ", username = " + username +
+        ", pwd = " + pwd +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java
new file mode 100644
index 0000000000..5c6f746044
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotMsg.java
@@ -0,0 +1,276 @@
+package io.dataease.copilot.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-04
+ */
+@TableName("core_copilot_msg")
+public class CoreCopilotMsg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 数据集ID
+     */
+    private Long datasetGroupId;
+
+    /**
+     * user or api
+     */
+    private String msgType;
+
+    /**
+     * mysql oracle ...
+     */
+    private String engineType;
+
+    /**
+     * create sql
+     */
+    private String schemaSql;
+
+    /**
+     * 用户提问
+     */
+    private String question;
+
+    /**
+     * 历史信息
+     */
+    private String history;
+
+    /**
+     * copilot 返回 sql
+     */
+    private String copilotSql;
+
+    /**
+     * copilot 返回信息
+     */
+    private String apiMsg;
+
+    /**
+     * sql 状态
+     */
+    private Integer sqlOk;
+
+    /**
+     * chart 状态
+     */
+    private Integer chartOk;
+
+    /**
+     * chart 内容
+     */
+    private String chart;
+
+    /**
+     * 视图数据
+     */
+    private String chartData;
+
+    /**
+     * 执行请求的SQL
+     */
+    private String execSql;
+
+    /**
+     * msg状态，0失败 1成功
+     */
+    private Integer msgStatus;
+
+    /**
+     * de错误信息
+     */
+    private String errMsg;
+
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getDatasetGroupId() {
+        return datasetGroupId;
+    }
+
+    public void setDatasetGroupId(Long datasetGroupId) {
+        this.datasetGroupId = datasetGroupId;
+    }
+
+    public String getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(String msgType) {
+        this.msgType = msgType;
+    }
+
+    public String getEngineType() {
+        return engineType;
+    }
+
+    public void setEngineType(String engineType) {
+        this.engineType = engineType;
+    }
+
+    public String getSchemaSql() {
+        return schemaSql;
+    }
+
+    public void setSchemaSql(String schemaSql) {
+        this.schemaSql = schemaSql;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public String getHistory() {
+        return history;
+    }
+
+    public void setHistory(String history) {
+        this.history = history;
+    }
+
+    public String getCopilotSql() {
+        return copilotSql;
+    }
+
+    public void setCopilotSql(String copilotSql) {
+        this.copilotSql = copilotSql;
+    }
+
+    public String getApiMsg() {
+        return apiMsg;
+    }
+
+    public void setApiMsg(String apiMsg) {
+        this.apiMsg = apiMsg;
+    }
+
+    public Integer getSqlOk() {
+        return sqlOk;
+    }
+
+    public void setSqlOk(Integer sqlOk) {
+        this.sqlOk = sqlOk;
+    }
+
+    public Integer getChartOk() {
+        return chartOk;
+    }
+
+    public void setChartOk(Integer chartOk) {
+        this.chartOk = chartOk;
+    }
+
+    public String getChart() {
+        return chart;
+    }
+
+    public void setChart(String chart) {
+        this.chart = chart;
+    }
+
+    public String getChartData() {
+        return chartData;
+    }
+
+    public void setChartData(String chartData) {
+        this.chartData = chartData;
+    }
+
+    public String getExecSql() {
+        return execSql;
+    }
+
+    public void setExecSql(String execSql) {
+        this.execSql = execSql;
+    }
+
+    public Integer getMsgStatus() {
+        return msgStatus;
+    }
+
+    public void setMsgStatus(Integer msgStatus) {
+        this.msgStatus = msgStatus;
+    }
+
+    public String getErrMsg() {
+        return errMsg;
+    }
+
+    public void setErrMsg(String errMsg) {
+        this.errMsg = errMsg;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        return "CoreCopilotMsg{" +
+        "id = " + id +
+        ", userId = " + userId +
+        ", datasetGroupId = " + datasetGroupId +
+        ", msgType = " + msgType +
+        ", engineType = " + engineType +
+        ", schemaSql = " + schemaSql +
+        ", question = " + question +
+        ", history = " + history +
+        ", copilotSql = " + copilotSql +
+        ", apiMsg = " + apiMsg +
+        ", sqlOk = " + sqlOk +
+        ", chartOk = " + chartOk +
+        ", chart = " + chart +
+        ", chartData = " + chartData +
+        ", execSql = " + execSql +
+        ", msgStatus = " + msgStatus +
+        ", errMsg = " + errMsg +
+        ", createTime = " + createTime +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java
new file mode 100644
index 0000000000..40b0617386
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/entity/CoreCopilotToken.java
@@ -0,0 +1,74 @@
+package io.dataease.copilot.dao.auto.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-08
+ */
+@TableName("core_copilot_token")
+public class CoreCopilotToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * free or license
+     */
+    private String type;
+
+    private String token;
+
+    private Long updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Long getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Long updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "CoreCopilotToken{" +
+        "id = " + id +
+        ", type = " + type +
+        ", token = " + token +
+        ", updateTime = " + updateTime +
+        "}";
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java
new file mode 100644
index 0000000000..85e1097a32
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotConfigMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.copilot.dao.auto.mapper;
+
+import io.dataease.copilot.dao.auto.entity.CoreCopilotConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-08
+ */
+@Mapper
+public interface CoreCopilotConfigMapper extends BaseMapper<CoreCopilotConfig> {
+
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java
new file mode 100644
index 0000000000..c513ec6baa
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotMsgMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.copilot.dao.auto.mapper;
+
+import io.dataease.copilot.dao.auto.entity.CoreCopilotMsg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-04
+ */
+@Mapper
+public interface CoreCopilotMsgMapper extends BaseMapper<CoreCopilotMsg> {
+
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java
new file mode 100644
index 0000000000..9aff24664c
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/dao/auto/mapper/CoreCopilotTokenMapper.java
@@ -0,0 +1,18 @@
+package io.dataease.copilot.dao.auto.mapper;
+
+import io.dataease.copilot.dao.auto.entity.CoreCopilotToken;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fit2cloud
+ * @since 2024-07-08
+ */
+@Mapper
+public interface CoreCopilotTokenMapper extends BaseMapper<CoreCopilotToken> {
+
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
new file mode 100644
index 0000000000..651ef3ea9e
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
@@ -0,0 +1,377 @@
+package io.dataease.copilot.manage;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import io.dataease.api.copilot.dto.DESendDTO;
+import io.dataease.api.copilot.dto.MsgDTO;
+import io.dataease.api.copilot.dto.ReceiveDTO;
+import io.dataease.api.copilot.dto.TokenDTO;
+import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
+import io.dataease.api.dataset.union.UnionDTO;
+import io.dataease.chart.utils.ChartDataBuild;
+import io.dataease.copilot.api.CopilotAPI;
+import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup;
+import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper;
+import io.dataease.dataset.manage.DatasetDataManage;
+import io.dataease.dataset.manage.DatasetSQLManage;
+import io.dataease.dataset.manage.DatasetTableFieldManage;
+import io.dataease.dataset.manage.PermissionManage;
+import io.dataease.engine.constant.DeTypeConstants;
+import io.dataease.engine.utils.Utils;
+import io.dataease.exception.DEException;
+import io.dataease.extensions.datasource.constant.SqlPlaceholderConstants;
+import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
+import io.dataease.extensions.datasource.dto.DatasourceRequest;
+import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO;
+import io.dataease.extensions.datasource.dto.TableField;
+import io.dataease.extensions.datasource.factory.ProviderFactory;
+import io.dataease.extensions.datasource.provider.Provider;
+import io.dataease.extensions.view.dto.ColumnPermissionItem;
+import io.dataease.i18n.Translator;
+import io.dataease.license.dao.po.LicensePO;
+import io.dataease.license.manage.F2CLicManage;
+import io.dataease.license.utils.LicenseUtil;
+import io.dataease.utils.AuthUtils;
+import io.dataease.utils.BeanUtils;
+import io.dataease.utils.JsonUtil;
+import jakarta.annotation.Resource;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author Junjun
+ */
+@Component
+public class CopilotManage {
+    @Resource
+    private DatasetSQLManage datasetSQLManage;
+    @Resource
+    private CoreDatasetGroupMapper coreDatasetGroupMapper;
+    @Resource
+    private DatasetTableFieldManage datasetTableFieldManage;
+    @Resource
+    private DatasetDataManage datasetDataManage;
+    @Resource
+    private PermissionManage permissionManage;
+    @Resource
+    private MsgManage msgManage;
+
+    private static Logger logger = LoggerFactory.getLogger(CopilotManage.class);
+
+    @Resource
+    private TokenManage tokenManage;
+
+    @Resource
+    private CopilotAPI copilotAPI;
+
+    @Resource
+    private F2CLicManage f2CLicManage;
+
+    public MsgDTO chat(MsgDTO msgDTO) throws Exception {
+        CoreDatasetGroup coreDatasetGroup = coreDatasetGroupMapper.selectById(msgDTO.getDatasetGroupId());
+        if (coreDatasetGroup == null) {
+            return null;
+        }
+        DatasetGroupInfoDTO dto = new DatasetGroupInfoDTO();
+        BeanUtils.copyBean(dto, coreDatasetGroup);
+        dto.setUnionSql(null);
+        List<UnionDTO> unionDTOList = JsonUtil.parseList(coreDatasetGroup.getInfo(), new TypeReference<>() {
+        });
+        dto.setUnion(unionDTOList);
+
+        // 获取field
+        List<DatasetTableFieldDTO> dsFields = datasetTableFieldManage.selectByDatasetGroupId(msgDTO.getDatasetGroupId());
+        List<DatasetTableFieldDTO> allFields = dsFields.stream().filter(ele -> ele.getExtField() == 0)
+                .map(ele -> {
+                    DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
+                    BeanUtils.copyBean(datasetTableFieldDTO, ele);
+                    datasetTableFieldDTO.setFieldShortName(ele.getDataeaseName());
+                    return datasetTableFieldDTO;
+                }).collect(Collectors.toList());
+
+        Map<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(dto, null);
+        String sql = (String) sqlMap.get("sql");// 数据集原始SQL
+        Map<Long, DatasourceSchemaDTO> dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
+        boolean crossDs = Utils.isCrossDs(dsMap);
+        if (crossDs) {
+            DEException.throwException("跨源数据集不支持该功能");
+        }
+
+        // 调用copilot service 获取SQL和chart struct，将返回SQL中表名替换成数据集SQL
+        // deSendDTO 构建schema和engine
+        if (ObjectUtils.isEmpty(dsMap)) {
+            DEException.throwException("No datasource");
+        }
+
+        DatasourceSchemaDTO ds = dsMap.entrySet().iterator().next().getValue();
+        String type = ds.getType();// 数据库类型，如mysql，oracle等，可能需要映射成copilot需要的类型
+
+        datasetDataManage.buildFieldName(sqlMap, allFields);
+        List<String> strings = transCreateTableFields(allFields);
+        String createSql = "CREATE TABLE de_tmp_table (" + StringUtils.join(strings, ",") + ")";
+        logger.info("Copilot Schema SQL: " + createSql);
+
+//        PerMsgDTO perMsgDTO = new PerMsgDTO();
+        msgDTO.setDatasetGroupId(dto.getId());
+        msgDTO.setMsgType("user");
+        msgDTO.setEngineType(type);
+        msgDTO.setSchemaSql(createSql);
+        msgDTO.setHistory(msgDTO.getHistory());
+        msgDTO.setMsgStatus(1);
+        msgManage.save(msgDTO);// 到这里为止，提问所需参数构建完毕，往数据库插入一条提问记录
+
+        DESendDTO deSendDTO = new DESendDTO();
+        deSendDTO.setDatasetGroupId(dto.getId());
+        deSendDTO.setQuestion(msgDTO.getQuestion());
+        deSendDTO.setHistory(msgDTO.getHistory());
+        deSendDTO.setEngine(type);
+        deSendDTO.setSchema(createSql);
+
+        // do copilot chat
+        ReceiveDTO receiveDTO = copilotChat(deSendDTO);
+
+        // copilot 请求结束，继续de获取数据
+        // 获取数据集相关行列权限、最终再套一层SQL
+        Map<String, ColumnPermissionItem> desensitizationList = new HashMap<>();
+        allFields = permissionManage.filterColumnPermissions(allFields, desensitizationList, dto.getId(), null);
+        if (ObjectUtils.isEmpty(allFields)) {
+            DEException.throwException(Translator.get("i18n_no_column_permission"));
+        }
+
+        List<String> dsList = new ArrayList<>();
+        for (Map.Entry<Long, DatasourceSchemaDTO> next : dsMap.entrySet()) {
+            dsList.add(next.getValue().getType());
+        }
+        boolean needOrder = Utils.isNeedOrder(dsList);
+
+        if (!crossDs) {
+            sql = Utils.replaceSchemaAlias(sql, dsMap);
+        }
+
+        Provider provider;
+        if (crossDs) {
+            provider = ProviderFactory.getDefaultProvider();
+        } else {
+            provider = ProviderFactory.getProvider(dsList.getFirst());
+        }
+
+//        List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = new ArrayList<>();
+//        TokenUserBO user = AuthUtils.getUser();
+//        if (user != null) {
+//            rowPermissionsTree = permissionManage.getRowPermissionsTree(dto.getId(), user.getUserId());
+//        }
+
+        // build query sql
+//        SQLMeta sqlMeta = new SQLMeta();
+//        Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs);
+//        Field2SQLObj.field2sqlObj(sqlMeta, allFields, allFields, crossDs, dsMap);
+//        WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, allFields, crossDs, dsMap);
+//        Order2SQLObj.getOrders(sqlMeta, dto.getSortFields(), allFields, crossDs, dsMap);
+//        String querySQL = SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder);
+//        querySQL = provider.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
+//        logger.info("preview sql: " + querySQL);
+        // todo test
+        String querySQL = sql;
+
+        String copilotSQL = receiveDTO.getSql();
+        // 通过数据源请求数据
+        // 调用数据源的calcite获得data
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDsList(dsMap);
+        String s = "";
+        Map<String, Object> data;
+        try {
+            s = copilotSQL
+                    .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "de_tmp_table" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ")")
+                    .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "DE_TMP_TABLE" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ")");
+            logger.info("copilot sql: " + s);
+            datasourceRequest.setQuery(s);
+            data = provider.fetchResultField(datasourceRequest);
+        } catch (Exception e) {
+            try {
+                s = copilotSQL
+                        .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "de_tmp_table" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ") tmp")
+                        .replaceAll(SqlPlaceholderConstants.KEYWORD_PREFIX_REGEX + "DE_TMP_TABLE" + SqlPlaceholderConstants.KEYWORD_SUFFIX_REGEX, "(" + querySQL + ") tmp");
+                logger.info("copilot sql: " + s);
+                datasourceRequest.setQuery(s);
+                data = provider.fetchResultField(datasourceRequest);
+            } catch (Exception e1) {
+                // 如果异常，则获取最后一条成功的history
+                MsgDTO lastSuccessMsg = msgManage.getLastSuccessMsg(AuthUtils.getUser().getUserId(), dto.getId());
+                // 请求数据出错，记录错误信息和copilot返回的信息
+                MsgDTO result = new MsgDTO();
+                result.setDatasetGroupId(dto.getId());
+                result.setMsgType("api");
+                result.setHistory(lastSuccessMsg == null ? new ArrayList<>() : lastSuccessMsg.getHistory());
+                result.setCopilotSql(receiveDTO.getSql());
+                result.setApiMsg(receiveDTO.getApiMessage());
+                result.setSqlOk(receiveDTO.getSqlOk() ? 1 : 0);
+                result.setChartOk(receiveDTO.getChartOk() ? 1 : 0);
+                result.setChart(receiveDTO.getChart());
+                result.setExecSql(s);
+                result.setMsgStatus(0);
+                result.setErrMsg(e1.getMessage());
+                msgManage.save(result);
+                return result;
+            }
+        }
+
+        List<TableField> fields = (List<TableField>) data.get("fields");
+        Map<String, Object> map = new LinkedHashMap<>();
+        // 重新构造data
+        Map<String, Object> previewData = buildPreviewData(data, fields, desensitizationList);
+
+        map.put("data", previewData);
+//            map.put("allFields", allFields);// map.data 中包含了fields和data
+//            if (ObjectUtils.isEmpty(dto.getId())) {
+//                map.put("allFields", allFields);
+//            } else {
+//                List<DatasetTableFieldDTO> fieldList = datasetTableFieldManage.selectByDatasetGroupId(dto.getId());
+//                map.put("allFields", fieldList);
+//            }
+        map.put("sql", Base64.getEncoder().encodeToString(s.getBytes()));
+
+        MsgDTO result = new MsgDTO();
+        result.setDatasetGroupId(dto.getId());
+        result.setMsgType("api");
+        result.setHistory(receiveDTO.getHistory());
+        result.setCopilotSql(receiveDTO.getSql());
+        result.setApiMsg(receiveDTO.getApiMessage());
+        result.setSqlOk(receiveDTO.getSqlOk() ? 1 : 0);
+        result.setChartOk(receiveDTO.getChartOk() ? 1 : 0);
+        result.setChart(receiveDTO.getChart());
+        result.setChartData(map);
+        result.setExecSql(s);
+        result.setMsgStatus(1);
+        msgManage.save(result);
+        return result;
+    }
+
+    public ReceiveDTO copilotChat(DESendDTO deSendDTO) throws Exception {
+        boolean valid = LicenseUtil.licenseValid();
+        // call copilot service
+        TokenDTO tokenDTO = tokenManage.getToken(valid);
+        ReceiveDTO receiveDTO;
+        if (StringUtils.isEmpty(tokenDTO.getToken())) {
+            // get token
+            String token;
+            if (valid) {
+                LicensePO read = f2CLicManage.read();
+                token = copilotAPI.getToken(read.getLicense());
+            } else {
+                token = copilotAPI.getFreeToken();
+            }
+            tokenManage.updateToken(token, valid);
+            receiveDTO = copilotAPI.generateChart(token, deSendDTO);
+        } else {
+            try {
+                receiveDTO = copilotAPI.generateChart(tokenDTO.getToken(), deSendDTO);
+            } catch (Exception e) {
+                // error, get token again
+                String token;
+                if (valid) {
+                    LicensePO read = f2CLicManage.read();
+                    token = copilotAPI.getToken(read.getLicense());
+                } else {
+                    token = copilotAPI.getFreeToken();
+                }
+                tokenManage.updateToken(token, valid);
+                receiveDTO = copilotAPI.generateChart(token, deSendDTO);
+            }
+        }
+
+        if (!receiveDTO.getSqlOk() || !receiveDTO.getChartOk()) {
+            DEException.throwException((String) JsonUtil.toJSONString(receiveDTO));
+        }
+        logger.info("Copilot Service SQL: " + receiveDTO.getSql());
+        logger.info("Copilot Service Chart: " + JsonUtil.toJSONString(receiveDTO.getChart()));
+        return receiveDTO;
+    }
+
+    public List<MsgDTO> getList(Long userId) {
+        MsgDTO lastMsg = msgManage.getLastMsg(userId);
+        if (lastMsg == null) {
+            return null;
+        }
+        List<MsgDTO> msg = msgManage.getMsg(lastMsg);
+        msgManage.deleteMsg(lastMsg);
+        return msg;
+    }
+
+    public void clearAll(Long userId) {
+        msgManage.clearAllUserMsg(userId);
+    }
+
+    public MsgDTO errorMsg(MsgDTO msgDTO, String errMsg) throws Exception {
+        // 如果异常，则获取最后一条成功的history
+        MsgDTO lastSuccessMsg = msgManage.getLastSuccessMsg(AuthUtils.getUser().getUserId(), msgDTO.getDatasetGroupId());
+        MsgDTO dto = new MsgDTO();
+        dto.setDatasetGroupId(msgDTO.getDatasetGroupId());
+        dto.setHistory(lastSuccessMsg == null ? new ArrayList<>() : lastSuccessMsg.getHistory());
+        dto.setMsgStatus(0);
+        dto.setMsgType("api");
+        dto.setErrMsg(errMsg);
+        msgManage.save(dto);
+        return dto;
+    }
+
+    public Map<String, Object> buildPreviewData(Map<String, Object> data, List<TableField> fields, Map<String, ColumnPermissionItem> desensitizationList) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        List<String[]> dataList = (List<String[]>) data.get("data");
+        List<LinkedHashMap<String, Object>> dataObjectList = new ArrayList<>();
+        if (ObjectUtils.isNotEmpty(dataList)) {
+            for (int i = 0; i < dataList.size(); i++) {
+                String[] row = dataList.get(i);
+                LinkedHashMap<String, Object> obj = new LinkedHashMap<>();
+                if (row.length > 0) {
+                    for (int j = 0; j < fields.size(); j++) {
+                        TableField tableField = fields.get(j);
+                        if (desensitizationList.containsKey(tableField.getOriginName())) {
+                            obj.put(tableField.getOriginName(), ChartDataBuild.desensitizationValue(desensitizationList.get(tableField.getOriginName()), String.valueOf(row[j])));
+                        } else {
+                            if (tableField.getDeExtractType() == DeTypeConstants.DE_INT
+                                    || tableField.getDeExtractType() == DeTypeConstants.DE_FLOAT
+                                    || tableField.getDeExtractType() == DeTypeConstants.DE_BOOL) {
+                                try {
+                                    obj.put(tableField.getOriginName(), new BigDecimal(row[j]));
+                                } catch (Exception e) {
+                                    obj.put(tableField.getOriginName(), row[j]);
+                                }
+                            } else {
+                                obj.put(tableField.getOriginName(), row[j]);
+                            }
+                        }
+                    }
+                }
+                dataObjectList.add(obj);
+            }
+        }
+
+        map.put("fields", fields);
+        map.put("data", dataObjectList);
+        return map;
+    }
+
+    public List<String> transCreateTableFields(List<DatasetTableFieldDTO> allFields) {
+        List<String> list = new ArrayList<>();
+        for (DatasetTableFieldDTO dto : allFields) {
+            list.add(" " + dto.getDataeaseName() + " " + transNum2Type(dto.getDeExtractType()) +
+                    " COMMENT '" + dto.getName() + "'");
+        }
+        return list;
+    }
+
+    public String transNum2Type(Integer num) {
+        return switch (num) {
+            case 0, 1, 5 -> "VARCHAR(50)";
+            case 2, 3, 4 -> "INT(10)";
+            default -> "VARCHAR(50)";
+        };
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java
new file mode 100644
index 0000000000..a3dbaa29ab
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/manage/MsgManage.java
@@ -0,0 +1,100 @@
+package io.dataease.copilot.manage;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dataease.api.copilot.dto.ChartDTO;
+import io.dataease.api.copilot.dto.HistoryDTO;
+import io.dataease.api.copilot.dto.MsgDTO;
+import io.dataease.copilot.dao.auto.entity.CoreCopilotMsg;
+import io.dataease.copilot.dao.auto.mapper.CoreCopilotMsgMapper;
+import io.dataease.utils.AuthUtils;
+import io.dataease.utils.BeanUtils;
+import io.dataease.utils.IDUtils;
+import io.dataease.utils.JsonUtil;
+import jakarta.annotation.Resource;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author Junjun
+ */
+@Component
+public class MsgManage {
+    @Resource
+    private CoreCopilotMsgMapper coreCopilotMsgMapper;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    public void save(MsgDTO msgDTO) throws Exception {
+        msgDTO.setId(IDUtils.snowID());
+        msgDTO.setCreateTime(System.currentTimeMillis());
+        msgDTO.setUserId(AuthUtils.getUser().getUserId());
+        coreCopilotMsgMapper.insert(transDTO(msgDTO));
+    }
+
+    public List<MsgDTO> getMsg(MsgDTO msgDTO) {
+        QueryWrapper<CoreCopilotMsg> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", msgDTO.getUserId());
+        wrapper.eq("dataset_group_id", msgDTO.getDatasetGroupId());
+        wrapper.orderByAsc("create_time");
+        List<CoreCopilotMsg> perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper);
+        return perCopilotMsgs.stream().map(this::transRecord).toList();
+    }
+
+    public void deleteMsg(MsgDTO msgDTO) {
+        QueryWrapper<CoreCopilotMsg> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", msgDTO.getUserId());
+        wrapper.ne("dataset_group_id", msgDTO.getDatasetGroupId());
+        coreCopilotMsgMapper.delete(wrapper);
+    }
+
+    public void clearAllUserMsg(Long userId) {
+        QueryWrapper<CoreCopilotMsg> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        coreCopilotMsgMapper.delete(wrapper);
+    }
+
+    public MsgDTO getLastMsg(Long userId) {
+        QueryWrapper<CoreCopilotMsg> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        wrapper.orderByDesc("create_time");
+        List<CoreCopilotMsg> perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper);
+        return ObjectUtils.isEmpty(perCopilotMsgs) ? null : transRecord(perCopilotMsgs.getFirst());
+    }
+
+    public MsgDTO getLastSuccessMsg(Long userId, Long datasetGroupId) {
+        QueryWrapper<CoreCopilotMsg> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        wrapper.eq("dataset_group_id", datasetGroupId);
+        wrapper.eq("msg_status", 1);
+        wrapper.eq("msg_type", "api");
+        wrapper.orderByDesc("create_time");
+        List<CoreCopilotMsg> perCopilotMsgs = coreCopilotMsgMapper.selectList(wrapper);
+        return ObjectUtils.isEmpty(perCopilotMsgs) ? null : transRecord(perCopilotMsgs.getFirst());
+    }
+
+    private CoreCopilotMsg transDTO(MsgDTO dto) throws Exception {
+        CoreCopilotMsg record = new CoreCopilotMsg();
+        BeanUtils.copyBean(record, dto);
+        record.setHistory(dto.getHistory() == null ? null : objectMapper.writeValueAsString(dto.getHistory()));
+        record.setChart(dto.getChart() == null ? null : objectMapper.writeValueAsString(dto.getChart()));
+        record.setChartData(dto.getChartData() == null ? null : objectMapper.writeValueAsString(dto.getChartData()));
+        return record;
+    }
+
+    private MsgDTO transRecord(CoreCopilotMsg record) {
+        MsgDTO dto = new MsgDTO();
+        BeanUtils.copyBean(dto, record);
+        TypeReference<List<HistoryDTO>> tokenType = new TypeReference<>() {
+        };
+        dto.setHistory(record.getHistory() == null ? new ArrayList<>() : JsonUtil.parseList(record.getHistory(), tokenType));
+        dto.setChart(record.getChart() == null ? null : JsonUtil.parseObject(record.getChart(), ChartDTO.class));
+        dto.setChartData(record.getChartData() == null ? null : JsonUtil.parse(record.getChartData(), Map.class));
+        return dto;
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java
new file mode 100644
index 0000000000..104de25ac1
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/manage/TokenManage.java
@@ -0,0 +1,36 @@
+package io.dataease.copilot.manage;
+
+import io.dataease.api.copilot.dto.TokenDTO;
+import io.dataease.copilot.dao.auto.entity.CoreCopilotToken;
+import io.dataease.copilot.dao.auto.mapper.CoreCopilotTokenMapper;
+import io.dataease.utils.BeanUtils;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author Junjun
+ */
+@Component
+public class TokenManage {
+    @Resource
+    private CoreCopilotTokenMapper coreCopilotTokenMapper;
+
+    public TokenDTO getToken(boolean valid) {
+        CoreCopilotToken perCopilotToken = coreCopilotTokenMapper.selectById(valid ? 2 : 1);
+        return transRecord(perCopilotToken);
+    }
+
+    public void updateToken(String token, boolean valid) {
+        CoreCopilotToken record = new CoreCopilotToken();
+        record.setId(valid ? 2L : 1L);
+        record.setToken(token);
+        record.setUpdateTime(System.currentTimeMillis());
+        coreCopilotTokenMapper.updateById(record);
+    }
+
+    private TokenDTO transRecord(CoreCopilotToken perCopilotToken) {
+        TokenDTO dto = new TokenDTO();
+        BeanUtils.copyBean(dto, perCopilotToken);
+        return dto;
+    }
+}
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java b/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java
new file mode 100644
index 0000000000..e78a7bd230
--- /dev/null
+++ b/core/core-backend/src/main/java/io/dataease/copilot/service/CopilotService.java
@@ -0,0 +1,40 @@
+package io.dataease.copilot.service;
+
+import io.dataease.api.copilot.CopilotApi;
+import io.dataease.api.copilot.dto.MsgDTO;
+import io.dataease.copilot.manage.CopilotManage;
+import io.dataease.utils.AuthUtils;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author Junjun
+ */
+@RestController
+@RequestMapping("copilot")
+public class CopilotService implements CopilotApi {
+    @Resource
+    private CopilotManage copilotManage;
+
+    @Override
+    public MsgDTO chat(MsgDTO msgDTO) throws Exception {
+        try {
+            return copilotManage.chat(msgDTO);
+        } catch (Exception e) {
+            return copilotManage.errorMsg(msgDTO, e.getMessage());
+        }
+    }
+
+    @Override
+    public List<MsgDTO> getList() throws Exception {
+        return copilotManage.getList(AuthUtils.getUser().getUserId());
+    }
+
+    @Override
+    public void clearAll() throws Exception {
+        copilotManage.clearAll(AuthUtils.getUser().getUserId());
+    }
+}
diff --git a/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql
new file mode 100644
index 0000000000..6a8724cabf
--- /dev/null
+++ b/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql
@@ -0,0 +1,48 @@
+DROP TABLE IF EXISTS `core_copilot_msg`;
+CREATE TABLE `core_copilot_msg`  (
+     `id` bigint NOT NULL COMMENT 'ID',
+     `user_id` bigint DEFAULT NULL COMMENT '用户ID',
+     `dataset_group_id` bigint DEFAULT NULL COMMENT '数据集ID',
+     `msg_type` varchar(255) DEFAULT NULL COMMENT 'user or api',
+     `engine_type` varchar(255) DEFAULT NULL COMMENT 'mysql oracle ...',
+     `schema_sql` longtext COMMENT 'create sql',
+     `question` longtext COMMENT '用户提问',
+     `history` longtext COMMENT '历史信息',
+     `copilot_sql` longtext COMMENT 'copilot 返回 sql',
+     `api_msg` longtext COMMENT 'copilot 返回信息',
+     `sql_ok` int DEFAULT NULL COMMENT 'sql 状态',
+     `chart_ok` int DEFAULT NULL COMMENT 'chart 状态',
+     `chart` longtext COMMENT 'chart 内容',
+     `chart_data` longtext COMMENT '视图数据',
+     `exec_sql` longtext COMMENT '执行请求的SQL',
+     `msg_status` int  DEFAULT NULL COMMENT 'msg状态，0失败 1成功',
+     `err_msg` longtext COMMENT 'de错误信息',
+     `create_time` bigint  DEFAULT NULL COMMENT '创建时间',
+     PRIMARY KEY (`id`)
+);
+
+
+DROP TABLE IF EXISTS `core_copilot_token`;
+CREATE TABLE `core_copilot_token`  (
+      `id` bigint NOT NULL COMMENT 'ID',
+      `type` varchar(255) DEFAULT NULL COMMENT 'free or license',
+      `token` longtext,
+      `update_time` bigint DEFAULT NULL,
+      PRIMARY KEY (`id`)
+);
+
+INSERT INTO `core_copilot_token` VALUES (1, 'free', null, null);
+INSERT INTO `core_copilot_token` VALUES (2, 'license', null, null);
+
+
+DROP TABLE IF EXISTS `core_copilot_config`;
+CREATE TABLE `core_copilot_config`  (
+    `id` bigint NOT NULL COMMENT 'ID',
+    `copilot_url` varchar(255) DEFAULT NULL,
+    `username` varchar(255) DEFAULT NULL,
+    `pwd` varchar(255) DEFAULT NULL,
+    PRIMARY KEY (`id`)
+);
+
+INSERT INTO `core_copilot_config` VALUES (1, 'https://copilot-demo.test.fit2cloud.dev:5000', 'xlab', 'Q2Fsb25nQDIwMTU=');
+
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java
new file mode 100644
index 0000000000..73437083c7
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/CopilotApi.java
@@ -0,0 +1,30 @@
+package io.dataease.api.copilot;
+
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.api.copilot.dto.MsgDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Author Junjun
+ */
+@Tag(name = "Copilot")
+@ApiSupport(order = 999)
+public interface CopilotApi {
+    @Operation(summary = "发起一次对话")
+    @PostMapping("chat")
+    MsgDTO chat(@RequestBody MsgDTO msgDTO) throws Exception;
+
+    @Operation(summary = "获取对话记录")
+    @PostMapping("getList")
+    List<MsgDTO> getList() throws Exception;
+
+    @Operation(summary = "清空对话")
+    @PostMapping("clearAll")
+    void clearAll() throws Exception;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java
new file mode 100644
index 0000000000..208914af9e
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/AxisDTO.java
@@ -0,0 +1,12 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class AxisDTO {
+    private String x;
+    private String y;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java
new file mode 100644
index 0000000000..acf5cb85f5
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ChartDTO.java
@@ -0,0 +1,13 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class ChartDTO {
+    private String type;
+    private AxisDTO axis;
+    private String title;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java
new file mode 100644
index 0000000000..e19d8e2f5e
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DEReceiveDTO.java
@@ -0,0 +1,13 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class DEReceiveDTO extends ReceiveDTO {
+    private Map<String, Object> chartData;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java
new file mode 100644
index 0000000000..aceb17a028
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/DESendDTO.java
@@ -0,0 +1,16 @@
+package io.dataease.api.copilot.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class DESendDTO extends SendDTO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long datasetGroupId;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java
new file mode 100644
index 0000000000..ca8d00a980
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/HistoryDTO.java
@@ -0,0 +1,12 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class HistoryDTO {
+    private String type;
+    private String message;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java
new file mode 100644
index 0000000000..58ae5496be
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/MsgDTO.java
@@ -0,0 +1,53 @@
+package io.dataease.api.copilot.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class MsgDTO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long datasetGroupId;
+
+    private String msgType;
+
+    private String engineType;
+
+    private String schemaSql;
+
+    private String question;
+
+    private List<HistoryDTO> history;
+
+    private String copilotSql;
+
+    private String apiMsg;
+
+    private Integer sqlOk;
+
+    private Integer chartOk;
+
+    private ChartDTO chart;
+
+    private Long createTime;
+
+    private Map<String, Object> chartData;
+
+    private String execSql;
+
+    private Integer msgStatus;
+
+    private String errMsg;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java
new file mode 100644
index 0000000000..d234450b2b
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/ReceiveDTO.java
@@ -0,0 +1,18 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class ReceiveDTO {
+    private String sql;
+    private List<HistoryDTO> history;
+    private String apiMessage;
+    private Boolean sqlOk;
+    private Boolean chartOk;
+    private ChartDTO chart;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java
new file mode 100644
index 0000000000..2bb7c360c3
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/SendDTO.java
@@ -0,0 +1,16 @@
+package io.dataease.api.copilot.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class SendDTO {
+    private String engine;
+    private String schema;
+    private String question;
+    private List<HistoryDTO> history;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java
new file mode 100644
index 0000000000..93b52c69fe
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/copilot/dto/TokenDTO.java
@@ -0,0 +1,16 @@
+package io.dataease.api.copilot.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class TokenDTO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+    private String token;
+    private Long updateTime;
+}