diff --git a/apps/visual/api/data_source.go b/apps/visual/api/data_source.go
new file mode 100644
index 0000000..c45dcae
--- /dev/null
+++ b/apps/visual/api/data_source.go
@@ -0,0 +1,66 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/api/visual_data_source.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSourceApi struct {
+	VisualDataSourceApp services.VisualDataSourceModel
+}
+
+// GetVisualDataSourceList DataSource列表数据
+func (p *VisualDataSourceApi) GetVisualDataSourceList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSource{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.SourceName = restfulx.QueryParam(rc, "sourceName")
+	data.Status = restfulx.QueryParam(rc, "status")
+
+	list, total := p.VisualDataSourceApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSource 获取DataSource
+func (p *VisualDataSourceApi) GetVisualDataSource(rc *restfulx.ReqCtx) {
+	sourceId := restfulx.PathParam(rc, "sourceId")
+	rc.ResData = p.VisualDataSourceApp.FindOne(sourceId)
+}
+
+// InsertVisualDataSource 添加DataSource
+func (p *VisualDataSourceApi) InsertVisualDataSource(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSource
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSourceApp.Insert(data)
+}
+
+// UpdateVisualDataSource 修改DataSource
+func (p *VisualDataSourceApi) UpdateVisualDataSource(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSource
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSourceApp.Update(data)
+}
+
+// DeleteVisualDataSource 删除DataSource
+func (p *VisualDataSourceApi) DeleteVisualDataSource(rc *restfulx.ReqCtx) {
+	sourceId := restfulx.PathParam(rc, "sourceId")
+	sourceIds := strings.Split(sourceId, ",")
+	p.VisualDataSourceApp.Delete(sourceIds)
+}
diff --git a/apps/visual/api/dataset_gropu.go b/apps/visual/api/dataset_gropu.go
new file mode 100644
index 0000000..fcd85cd
--- /dev/null
+++ b/apps/visual/api/dataset_gropu.go
@@ -0,0 +1,65 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/api/visual_data_set_group.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSetGroupApi struct {
+	VisualDataSetGroupApp services.VisualDataSetGroupModel
+}
+
+// GetVisualDataSetGroupList DataSetGroup列表数据
+func (p *VisualDataSetGroupApi) GetVisualDataSetGroupList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSetGroup{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.Name = restfulx.QueryParam(rc, "name")
+
+	list, total := p.VisualDataSetGroupApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSetGroup 获取DataSetGroup
+func (p *VisualDataSetGroupApi) GetVisualDataSetGroup(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	rc.ResData = p.VisualDataSetGroupApp.FindOne(id)
+}
+
+// InsertVisualDataSetGroup 添加DataSetGroup
+func (p *VisualDataSetGroupApi) InsertVisualDataSetGroup(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetGroup
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetGroupApp.Insert(data)
+}
+
+// UpdateVisualDataSetGroup 修改DataSetGroup
+func (p *VisualDataSetGroupApi) UpdateVisualDataSetGroup(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetGroup
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetGroupApp.Update(data)
+}
+
+// DeleteVisualDataSetGroup 删除DataSetGroup
+func (p *VisualDataSetGroupApi) DeleteVisualDataSetGroup(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	ids := strings.Split(id, ",")
+	p.VisualDataSetGroupApp.Delete(ids)
+}
diff --git a/apps/visual/api/visual_data_set_field.go b/apps/visual/api/visual_data_set_field.go
new file mode 100644
index 0000000..25e77df
--- /dev/null
+++ b/apps/visual/api/visual_data_set_field.go
@@ -0,0 +1,65 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/api/visual_data_set_field.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSetFieldApi struct {
+	VisualDataSetFieldApp services.VisualDataSetFieldModel
+}
+
+// GetVisualDataSetFieldList DataSetField列表数据
+func (p *VisualDataSetFieldApi) GetVisualDataSetFieldList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSetField{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.Name = restfulx.QueryParam(rc, "name")
+
+	list, total := p.VisualDataSetFieldApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSetField 获取DataSetField
+func (p *VisualDataSetFieldApi) GetVisualDataSetField(rc *restfulx.ReqCtx) {
+	fieldId := restfulx.PathParam(rc, "fieldId")
+	rc.ResData = p.VisualDataSetFieldApp.FindOne(fieldId)
+}
+
+// InsertVisualDataSetField 添加DataSetField
+func (p *VisualDataSetFieldApi) InsertVisualDataSetField(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetField
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetFieldApp.Insert(data)
+}
+
+// UpdateVisualDataSetField 修改DataSetField
+func (p *VisualDataSetFieldApi) UpdateVisualDataSetField(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetField
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetFieldApp.Update(data)
+}
+
+// DeleteVisualDataSetField 删除DataSetField
+func (p *VisualDataSetFieldApi) DeleteVisualDataSetField(rc *restfulx.ReqCtx) {
+	fieldId := restfulx.PathParam(rc, "fieldId")
+	fieldIds := strings.Split(fieldId, ",")
+	p.VisualDataSetFieldApp.Delete(fieldIds)
+}
diff --git a/apps/visual/api/visual_data_set_table.go b/apps/visual/api/visual_data_set_table.go
new file mode 100644
index 0000000..afdc813
--- /dev/null
+++ b/apps/visual/api/visual_data_set_table.go
@@ -0,0 +1,64 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/api/visual_data_set_table.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSetTableApi struct {
+	VisualDataSetTableApp services.VisualDataSetTableModel
+}
+
+// GetVisualDataSetTableList DataSetTable列表数据
+func (p *VisualDataSetTableApi) GetVisualDataSetTableList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSetTable{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+
+	list, total := p.VisualDataSetTableApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSetTable 获取DataSetTable
+func (p *VisualDataSetTableApi) GetVisualDataSetTable(rc *restfulx.ReqCtx) {
+	tableId := restfulx.PathParam(rc, "tableId")
+	rc.ResData = p.VisualDataSetTableApp.FindOne(tableId)
+}
+
+// InsertVisualDataSetTable 添加DataSetTable
+func (p *VisualDataSetTableApi) InsertVisualDataSetTable(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTable
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableApp.Insert(data)
+}
+
+// UpdateVisualDataSetTable 修改DataSetTable
+func (p *VisualDataSetTableApi) UpdateVisualDataSetTable(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTable
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableApp.Update(data)
+}
+
+// DeleteVisualDataSetTable 删除DataSetTable
+func (p *VisualDataSetTableApi) DeleteVisualDataSetTable(rc *restfulx.ReqCtx) {
+	tableId := restfulx.PathParam(rc, "tableId")
+	tableIds := strings.Split(tableId, ",")
+	p.VisualDataSetTableApp.Delete(tableIds)
+}
diff --git a/apps/visual/api/visual_data_set_table_task.go b/apps/visual/api/visual_data_set_table_task.go
new file mode 100644
index 0000000..56aec33
--- /dev/null
+++ b/apps/visual/api/visual_data_set_table_task.go
@@ -0,0 +1,65 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/api/visual_data_set_table_task.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSetTableTaskApi struct {
+	VisualDataSetTableTaskApp services.VisualDataSetTableTaskModel
+}
+
+// GetVisualDataSetTableTaskList DataSetTableTask列表数据
+func (p *VisualDataSetTableTaskApi) GetVisualDataSetTableTaskList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSetTableTask{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.Name = restfulx.QueryParam(rc, "name")
+
+	list, total := p.VisualDataSetTableTaskApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSetTableTask 获取DataSetTableTask
+func (p *VisualDataSetTableTaskApi) GetVisualDataSetTableTask(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	rc.ResData = p.VisualDataSetTableTaskApp.FindOne(id)
+}
+
+// InsertVisualDataSetTableTask 添加DataSetTableTask
+func (p *VisualDataSetTableTaskApi) InsertVisualDataSetTableTask(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTableTask
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableTaskApp.Insert(data)
+}
+
+// UpdateVisualDataSetTableTask 修改DataSetTableTask
+func (p *VisualDataSetTableTaskApi) UpdateVisualDataSetTableTask(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTableTask
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableTaskApp.Update(data)
+}
+
+// DeleteVisualDataSetTableTask 删除DataSetTableTask
+func (p *VisualDataSetTableTaskApi) DeleteVisualDataSetTableTask(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	ids := strings.Split(id, ",")
+	p.VisualDataSetTableTaskApp.Delete(ids)
+}
diff --git a/apps/visual/api/visual_data_set_table_task_log.go b/apps/visual/api/visual_data_set_table_task_log.go
new file mode 100644
index 0000000..20b46e1
--- /dev/null
+++ b/apps/visual/api/visual_data_set_table_task_log.go
@@ -0,0 +1,65 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/api/visual_data_set_table_task_log.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualDataSetTableTaskLogApi struct {
+	VisualDataSetTableTaskLogApp services.VisualDataSetTableTaskLogModel
+}
+
+// GetVisualDataSetTableTaskLogList DataSetTableTaskLog列表数据
+func (p *VisualDataSetTableTaskLogApi) GetVisualDataSetTableTaskLogList(rc *restfulx.ReqCtx) {
+	data := entity.VisualDataSetTableTaskLog{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.Status = restfulx.QueryParam(rc, "status")
+
+	list, total := p.VisualDataSetTableTaskLogApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualDataSetTableTaskLog 获取DataSetTableTaskLog
+func (p *VisualDataSetTableTaskLogApi) GetVisualDataSetTableTaskLog(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	rc.ResData = p.VisualDataSetTableTaskLogApp.FindOne(id)
+}
+
+// InsertVisualDataSetTableTaskLog 添加DataSetTableTaskLog
+func (p *VisualDataSetTableTaskLogApi) InsertVisualDataSetTableTaskLog(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTableTaskLog
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableTaskLogApp.Insert(data)
+}
+
+// UpdateVisualDataSetTableTaskLog 修改DataSetTableTaskLog
+func (p *VisualDataSetTableTaskLogApi) UpdateVisualDataSetTableTaskLog(rc *restfulx.ReqCtx) {
+	var data entity.VisualDataSetTableTaskLog
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualDataSetTableTaskLogApp.Update(data)
+}
+
+// DeleteVisualDataSetTableTaskLog 删除DataSetTableTaskLog
+func (p *VisualDataSetTableTaskLogApi) DeleteVisualDataSetTableTaskLog(rc *restfulx.ReqCtx) {
+	id := restfulx.PathParam(rc, "id")
+	ids := strings.Split(id, ",")
+	p.VisualDataSetTableTaskLogApp.Delete(ids)
+}
diff --git a/apps/visual/api/visual_screen.go b/apps/visual/api/visual_screen.go
new file mode 100644
index 0000000..001d599
--- /dev/null
+++ b/apps/visual/api/visual_screen.go
@@ -0,0 +1,66 @@
+package api
+
+// ==========================================================================
+// 生成日期：2023-04-10 11:26:49 +0800 CST
+// 生成路径: apps/visual/api/visual_screen.go
+// 生成人：panda
+// ==========================================================================
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"strings"
+
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+)
+
+type VisualScreenApi struct {
+	VisualScreenApp services.VisualScreenModel
+}
+
+// GetVisualScreenList Screen列表数据
+func (p *VisualScreenApi) GetVisualScreenList(rc *restfulx.ReqCtx) {
+	data := entity.VisualScreen{}
+	pageNum := restfulx.QueryInt(rc, "pageNum", 1)
+	pageSize := restfulx.QueryInt(rc, "pageSize", 10)
+	data.ScreenName = restfulx.QueryParam(rc, "screenName")
+	data.Status = restfulx.QueryParam(rc, "status")
+
+	list, total := p.VisualScreenApp.FindListPage(pageNum, pageSize, data)
+
+	rc.ResData = model.ResultPage{
+		Total:    total,
+		PageNum:  int64(pageNum),
+		PageSize: int64(pageNum),
+		Data:     list,
+	}
+}
+
+// GetVisualScreen 获取Screen
+func (p *VisualScreenApi) GetVisualScreen(rc *restfulx.ReqCtx) {
+	screenId := restfulx.PathParam(rc, "screenId")
+	rc.ResData = p.VisualScreenApp.FindOne(screenId)
+}
+
+// InsertVisualScreen 添加Screen
+func (p *VisualScreenApi) InsertVisualScreen(rc *restfulx.ReqCtx) {
+	var data entity.VisualScreen
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualScreenApp.Insert(data)
+}
+
+// UpdateVisualScreen 修改Screen
+func (p *VisualScreenApi) UpdateVisualScreen(rc *restfulx.ReqCtx) {
+	var data entity.VisualScreen
+	restfulx.BindQuery(rc, &data)
+
+	p.VisualScreenApp.Update(data)
+}
+
+// DeleteVisualScreen 删除Screen
+func (p *VisualScreenApi) DeleteVisualScreen(rc *restfulx.ReqCtx) {
+	screenId := restfulx.PathParam(rc, "screenId")
+	screenIds := strings.Split(screenId, ",")
+	p.VisualScreenApp.Delete(screenIds)
+}
diff --git a/apps/visual/entity/data_set.go b/apps/visual/entity/data_set.go
index 3bdd891..fdb310a 100644
--- a/apps/visual/entity/data_set.go
+++ b/apps/visual/entity/data_set.go
@@ -2,21 +2,46 @@ package entity
 
 import "github.com/XM-GO/PandaKit/model"
 
+// VisualDataSetGroup 数据集分组
 type VisualDataSetGroup struct {
 	model.BaseModelD
+	Id    string `gorm:"primary_key;id;type:varchar(64);" json:"id"`
 	Name  string `gorm:"name;type:varchar(64);comment:数据源类型" json:"name"`
-	Pid   string `json:"pid"`
-	Level int64  `json:"level"`
+	Pid   string `gorm:"pid;type:varchar(64);comment:父Id" json:"pid"`
+	Level int64  `gorm:"level;type:int;comment:等级" json:"level"`
 }
 
-/*type VisualDataSetTable struct {
-	model.BaseModelD
-	TableId      string              `gorm:"name;type:TEXT;comment:表id" json:"tableId"`
-	DataSourceId string              `gorm:"name;type:TEXT;comment:数据圆ID" json:"data_source_Id"`
-	TableType    string              `gorm:"name;type:TEXT;comment:db,sql,excel,custom,api" json:"tableType"` //'db,sql,excel,custom',
-	Mode         string              `gorm:"name;type:TEXT;comment:原始表信息" json:"mode"`                        //'连接模式：0-直连，1-定时同步',
-	Info         string              `gorm:"name;type:TEXT;comment:原始表信息" json:"name"`
-	CreateBy     int64               `gorm:"create_by" json:"createBy"`         //创建人ID
-	Columns      []DevGenTableColumn `gorm:"-"                  json:"columns"` //字段信息
+func (VisualDataSetGroup) TableName() string {
+	return "visual_data_set_group"
+}
+
+type VisualDataSetTable struct {
+	model.BaseModelD
+	TableId      string               `gorm:"primary_key;tableId;comment:表id" json:"tableId"`
+	DataSourceId string               `gorm:"dataSourceId;type:varchar(64);comment:数据圆ID" json:"dataSourceId"`
+	TableType    string               `gorm:"tableType;type:varchar(64);comment:db,sql,excel,custom,api" json:"tableType"` //'db,sql,excel,custom',
+	Mode         string               `gorm:"mode;type:varchar(1);comment:原始表信息" json:"mode"`                              //'连接模式：0-直连，1-定时同步',
+	Info         string               `gorm:"info;type:TEXT;comment:原始表信息" json:"info"`
+	CreateBy     int64                `gorm:"create_by" json:"createBy"`        //创建人ID
+	Fields       []VisualDataSetField `gorm:"-"                  json:"fields"` //字段信息
+}
+
+func (VisualDataSetTable) TableName() string {
+	return "visual_data_set_table"
+}
+
+type VisualDataSetField struct {
+	model.BaseModelD
+	FieldId   string `gorm:"primary_key;fieldId;comment:表id" json:"fieldId"`
+	TableId   string `gorm:"tableId;type:varchar(64);comment:表id" json:"tableId"`
+	Comment   string `gorm:"comment;type:varchar(64);comment:字段描述"    json:"columnComment"` // 列描述
+	Name      string `gorm:"name;type:varchar(64);comment:字段名" json:"name"`
+	Type      string `gorm:"type;type:varchar(50);comment:字段类型" json:"type"`
+	GoType    string `gorm:"go_type;type:varchar(50);comment:go字段类型"           json:"goType"`  // Go类型
+	GoField   string `gorm:"go_field;type:varchar(50);comment:go对应字段"          json:"goField"` // Go字段名
+	JsonField string `gorm:"json_field;type:varchar(50);comment:json对应字段" json:"jsonField"`
+}
+
+func (VisualDataSetField) TableName() string {
+	return "visual_data_set_field"
 }
-*/
diff --git a/apps/visual/entity/data_source.go b/apps/visual/entity/data_source.go
index 74c9dee..b61fbe0 100644
--- a/apps/visual/entity/data_source.go
+++ b/apps/visual/entity/data_source.go
@@ -4,14 +4,13 @@ import "github.com/XM-GO/PandaKit/model"
 
 type VisualDataSource struct {
 	model.BaseModel
-	SourceId      string `gorm:"source_id;comment:数据源Id"   json:"sourceId"`                                       // 数据源Id
+	SourceId      string `gorm:"primary_key;source_id;comment:数据源Id"   json:"sourceId"`                           // 数据源Id
 	SourceType    string `gorm:"source_type;type:varchar(50);comment:数据源类型"         json:"sourceType"`            // 数据源类型
 	SourceName    string `gorm:"source_name;type:varchar(50);comment:数据源名称"      json:"sourceName"`               // 原名称
 	SourceComment string `gorm:"source_comment;type:varchar(50);comment:数据源描述"             json:"source_comment"` // 描述
 	Status        string `gorm:"status;type:varchar(1);comment:数据源状态" json:"status"`
 	Configuration string `gorm:"configuration;type:text;comment:详细信息" json:"configuration"`
 	CreateBy      int64  `gorm:"api" json:"createBy"` //创建人ID
-
 }
 
 type VisualDb struct {
@@ -25,7 +24,7 @@ type VisualDb struct {
 
 type VisualApi struct {
 	Method      string                 `gorm:"method" json:"method"`
-	url         string                 `gorm:"url" json:"url"`
+	Url         string                 `gorm:"url" json:"url"`
 	Headers     map[string]interface{} `gorm:"headers" json:"headers"`
 	RequestBody string                 `gorm:"db_username" json:"dbUsername"`
 	Auth        string                 `gorm:"db_password" json:"dbPassword"`
diff --git a/apps/visual/entity/rulechain.go b/apps/visual/entity/rulechain.go
index b2f9bd6..1f50b87 100644
--- a/apps/visual/entity/rulechain.go
+++ b/apps/visual/entity/rulechain.go
@@ -5,14 +5,17 @@ import (
 )
 
 type VisualRuleChain struct {
-	UserId       string `json:"userId"`
-	RuleId       string `json:"ruleId"`
-	RuleName     string `json:"ruleName"`
-	RuleDataJson string `json:"ruleDataJson"`
-	RuleBase64   string `json:"ruleBase64"` //缩略图 base64
-	RuleRemark   string `json:"ruleRemark"`
-	Status       string `json:"status"`
-	DeviceId     string `json:"deviceId"`
+	UserId       string `gorm:"userId;type:varchar(64);comment:用户Id" json:"userId"`
+	RuleId       string `gorm:"primary_key;" json:"ruleId"`
+	RuleName     string `gorm:"ruleName;type:varchar(50);comment:名称" json:"ruleName"`
+	RuleDataJson string `gorm:"ruleDataJson;type:varchar(50);comment:Json数据" json:"ruleDataJson"`
+	RuleBase64   string `gorm:"ruleBase64;type:varchar(50);comment:Base64缩略图" json:"ruleBase64"` //缩略图 base64
+	RuleRemark   string `gorm:"ruleRemark;type:varchar(50);comment:说明" json:"ruleRemark"`
+	Status       string `gorm:"status;type:varchar(50);comment:状态" json:"status"`
 	Creator      string `json:"creator"` //创建者
 	model.BaseModel
 }
+
+func (VisualRuleChain) TableName() string {
+	return "visual_rule_chain"
+}
diff --git a/apps/visual/entity/screen.go b/apps/visual/entity/screen.go
new file mode 100644
index 0000000..ade7061
--- /dev/null
+++ b/apps/visual/entity/screen.go
@@ -0,0 +1,19 @@
+package entity
+
+import "github.com/XM-GO/PandaKit/model"
+
+type VisualScreen struct {
+	UserId         string `gorm:"userId;type:varchar(64);comment:用户Id" json:"userId"`
+	ScreenId       string `gorm:"primary_key;" json:"screenId"`
+	ScreenName     string `gorm:"screenName;type:varchar(50);comment:名称" json:"screenName"`
+	ScreenDataJson string `gorm:"screenDataJson;type:varchar(50);comment:Json数据" json:"screenDataJson"`
+	ScreenBase64   string `gorm:"screenBase64;type:varchar(50);comment:Base64缩略图" json:"screenBase64"` //缩略图 base64
+	ScreenRemark   string `gorm:"screenRemark;type:varchar(50);comment:说明" json:"screenRemark"`
+	Status         string `gorm:"status;type:varchar(50);comment:状态" json:"status"`
+	Creator        string `json:"creator"` //创建者
+	model.BaseModel
+}
+
+func (VisualScreen) TableName() string {
+	return "visual_screen"
+}
diff --git a/apps/visual/entity/visual_data_set_table_task.go b/apps/visual/entity/visual_data_set_table_task.go
new file mode 100644
index 0000000..ac7fa1a
--- /dev/null
+++ b/apps/visual/entity/visual_data_set_table_task.go
@@ -0,0 +1,27 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/entity/visual_data_set_table_task.go
+// 生成人：panda
+// ==========================================================================
+package entity
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+)
+
+type VisualDataSetTableTask struct {
+	TableId   string `gorm:"table_id;type:varchar(64);comment:表ID" json:"tableId" `              // 表ID
+	Id        string `gorm:"primary_key;" json:"id"`                                             // ID
+	StartTime int64  `gorm:"start_time;type:bigint;comment:开始时间" json:"startTime" `              // 开始时间
+	End       string `gorm:"end;type:varchar(50);comment:结束限制 0 无限制 1 设定结束时间" json:"end" `       // 结束限制 0 无限制 1 设定结束时间
+	EndTime   int64  `gorm:"end_time;type:bigint;comment:结束时间" json:"endTime" `                  // 结束时间
+	Name      string `gorm:"name;type:varchar(255);comment:任务名称" json:"name" binding:"required"` // 任务名称
+	Cron      string `gorm:"cron;type:varchar(255);comment:cron表达式" json:"cron" `                // cron表达式
+	Type      string `gorm:"type;type:varchar(50);comment:更新方式：0-全量更新 1-增量更新" json:"type" `      // 更新方式：0-全量更新 1-增量更新
+	Rate      string `gorm:"rate;type:varchar(50);comment:执行频率：0 一次性 1 cron" json:"rate" `       // 执行频率：0 一次性 1 cron
+	model.BaseModelD
+}
+
+func (VisualDataSetTableTask) TableName() string {
+	return "visual_data_set_table_task"
+}
diff --git a/apps/visual/entity/visual_data_set_table_task_log.go b/apps/visual/entity/visual_data_set_table_task_log.go
new file mode 100644
index 0000000..dda9d18
--- /dev/null
+++ b/apps/visual/entity/visual_data_set_table_task_log.go
@@ -0,0 +1,23 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/entity/visual_data_set_table_task_log.go
+// 生成人：panda
+// ==========================================================================
+package entity
+
+import "github.com/XM-GO/PandaKit/model"
+
+type VisualDataSetTableTaskLog struct {
+	TaskId     string `gorm:"task_id;type:varchar(50);comment:任务ID" json:"taskId" `                  // 任务ID
+	Id         string `gorm:"primary_key;" json:"id"`                                                // ID
+	Status     string `gorm:"status;type:varchar(50);comment:执行状态" json:"status" binding:"required"` // 执行状态
+	CreateTime int64  `gorm:"create_time;type:bigint;comment:创建时间" json:"createTime" `               // 创建时间
+	Info       string `gorm:"info;type:text;comment:错误信息" json:"info" `                              // 错误信息
+	EndTime    int64  `gorm:"end_time;type:bigint;comment:结束时间" json:"endTime" `                     // 结束时间
+	TableId    string `gorm:"table_id;type:varchar(50);comment:表ID" json:"tableId" `                 // 表ID
+	model.BaseModelD
+}
+
+func (VisualDataSetTableTaskLog) TableName() string {
+	return "visual_data_set_table_task_log"
+}
diff --git a/apps/visual/router/data_source.go b/apps/visual/router/data_source.go
new file mode 100644
index 0000000..c0f74ed
--- /dev/null
+++ b/apps/visual/router/data_source.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/router/visual_data_source.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSourceRouter(container *restful.Container) {
+	s := &api.VisualDataSourceApi{
+		VisualDataSourceApp: services.VisualDataSourceModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/datasource").Produces(restful.MIME_JSON)
+	tags := []string{"datasource"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSource分页列表").Handle(s.GetVisualDataSourceList)
+	}).
+		Doc("获取DataSource分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{sourceId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSource信息").Handle(s.GetVisualDataSource)
+	}).
+		Doc("获取DataSource信息").
+		Param(ws.PathParameter("sourceId", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSource{}). // on the response
+		Returns(200, "OK", entity.VisualDataSource{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSource信息").Handle(s.InsertVisualDataSource)
+	}).
+		Doc("添加DataSource信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSource{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSource信息").Handle(s.UpdateVisualDataSource)
+	}).
+		Doc("修改DataSource信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSource{}))
+
+	ws.Route(ws.DELETE("/{sourceId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSource信息").Handle(s.DeleteVisualDataSource)
+	}).
+		Doc("删除DataSource信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("sourceId", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/dataset_group.go b/apps/visual/router/dataset_group.go
new file mode 100644
index 0000000..da63a55
--- /dev/null
+++ b/apps/visual/router/dataset_group.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/router/visual_data_set_group.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSetGroupRouter(container *restful.Container) {
+	s := &api.VisualDataSetGroupApi{
+		VisualDataSetGroupApp: services.VisualDataSetGroupModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/datasetgroup").Produces(restful.MIME_JSON)
+	tags := []string{"datasetgroup"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetGroup分页列表").Handle(s.GetVisualDataSetGroupList)
+	}).
+		Doc("获取DataSetGroup分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{id}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetGroup信息").Handle(s.GetVisualDataSetGroup)
+	}).
+		Doc("获取DataSetGroup信息").
+		Param(ws.PathParameter("", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSetGroup{}). // on the response
+		Returns(200, "OK", entity.VisualDataSetGroup{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSetGroup信息").Handle(s.InsertVisualDataSetGroup)
+	}).
+		Doc("添加DataSetGroup信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetGroup{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSetGroup信息").Handle(s.UpdateVisualDataSetGroup)
+	}).
+		Doc("修改DataSetGroup信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetGroup{}))
+
+	ws.Route(ws.DELETE("/{}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSetGroup信息").Handle(s.DeleteVisualDataSetGroup)
+	}).
+		Doc("删除DataSetGroup信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/rulechain.go b/apps/visual/router/rulechain.go
index 29085fc..267b50e 100644
--- a/apps/visual/router/rulechain.go
+++ b/apps/visual/router/rulechain.go
@@ -1,4 +1,4 @@
-package api
+package router
 
 import (
 	"github.com/XM-GO/PandaKit/model"
diff --git a/apps/visual/router/visual_data_set_field.go b/apps/visual/router/visual_data_set_field.go
new file mode 100644
index 0000000..e961f8e
--- /dev/null
+++ b/apps/visual/router/visual_data_set_field.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/router/visual_data_set_field.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSetFieldRouter(container *restful.Container) {
+	s := &api.VisualDataSetFieldApi{
+		VisualDataSetFieldApp: services.VisualDataSetFieldModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/dataset/field").Produces(restful.MIME_JSON)
+	tags := []string{"datasetfield"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetField分页列表").Handle(s.GetVisualDataSetFieldList)
+	}).
+		Doc("获取DataSetField分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{fieldId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetField信息").Handle(s.GetVisualDataSetField)
+	}).
+		Doc("获取DataSetField信息").
+		Param(ws.PathParameter("fieldId", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSetField{}). // on the response
+		Returns(200, "OK", entity.VisualDataSetField{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSetField信息").Handle(s.InsertVisualDataSetField)
+	}).
+		Doc("添加DataSetField信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetField{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSetField信息").Handle(s.UpdateVisualDataSetField)
+	}).
+		Doc("修改DataSetField信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetField{}))
+
+	ws.Route(ws.DELETE("/{fieldId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSetField信息").Handle(s.DeleteVisualDataSetField)
+	}).
+		Doc("删除DataSetField信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("fieldId", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/visual_data_set_table.go b/apps/visual/router/visual_data_set_table.go
new file mode 100644
index 0000000..a5d15c3
--- /dev/null
+++ b/apps/visual/router/visual_data_set_table.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/router/visual_data_set_table.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSetTableRouter(container *restful.Container) {
+	s := &api.VisualDataSetTableApi{
+		VisualDataSetTableApp: services.VisualDataSetTableModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/dataset/table").Produces(restful.MIME_JSON)
+	tags := []string{"datasettable"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTable分页列表").Handle(s.GetVisualDataSetTableList)
+	}).
+		Doc("获取DataSetTable分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{tableId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTable信息").Handle(s.GetVisualDataSetTable)
+	}).
+		Doc("获取DataSetTable信息").
+		Param(ws.PathParameter("tableId", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSetTable{}). // on the response
+		Returns(200, "OK", entity.VisualDataSetTable{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSetTable信息").Handle(s.InsertVisualDataSetTable)
+	}).
+		Doc("添加DataSetTable信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTable{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSetTable信息").Handle(s.UpdateVisualDataSetTable)
+	}).
+		Doc("修改DataSetTable信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTable{}))
+
+	ws.Route(ws.DELETE("/{tableId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSetTable信息").Handle(s.DeleteVisualDataSetTable)
+	}).
+		Doc("删除DataSetTable信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("tableId", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/visual_data_set_table_task.go b/apps/visual/router/visual_data_set_table_task.go
new file mode 100644
index 0000000..411b0c1
--- /dev/null
+++ b/apps/visual/router/visual_data_set_table_task.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/router/visual_data_set_table_task.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSetTableTaskRouter(container *restful.Container) {
+	s := &api.VisualDataSetTableTaskApi{
+		VisualDataSetTableTaskApp: services.VisualDataSetTableTaskModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/dataset/tabletask").Produces(restful.MIME_JSON)
+	tags := []string{"datasettabletask"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTableTask分页列表").Handle(s.GetVisualDataSetTableTaskList)
+	}).
+		Doc("获取DataSetTableTask分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{id}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTableTask信息").Handle(s.GetVisualDataSetTableTask)
+	}).
+		Doc("获取DataSetTableTask信息").
+		Param(ws.PathParameter("id", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSetTableTask{}). // on the response
+		Returns(200, "OK", entity.VisualDataSetTableTask{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSetTableTask信息").Handle(s.InsertVisualDataSetTableTask)
+	}).
+		Doc("添加DataSetTableTask信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTableTask{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSetTableTask信息").Handle(s.UpdateVisualDataSetTableTask)
+	}).
+		Doc("修改DataSetTableTask信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTableTask{}))
+
+	ws.Route(ws.DELETE("/{id}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSetTableTask信息").Handle(s.DeleteVisualDataSetTableTask)
+	}).
+		Doc("删除DataSetTableTask信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("id", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/visual_data_set_table_task_log.go b/apps/visual/router/visual_data_set_table_task_log.go
new file mode 100644
index 0000000..cf557d0
--- /dev/null
+++ b/apps/visual/router/visual_data_set_table_task_log.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/router/visual_data_set_table_task_log.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualDataSetTableTaskLogRouter(container *restful.Container) {
+	s := &api.VisualDataSetTableTaskLogApi{
+		VisualDataSetTableTaskLogApp: services.VisualDataSetTableTaskLogModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/dataset/tabletask/log").Produces(restful.MIME_JSON)
+	tags := []string{"datasettabletasklog"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTableTaskLog分页列表").Handle(s.GetVisualDataSetTableTaskLogList)
+	}).
+		Doc("获取DataSetTableTaskLog分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{id}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取DataSetTableTaskLog信息").Handle(s.GetVisualDataSetTableTaskLog)
+	}).
+		Doc("获取DataSetTableTaskLog信息").
+		Param(ws.PathParameter("id", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualDataSetTableTaskLog{}). // on the response
+		Returns(200, "OK", entity.VisualDataSetTableTaskLog{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加DataSetTableTaskLog信息").Handle(s.InsertVisualDataSetTableTaskLog)
+	}).
+		Doc("添加DataSetTableTaskLog信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTableTaskLog{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改DataSetTableTaskLog信息").Handle(s.UpdateVisualDataSetTableTaskLog)
+	}).
+		Doc("修改DataSetTableTaskLog信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualDataSetTableTaskLog{}))
+
+	ws.Route(ws.DELETE("/{id}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除DataSetTableTaskLog信息").Handle(s.DeleteVisualDataSetTableTaskLog)
+	}).
+		Doc("删除DataSetTableTaskLog信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("id", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/router/visual_screen.go b/apps/visual/router/visual_screen.go
new file mode 100644
index 0000000..51777e0
--- /dev/null
+++ b/apps/visual/router/visual_screen.go
@@ -0,0 +1,70 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:26:49 +0800 CST
+// 生成路径: apps/visual/router/visual_screen.go
+// 生成人：panda
+// ==========================================================================
+package router
+
+import (
+	"github.com/XM-GO/PandaKit/model"
+	"github.com/XM-GO/PandaKit/restfulx"
+	"pandax/apps/visual/api"
+	"pandax/apps/visual/entity"
+	"pandax/apps/visual/services"
+
+	restfulspec "github.com/emicklei/go-restful-openapi/v2"
+	"github.com/emicklei/go-restful/v3"
+)
+
+func InitVisualScreenRouter(container *restful.Container) {
+	s := &api.VisualScreenApi{
+		VisualScreenApp: services.VisualScreenModelDao,
+	}
+
+	ws := new(restful.WebService)
+	ws.Path("/visual/screen").Produces(restful.MIME_JSON)
+	tags := []string{"screen"}
+
+	ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取Screen分页列表").Handle(s.GetVisualScreenList)
+	}).
+		Doc("获取Screen分页列表").
+		Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")).
+		Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(model.ResultPage{}).
+		Returns(200, "OK", model.ResultPage{}))
+
+	ws.Route(ws.GET("/{screenId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("获取Screen信息").Handle(s.GetVisualScreen)
+	}).
+		Doc("获取Screen信息").
+		Param(ws.PathParameter("screenId", "Id").DataType("string")).
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Writes(entity.VisualScreen{}). // on the response
+		Returns(200, "OK", entity.VisualScreen{}).
+		Returns(404, "Not Found", nil))
+
+	ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("添加Screen信息").Handle(s.InsertVisualScreen)
+	}).
+		Doc("添加Screen信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualScreen{}))
+
+	ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("修改Screen信息").Handle(s.UpdateVisualScreen)
+	}).
+		Doc("修改Screen信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Reads(entity.VisualScreen{}))
+
+	ws.Route(ws.DELETE("/{screenId}").To(func(request *restful.Request, response *restful.Response) {
+		restfulx.NewReqCtx(request, response).WithLog("删除Screen信息").Handle(s.DeleteVisualScreen)
+	}).
+		Doc("删除Screen信息").
+		Metadata(restfulspec.KeyOpenAPITags, tags).
+		Param(ws.PathParameter("screenId", "多id 1,2,3").DataType("string")))
+
+	container.Add(ws)
+}
diff --git a/apps/visual/services/data_source.go b/apps/visual/services/data_source.go
new file mode 100644
index 0000000..09d2c94
--- /dev/null
+++ b/apps/visual/services/data_source.go
@@ -0,0 +1,113 @@
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/services/visual_data_source.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSourceModel interface {
+		Insert(data entity.VisualDataSource) *entity.VisualDataSource
+		FindOne(sourceId string) *entity.VisualDataSource
+		FindListPage(page, pageSize int, data entity.VisualDataSource) (*[]entity.VisualDataSource, int64)
+		FindList(data entity.VisualDataSource) *[]entity.VisualDataSource
+		Update(data entity.VisualDataSource) *entity.VisualDataSource
+		Delete(sourceIds []string)
+	}
+
+	datasourceModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSourceModelDao VisualDataSourceModel = &datasourceModelImpl{
+	table: `visual_data_source`,
+}
+
+func (m *datasourceModelImpl) Insert(data entity.VisualDataSource) *entity.VisualDataSource {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加数据源失败")
+	return &data
+}
+
+func (m *datasourceModelImpl) FindOne(sourceId string) *entity.VisualDataSource {
+	resData := new(entity.VisualDataSource)
+	db := global.Db.Table(m.table).Where("source_id = ?", sourceId)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询数据源失败")
+	return resData
+}
+
+func (m *datasourceModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSource) (*[]entity.VisualDataSource, int64) {
+	list := make([]entity.VisualDataSource, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.SourceId != "" {
+		db = db.Where("source_id = ?", data.SourceId)
+	}
+	db.Where("delete_time IS NULL")
+	if data.SourceComment != "" {
+		db = db.Where("source_comment = ?", data.SourceComment)
+	}
+	if data.SourceType != "" {
+		db = db.Where("source_type = ?", data.SourceType)
+	}
+	if data.SourceName != "" {
+		db = db.Where("source_name like ?", "%"+data.SourceName+"%")
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.Configuration != "" {
+		db = db.Where("configuration = ?", data.Configuration)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询数据源分页列表失败")
+	return &list, total
+}
+
+func (m *datasourceModelImpl) FindList(data entity.VisualDataSource) *[]entity.VisualDataSource {
+	list := make([]entity.VisualDataSource, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.SourceId != "" {
+		db = db.Where("source_id = ?", data.SourceId)
+	}
+	db.Where("delete_time IS NULL")
+	if data.SourceComment != "" {
+		db = db.Where("source_comment = ?", data.SourceComment)
+	}
+	if data.SourceType != "" {
+		db = db.Where("source_type = ?", data.SourceType)
+	}
+	if data.SourceName != "" {
+		db = db.Where("source_name like ?", "%"+data.SourceName+"%")
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.Configuration != "" {
+		db = db.Where("configuration = ?", data.Configuration)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询数据源列表失败")
+	return &list
+}
+
+func (m *datasourceModelImpl) Update(data entity.VisualDataSource) *entity.VisualDataSource {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改数据源失败")
+	return &data
+}
+
+func (m *datasourceModelImpl) Delete(sourceIds []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSource{}, "source_id in (?)", sourceIds).Error, "删除数据源失败")
+}
diff --git a/apps/visual/services/dataset_group.go b/apps/visual/services/dataset_group.go
new file mode 100644
index 0000000..d9af210
--- /dev/null
+++ b/apps/visual/services/dataset_group.go
@@ -0,0 +1,87 @@
+// ==========================================================================
+// 生成日期：2023-04-10 02:51:27 +0000 UTC
+// 生成路径: apps/visual/services/visual_data_set_group.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSetGroupModel interface {
+		Insert(data entity.VisualDataSetGroup) *entity.VisualDataSetGroup
+		FindOne(string) *entity.VisualDataSetGroup
+		FindListPage(page, pageSize int, data entity.VisualDataSetGroup) (*[]entity.VisualDataSetGroup, int64)
+		FindList(data entity.VisualDataSetGroup) *[]entity.VisualDataSetGroup
+		Update(data entity.VisualDataSetGroup) *entity.VisualDataSetGroup
+		Delete(s []string)
+	}
+
+	datasetgroupModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSetGroupModelDao VisualDataSetGroupModel = &datasetgroupModelImpl{
+	table: `visual_data_set_group`,
+}
+
+func (m *datasetgroupModelImpl) Insert(data entity.VisualDataSetGroup) *entity.VisualDataSetGroup {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加数据集分组失败")
+	return &data
+}
+
+func (m *datasetgroupModelImpl) FindOne(id string) *entity.VisualDataSetGroup {
+	resData := new(entity.VisualDataSetGroup)
+	db := global.Db.Table(m.table).Where("id = ?", id)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询数据集分组失败")
+	return resData
+}
+
+func (m *datasetgroupModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSetGroup) (*[]entity.VisualDataSetGroup, int64) {
+	list := make([]entity.VisualDataSetGroup, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.Name != "" {
+		db = db.Where("name like ?", "%"+data.Name+"%")
+	}
+	if data.Pid != "" {
+		db = db.Where("pid = ?", data.Pid)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询数据集分组分页列表失败")
+	return &list, total
+}
+
+func (m *datasetgroupModelImpl) FindList(data entity.VisualDataSetGroup) *[]entity.VisualDataSetGroup {
+	list := make([]entity.VisualDataSetGroup, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.Name != "" {
+		db = db.Where("name like ?", "%"+data.Name+"%")
+	}
+	if data.Pid != "" {
+		db = db.Where("pid = ?", data.Pid)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询数据集分组列表失败")
+	return &list
+}
+
+func (m *datasetgroupModelImpl) Update(data entity.VisualDataSetGroup) *entity.VisualDataSetGroup {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改数据集分组失败")
+	return &data
+}
+
+func (m *datasetgroupModelImpl) Delete(s []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetGroup{}, "id in (?)", s).Error, "删除数据集分组失败")
+}
diff --git a/apps/visual/services/rulechain.go b/apps/visual/services/rulechain.go
index 91f1542..6cdcf8d 100644
--- a/apps/visual/services/rulechain.go
+++ b/apps/visual/services/rulechain.go
@@ -56,7 +56,7 @@ func (m *ruleChainModelImpl) FindListPage(page, pageSize int, data entity.Visual
 		db = db.Where("user_id = ?", data.UserId)
 	}
 	if data.RuleName != "" {
-		db = db.Where("rule_name = ?", data.RuleName)
+		db = db.Where("rule_name like ?", "%"+data.RuleName+"%")
 	}
 	if data.RuleRemark != "" {
 		db = db.Where("rule_remark like ?", "%"+data.RuleRemark+"%")
@@ -79,7 +79,7 @@ func (m *ruleChainModelImpl) FindList(data entity.VisualRuleChain) *[]entity.Vis
 		db = db.Where("user_id = ?", data.UserId)
 	}
 	if data.RuleName != "" {
-		db = db.Where("rule_name = ?", data.RuleName)
+		db = db.Where("rule_name like ?", "%"+data.RuleName+"%")
 	}
 	if data.RuleRemark != "" {
 		db = db.Where("rule_remark like ?", "%"+data.RuleRemark+"%")
diff --git a/apps/visual/services/visual_data_set_field.go b/apps/visual/services/visual_data_set_field.go
new file mode 100644
index 0000000..c8a3079
--- /dev/null
+++ b/apps/visual/services/visual_data_set_field.go
@@ -0,0 +1,117 @@
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/services/visual_data_set_field.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSetFieldModel interface {
+		Insert(data entity.VisualDataSetField) *entity.VisualDataSetField
+		FindOne(fieldId string) *entity.VisualDataSetField
+		FindListPage(page, pageSize int, data entity.VisualDataSetField) (*[]entity.VisualDataSetField, int64)
+		FindList(data entity.VisualDataSetField) *[]entity.VisualDataSetField
+		Update(data entity.VisualDataSetField) *entity.VisualDataSetField
+		Delete(fieldIds []string)
+	}
+
+	datasetfieldModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSetFieldModelDao VisualDataSetFieldModel = &datasetfieldModelImpl{
+	table: `visual_data_set_field`,
+}
+
+func (m *datasetfieldModelImpl) Insert(data entity.VisualDataSetField) *entity.VisualDataSetField {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加数据集字段失败")
+	return &data
+}
+
+func (m *datasetfieldModelImpl) FindOne(fieldId string) *entity.VisualDataSetField {
+	resData := new(entity.VisualDataSetField)
+	db := global.Db.Table(m.table).Where("field_id = ?", fieldId)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询数据集字段失败")
+	return resData
+}
+
+func (m *datasetfieldModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSetField) (*[]entity.VisualDataSetField, int64) {
+	list := make([]entity.VisualDataSetField, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.JsonField != "" {
+		db = db.Where("json_field = ?", data.JsonField)
+	}
+	if data.Name != "" {
+		db = db.Where("name like ?", "%"+data.Name+"%")
+	}
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	if data.Comment != "" {
+		db = db.Where("comment = ?", data.Comment)
+	}
+	if data.GoType != "" {
+		db = db.Where("go_type = ?", data.GoType)
+	}
+	if data.Type != "" {
+		db = db.Where("type = ?", data.Type)
+	}
+	if data.GoField != "" {
+		db = db.Where("go_field = ?", data.GoField)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询数据集字段分页列表失败")
+	return &list, total
+}
+
+func (m *datasetfieldModelImpl) FindList(data entity.VisualDataSetField) *[]entity.VisualDataSetField {
+	list := make([]entity.VisualDataSetField, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.JsonField != "" {
+		db = db.Where("json_field = ?", data.JsonField)
+	}
+	if data.Name != "" {
+		db = db.Where("name like ?", "%"+data.Name+"%")
+	}
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	if data.Comment != "" {
+		db = db.Where("comment = ?", data.Comment)
+	}
+	if data.GoType != "" {
+		db = db.Where("go_type = ?", data.GoType)
+	}
+	if data.Type != "" {
+		db = db.Where("type = ?", data.Type)
+	}
+	if data.GoField != "" {
+		db = db.Where("go_field = ?", data.GoField)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询数据集字段列表失败")
+	return &list
+}
+
+func (m *datasetfieldModelImpl) Update(data entity.VisualDataSetField) *entity.VisualDataSetField {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改数据集字段失败")
+	return &data
+}
+
+func (m *datasetfieldModelImpl) Delete(fieldIds []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetField{}, "field_id in (?)", fieldIds).Error, "删除数据集字段失败")
+}
diff --git a/apps/visual/services/visual_data_set_table.go b/apps/visual/services/visual_data_set_table.go
new file mode 100644
index 0000000..bde5631
--- /dev/null
+++ b/apps/visual/services/visual_data_set_table.go
@@ -0,0 +1,93 @@
+// ==========================================================================
+// 生成日期：2023-04-10 03:05:21 +0800 CST
+// 生成路径: apps/visual/services/visual_data_set_table.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSetTableModel interface {
+		Insert(data entity.VisualDataSetTable) *entity.VisualDataSetTable
+		FindOne(tableId string) *entity.VisualDataSetTable
+		FindListPage(page, pageSize int, data entity.VisualDataSetTable) (*[]entity.VisualDataSetTable, int64)
+		FindList(data entity.VisualDataSetTable) *[]entity.VisualDataSetTable
+		Update(data entity.VisualDataSetTable) *entity.VisualDataSetTable
+		Delete(tableIds []string)
+	}
+
+	datasettableModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSetTableModelDao VisualDataSetTableModel = &datasettableModelImpl{
+	table: `visual_data_set_table`,
+}
+
+func (m *datasettableModelImpl) Insert(data entity.VisualDataSetTable) *entity.VisualDataSetTable {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加数据集表失败")
+	return &data
+}
+
+func (m *datasettableModelImpl) FindOne(tableId string) *entity.VisualDataSetTable {
+	resData := new(entity.VisualDataSetTable)
+	db := global.Db.Table(m.table).Where("table_id = ?", tableId)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询数据集表失败")
+	return resData
+}
+
+func (m *datasettableModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSetTable) (*[]entity.VisualDataSetTable, int64) {
+	list := make([]entity.VisualDataSetTable, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.DataSourceId != "" {
+		db = db.Where("data_source_id = ?", data.DataSourceId)
+	}
+	if data.TableType != "" {
+		db = db.Where("table_type = ?", data.TableType)
+	}
+	if data.Mode != "" {
+		db = db.Where("mode = ?", data.Mode)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询数据集表分页列表失败")
+	return &list, total
+}
+
+func (m *datasettableModelImpl) FindList(data entity.VisualDataSetTable) *[]entity.VisualDataSetTable {
+	list := make([]entity.VisualDataSetTable, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.DataSourceId != "" {
+		db = db.Where("data_source_id = ?", data.DataSourceId)
+	}
+	if data.TableType != "" {
+		db = db.Where("table_type = ?", data.TableType)
+	}
+	if data.Mode != "" {
+		db = db.Where("mode = ?", data.Mode)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询数据集表列表失败")
+	return &list
+}
+
+func (m *datasettableModelImpl) Update(data entity.VisualDataSetTable) *entity.VisualDataSetTable {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改数据集表失败")
+	return &data
+}
+
+func (m *datasettableModelImpl) Delete(tableIds []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetTable{}, "table_id in (?)", tableIds).Error, "删除数据集表失败")
+}
diff --git a/apps/visual/services/visual_data_set_table_task.go b/apps/visual/services/visual_data_set_table_task.go
new file mode 100644
index 0000000..bec0e5f
--- /dev/null
+++ b/apps/visual/services/visual_data_set_table_task.go
@@ -0,0 +1,96 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/services/visual_data_set_table_task.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSetTableTaskModel interface {
+		Insert(data entity.VisualDataSetTableTask) *entity.VisualDataSetTableTask
+		FindOne(id string) *entity.VisualDataSetTableTask
+		FindListPage(page, pageSize int, data entity.VisualDataSetTableTask) (*[]entity.VisualDataSetTableTask, int64)
+		FindList(data entity.VisualDataSetTableTask) *[]entity.VisualDataSetTableTask
+		Update(data entity.VisualDataSetTableTask) *entity.VisualDataSetTableTask
+		Delete(ids []string)
+	}
+
+	datasettabletaskModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSetTableTaskModelDao VisualDataSetTableTaskModel = &datasettabletaskModelImpl{
+	table: `visual_data_set_table_task`,
+}
+
+func (m *datasettabletaskModelImpl) Insert(data entity.VisualDataSetTableTask) *entity.VisualDataSetTableTask {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加生成数据集任务失败")
+	return &data
+}
+
+func (m *datasettabletaskModelImpl) FindOne(id string) *entity.VisualDataSetTableTask {
+	resData := new(entity.VisualDataSetTableTask)
+	db := global.Db.Table(m.table).Where("id = ?", id)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询生成数据集任务失败")
+	return resData
+}
+
+func (m *datasettabletaskModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSetTableTask) (*[]entity.VisualDataSetTableTask, int64) {
+	list := make([]entity.VisualDataSetTableTask, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	if data.Type != "" {
+		db = db.Where("type = ?", data.Type)
+	}
+	if data.Rate != "" {
+		db = db.Where("rate = ?", data.Rate)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询生成数据集任务分页列表失败")
+	return &list, total
+}
+
+func (m *datasettabletaskModelImpl) FindList(data entity.VisualDataSetTableTask) *[]entity.VisualDataSetTableTask {
+	list := make([]entity.VisualDataSetTableTask, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	if data.Name != "" {
+		db = db.Where("name like ?", "%"+data.Name+"%")
+	}
+	if data.Type != "" {
+		db = db.Where("type = ?", data.Type)
+	}
+	if data.Rate != "" {
+		db = db.Where("rate = ?", data.Rate)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询生成数据集任务列表失败")
+	return &list
+}
+
+func (m *datasettabletaskModelImpl) Update(data entity.VisualDataSetTableTask) *entity.VisualDataSetTableTask {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改生成数据集任务失败")
+	return &data
+}
+
+func (m *datasettabletaskModelImpl) Delete(ids []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetTableTask{}, "id in (?)", ids).Error, "删除生成数据集任务失败")
+}
diff --git a/apps/visual/services/visual_data_set_table_task_log.go b/apps/visual/services/visual_data_set_table_task_log.go
new file mode 100644
index 0000000..6014d06
--- /dev/null
+++ b/apps/visual/services/visual_data_set_table_task_log.go
@@ -0,0 +1,93 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:31:34 +0800 CST
+// 生成路径: apps/visual/services/visual_data_set_table_task_log.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualDataSetTableTaskLogModel interface {
+		Insert(data entity.VisualDataSetTableTaskLog) *entity.VisualDataSetTableTaskLog
+		FindOne(id string) *entity.VisualDataSetTableTaskLog
+		FindListPage(page, pageSize int, data entity.VisualDataSetTableTaskLog) (*[]entity.VisualDataSetTableTaskLog, int64)
+		FindList(data entity.VisualDataSetTableTaskLog) *[]entity.VisualDataSetTableTaskLog
+		Update(data entity.VisualDataSetTableTaskLog) *entity.VisualDataSetTableTaskLog
+		Delete(ids []string)
+	}
+
+	datasettabletasklogModelImpl struct {
+		table string
+	}
+)
+
+var VisualDataSetTableTaskLogModelDao VisualDataSetTableTaskLogModel = &datasettabletasklogModelImpl{
+	table: `visual_data_set_table_task_log`,
+}
+
+func (m *datasettabletasklogModelImpl) Insert(data entity.VisualDataSetTableTaskLog) *entity.VisualDataSetTableTaskLog {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加生成数据集任务日志失败")
+	return &data
+}
+
+func (m *datasettabletasklogModelImpl) FindOne(id string) *entity.VisualDataSetTableTaskLog {
+	resData := new(entity.VisualDataSetTableTaskLog)
+	db := global.Db.Table(m.table).Where("id = ?", id)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询生成数据集任务日志失败")
+	return resData
+}
+
+func (m *datasettabletasklogModelImpl) FindListPage(page, pageSize int, data entity.VisualDataSetTableTaskLog) (*[]entity.VisualDataSetTableTaskLog, int64) {
+	list := make([]entity.VisualDataSetTableTaskLog, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.Id != "" {
+		db = db.Where("id = ?", data.Id)
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询生成数据集任务日志分页列表失败")
+	return &list, total
+}
+
+func (m *datasettabletasklogModelImpl) FindList(data entity.VisualDataSetTableTaskLog) *[]entity.VisualDataSetTableTaskLog {
+	list := make([]entity.VisualDataSetTableTaskLog, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.TaskId != "" {
+		db = db.Where("task_id = ?", data.TaskId)
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.TableId != "" {
+		db = db.Where("table_id = ?", data.TableId)
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询生成数据集任务日志列表失败")
+	return &list
+}
+
+func (m *datasettabletasklogModelImpl) Update(data entity.VisualDataSetTableTaskLog) *entity.VisualDataSetTableTaskLog {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改生成数据集任务日志失败")
+	return &data
+}
+
+func (m *datasettabletasklogModelImpl) Delete(ids []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetTableTaskLog{}, "id in (?)", ids).Error, "删除生成数据集任务日志失败")
+}
diff --git a/apps/visual/services/visual_screen.go b/apps/visual/services/visual_screen.go
new file mode 100644
index 0000000..79b1ee2
--- /dev/null
+++ b/apps/visual/services/visual_screen.go
@@ -0,0 +1,107 @@
+// ==========================================================================
+// 生成日期：2023-04-10 11:26:49 +0800 CST
+// 生成路径: apps/visual/services/visual_screen.go
+// 生成人：panda
+// ==========================================================================
+
+package services
+
+import (
+	"github.com/XM-GO/PandaKit/biz"
+	"pandax/apps/visual/entity"
+	"pandax/pkg/global"
+)
+
+type (
+	VisualScreenModel interface {
+		Insert(data entity.VisualScreen) *entity.VisualScreen
+		FindOne(screenId string) *entity.VisualScreen
+		FindListPage(page, pageSize int, data entity.VisualScreen) (*[]entity.VisualScreen, int64)
+		FindList(data entity.VisualScreen) *[]entity.VisualScreen
+		Update(data entity.VisualScreen) *entity.VisualScreen
+		Delete(screenIds []string)
+	}
+
+	screenModelImpl struct {
+		table string
+	}
+)
+
+var VisualScreenModelDao VisualScreenModel = &screenModelImpl{
+	table: `visual_screen`,
+}
+
+func (m *screenModelImpl) Insert(data entity.VisualScreen) *entity.VisualScreen {
+	err := global.Db.Table(m.table).Create(&data).Error
+	biz.ErrIsNil(err, "添加bi大屏失败")
+	return &data
+}
+
+func (m *screenModelImpl) FindOne(screenId string) *entity.VisualScreen {
+	resData := new(entity.VisualScreen)
+	db := global.Db.Table(m.table).Where("screen_id = ?", screenId)
+	err := db.First(resData).Error
+	biz.ErrIsNil(err, "查询bi大屏失败")
+	return resData
+}
+
+func (m *screenModelImpl) FindListPage(page, pageSize int, data entity.VisualScreen) (*[]entity.VisualScreen, int64) {
+	list := make([]entity.VisualScreen, 0)
+	var total int64 = 0
+	offset := pageSize * (page - 1)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.UserId != "" {
+		db = db.Where("user_id = ?", data.UserId)
+	}
+	db.Where("delete_time IS NULL")
+	if data.ScreenName != "" {
+		db = db.Where("screen_name like ?", "%"+data.ScreenName+"%")
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.ScreenRemark != "" {
+		db = db.Where("screen_remark like ?", "%"+data.ScreenRemark+"%")
+	}
+	if data.Creator != "" {
+		db = db.Where("creator = ?", data.Creator)
+	}
+	err := db.Count(&total).Error
+	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	biz.ErrIsNil(err, "查询bi大屏分页列表失败")
+	return &list, total
+}
+
+func (m *screenModelImpl) FindList(data entity.VisualScreen) *[]entity.VisualScreen {
+	list := make([]entity.VisualScreen, 0)
+	db := global.Db.Table(m.table)
+	// 此处填写 where参数判断
+	if data.UserId != "" {
+		db = db.Where("user_id = ?", data.UserId)
+	}
+	db.Where("delete_time IS NULL")
+	if data.ScreenName != "" {
+		db = db.Where("screen_name like ?", "%"+data.ScreenName+"%")
+	}
+	if data.Status != "" {
+		db = db.Where("status = ?", data.Status)
+	}
+	if data.ScreenRemark != "" {
+		db = db.Where("screen_remark = ?", data.ScreenRemark)
+	}
+	if data.Creator != "" {
+		db = db.Where("screen_remark like ?", "%"+data.ScreenRemark+"%")
+	}
+	biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询bi大屏列表失败")
+	return &list
+}
+
+func (m *screenModelImpl) Update(data entity.VisualScreen) *entity.VisualScreen {
+	biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改bi大屏失败")
+	return &data
+}
+
+func (m *screenModelImpl) Delete(screenIds []string) {
+	biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualScreen{}, "screen_id in (?)", screenIds).Error, "删除bi大屏失败")
+}
diff --git a/main.go b/main.go
index 9ff3d4b..64d3904 100644
--- a/main.go
+++ b/main.go
@@ -63,7 +63,6 @@ var rootCmd = &cobra.Command{
 		stop := make(chan os.Signal, 1)
 		signal.Notify(stop, syscall.SIGTERM, os.Interrupt)
 		<-stop
-
 		if err := app.Stop(context.TODO()); err != nil {
 			log.Fatalf("fatal app stop: %s", err)
 			os.Exit(-3)
diff --git a/pandax b/pandax
deleted file mode 100644
index 6d5ec8e..0000000
Binary files a/pandax and /dev/null differ
diff --git a/pkg/initialize/table.go b/pkg/initialize/table.go
index ebbb4c2..1f911a6 100644
--- a/pkg/initialize/table.go
+++ b/pkg/initialize/table.go
@@ -7,7 +7,8 @@ import (
 	jobEntity "pandax/apps/job/entity"
 	logEntity "pandax/apps/log/entity"
 	resSourceEntity "pandax/apps/resource/entity"
-	"pandax/apps/system/entity"
+	systemEntity "pandax/apps/system/entity"
+	visualEntity "pandax/apps/visual/entity"
 	"pandax/pkg/global"
 )
 
@@ -18,22 +19,23 @@ func InitTable() {
 		biz.ErrIsNil(
 			global.Db.AutoMigrate(
 				//casbin.CasbinRule{},
-				entity.SysDept{},
-				entity.SysApi{},
-				entity.SysConfig{},
-				entity.SysDictType{},
-				entity.SysDictData{},
+				systemEntity.SysDept{},
+				systemEntity.SysApi{},
+				systemEntity.SysConfig{},
+				systemEntity.SysDictType{},
+				systemEntity.SysDictData{},
+				systemEntity.SysUser{},
+				systemEntity.SysTenants{},
+				systemEntity.SysRole{},
+				systemEntity.SysMenu{},
+				systemEntity.SysPost{},
+				systemEntity.SysRoleMenu{},
+				systemEntity.SysRoleDept{},
+				systemEntity.SysNotice{},
+
 				logEntity.LogLogin{},
 				logEntity.LogOper{},
 				logEntity.LogJob{},
-				entity.SysUser{},
-				entity.SysTenants{},
-				entity.SysRole{},
-				entity.SysMenu{},
-				entity.SysPost{},
-				entity.SysRoleMenu{},
-				entity.SysRoleDept{},
-				entity.SysNotice{},
 				jobEntity.SysJob{},
 				devEntity.DevGenTable{},
 				devEntity.DevGenTableColumn{},
@@ -46,6 +48,13 @@ func InitTable() {
 				flowEntity.FlowWorkOrder{},
 				flowEntity.FlowWorkOrderTemplate{},
 				flowEntity.FlowWorkStage{},
+
+				visualEntity.VisualDataSetGroup{},
+				visualEntity.VisualDataSource{},
+				visualEntity.VisualDataSetTable{},
+				visualEntity.VisualDataSetField{},
+				visualEntity.VisualScreen{},
+				visualEntity.VisualRuleChain{},
 			),
 			"初始化表失败")
 	}
diff --git a/pkg/rule_engine/message/message.go b/pkg/rule_engine/message/message.go
index 116de7d..ca9c40f 100644
--- a/pkg/rule_engine/message/message.go
+++ b/pkg/rule_engine/message/message.go
@@ -12,6 +12,7 @@ type Message interface {
 	GetOriginator() string
 	GetType() string
 	GetMsg() map[string]interface{}
+	GetMsgLogs() []MesLog
 	GetMetadata() Metadata
 	SetType(string)
 	SetMsg(map[string]interface{})
@@ -41,9 +42,10 @@ const (
 // NewMessage ...
 func NewMessage() Message {
 	return &defaultMessage{
-		id:  uuid.New().String(),
-		ts:  time.Now(),
-		msg: map[string]interface{}{},
+		id:     uuid.New().String(),
+		ts:     time.Now(),
+		msg:    map[string]interface{}{},
+		mesLog: make([]MesLog, 0),
 	}
 }
 
@@ -56,6 +58,7 @@ type defaultMessage struct {
 	deviceId   string                 //设备Id  UUID
 	msg        map[string]interface{} //数据		数据结构JSON  设备原始数据 msg
 	metadata   Metadata               //消息的元数据		包括，设备名称，设备类型，命名空间，时间戳等
+	mesLog     []MesLog
 }
 
 // NewMessageWithDetail ...
@@ -65,12 +68,14 @@ func NewMessageWithDetail(originator string, messageType string, msg map[string]
 		msgType:    messageType,
 		msg:        msg,
 		metadata:   metadata,
+		mesLog:     make([]MesLog, 0),
 	}
 }
 
 func (t *defaultMessage) GetOriginator() string             { return t.originator }
 func (t *defaultMessage) GetType() string                   { return t.msgType }
 func (t *defaultMessage) GetMsg() map[string]interface{}    { return t.msg }
+func (t *defaultMessage) GetMsgLogs() []MesLog              { return t.mesLog }
 func (t *defaultMessage) GetMetadata() Metadata             { return t.metadata }
 func (t *defaultMessage) SetType(msgType string)            { t.msgType = msgType }
 func (t *defaultMessage) SetMsg(msg map[string]interface{}) { t.msg = msg }
@@ -122,3 +127,11 @@ func (t *defaultMetadata) GetValues() map[string]interface{} {
 func (t *defaultMetadata) SetValues(values map[string]interface{}) {
 	t.values = values
 }
+
+type MesLog struct {
+	NodeName  string    `json:"nodeName"`
+	startTime time.Time `json:"startTime"`
+	endTime   time.Time `json:"endTime"`
+	result    string    `json:"result"`
+	Remark    string    `json:"remark"`
+}
diff --git a/pkg/transport/http_server.go b/pkg/transport/http_server.go
index c1f701e..ab08496 100644
--- a/pkg/transport/http_server.go
+++ b/pkg/transport/http_server.go
@@ -37,9 +37,10 @@ func (s *HttpServer) Type() Type {
 func (s *HttpServer) Start(ctx context.Context) error {
 	global.Log.Infof("HTTP Server listen: %s", s.Addr)
 	go func() {
-		if err := s.srv.ListenAndServe(); err != nil {
+		s.srv.ListenAndServe()
+		/*if err := s.srv.ListenAndServe(); err != nil {
 			global.Log.Errorf("error http serve: %s", err)
-		}
+		}*/
 	}()
 	return nil
 }