diff --git a/apps/visual/api/dataset_gropu.go b/apps/visual/api/dataset_gropu.go deleted file mode 100644 index fcd85cd..0000000 --- a/apps/visual/api/dataset_gropu.go +++ /dev/null @@ -1,65 +0,0 @@ -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_table_task.go b/apps/visual/api/visual_data_set_table_task.go deleted file mode 100644 index 56aec33..0000000 --- a/apps/visual/api/visual_data_set_table_task.go +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 20b46e1..0000000 --- a/apps/visual/api/visual_data_set_table_task_log.go +++ /dev/null @@ -1,65 +0,0 @@ -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/driver/pgsql_meta.go b/apps/visual/driver/pgsql_meta.go index e34933e..0e22534 100644 --- a/apps/visual/driver/pgsql_meta.go +++ b/apps/visual/driver/pgsql_meta.go @@ -109,3 +109,8 @@ func (pm *PgsqlMetadata) GetTableIndex(tableName string) []map[string]interface{ func (pm *PgsqlMetadata) GetTableRecord(tableName string, pageNum, pageSize int) ([]string, []map[string]interface{}, error) { return pm.di.SelectData(fmt.Sprintf("SELECT * FROM %s OFFSET %d LIMIT %d", tableName, (pageNum-1)*pageSize, pageSize)) } + +// 获取所有Schema +func (pm *PgsqlMetadata) GetSchemas() ([]string, []map[string]interface{}, error) { + return pm.di.SelectData("SELECT schema_name FROM information_schema.schemata") +} diff --git a/apps/visual/entity/data_set.go b/apps/visual/entity/data_set.go index b83005e..5341417 100644 --- a/apps/visual/entity/data_set.go +++ b/apps/visual/entity/data_set.go @@ -2,28 +2,16 @@ 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 `gorm:"pid;type:varchar(64);comment:父Id" json:"pid"` - Level int64 `gorm:"level;type:int;comment:等级" json:"level"` -} - -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-定时同步', + Name string `gorm:"name;type:varchar(64);comment:名称" json:"name"` + TableType string `gorm:"tableType;type:varchar(64);comment:db,sql,excel,union" json:"tableType"` Info string `gorm:"info;type:TEXT;comment:原始表信息" json:"info"` - CreateBy int64 `gorm:"create_by" json:"createBy"` //创建人ID - Fields []VisualDataSetField `gorm:"-" json:"fields"` //字段信息 + CreateBy int64 `gorm:"create_by" json:"createBy"` //创建人ID + DataSource VisualDataSource `gorm:"foreignKey:DataSourceId;references:SourceId" json:"dataSource"` + Fields []VisualDataSetField `gorm:"foreignKey:TableId" json:"fields"` //字段信息 } func (VisualDataSetTable) TableName() string { @@ -32,14 +20,16 @@ func (VisualDataSetTable) TableName() string { 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"` + 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"` + GroupType string `gorm:"group_type;type:varchar(1);comment:字段分组类型" json:"group_type"` //d 维度 g + OriginName string `gorm:"origin_name;type:varchar(50);comment:原始字段名" json:"origin_name"` + OriginType string `gorm:"origin_type;type:varchar(50);comment:原始字段类型" json:"origin_type"` + DeType int `gorm:"de_type;type:varchar(50);comment:数据源字段类型：0-文本，1-时间，2-数值(包括小数)" json:"deType"` + DeName string `gorm:"de_name;type:varchar(50);comment:数据源查询名" json:"deName"` + ExtField int `gorm:"ext_field;type:int;comment:是否扩展字段 0否 1是" json:"extField"` } func (VisualDataSetField) TableName() string { diff --git a/apps/visual/entity/visual_data_set_table_task.go b/apps/visual/entity/visual_data_set_table_task.go deleted file mode 100644 index ac7fa1a..0000000 --- a/apps/visual/entity/visual_data_set_table_task.go +++ /dev/null @@ -1,27 +0,0 @@ -// ========================================================================== -// 生成日期：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 deleted file mode 100644 index dda9d18..0000000 --- a/apps/visual/entity/visual_data_set_table_task_log.go +++ /dev/null @@ -1,23 +0,0 @@ -// ========================================================================== -// 生成日期：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/dataset_group.go b/apps/visual/router/dataset_group.go deleted file mode 100644 index d1ff746..0000000 --- a/apps/visual/router/dataset_group.go +++ /dev/null @@ -1,70 +0,0 @@ -// ========================================================================== -// 生成日期：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/dataset/group").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/visual_data_set_field.go b/apps/visual/router/visual_data_set_field.go index e961f8e..767715f 100644 --- a/apps/visual/router/visual_data_set_field.go +++ b/apps/visual/router/visual_data_set_field.go @@ -26,7 +26,7 @@ func InitVisualDataSetFieldRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("获取DataSetField分页列表").Handle(s.GetVisualDataSetFieldList) }). Doc("获取DataSetField分页列表"). Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). @@ -36,7 +36,7 @@ func InitVisualDataSetFieldRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("获取DataSetField信息").Handle(s.GetVisualDataSetField) }). Doc("获取DataSetField信息"). Param(ws.PathParameter("fieldId", "Id").DataType("string")). @@ -46,21 +46,21 @@ func InitVisualDataSetFieldRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("删除DataSetField信息").Handle(s.DeleteVisualDataSetField) }). Doc("删除DataSetField信息"). Metadata(restfulspec.KeyOpenAPITags, tags). diff --git a/apps/visual/router/visual_data_set_table.go b/apps/visual/router/visual_data_set_table.go index a5d15c3..4831c52 100644 --- a/apps/visual/router/visual_data_set_table.go +++ b/apps/visual/router/visual_data_set_table.go @@ -26,7 +26,7 @@ func InitVisualDataSetTableRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("获取DataSetTable分页列表").Handle(s.GetVisualDataSetTableList) }). Doc("获取DataSetTable分页列表"). Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). @@ -36,7 +36,7 @@ func InitVisualDataSetTableRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("获取DataSetTable信息").Handle(s.GetVisualDataSetTable) }). Doc("获取DataSetTable信息"). Param(ws.PathParameter("tableId", "Id").DataType("string")). @@ -46,21 +46,21 @@ func InitVisualDataSetTableRouter(container *restful.Container) { 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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).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) + restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("删除DataSetTable信息").Handle(s.DeleteVisualDataSetTable) }). Doc("删除DataSetTable信息"). Metadata(restfulspec.KeyOpenAPITags, tags). diff --git a/apps/visual/router/visual_data_set_table_task.go b/apps/visual/router/visual_data_set_table_task.go deleted file mode 100644 index 411b0c1..0000000 --- a/apps/visual/router/visual_data_set_table_task.go +++ /dev/null @@ -1,70 +0,0 @@ -// ========================================================================== -// 生成日期：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 deleted file mode 100644 index cf557d0..0000000 --- a/apps/visual/router/visual_data_set_table_task_log.go +++ /dev/null @@ -1,70 +0,0 @@ -// ========================================================================== -// 生成日期：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/services/dataset_group.go b/apps/visual/services/dataset_group.go deleted file mode 100644 index ac38988..0000000 --- a/apps/visual/services/dataset_group.go +++ /dev/null @@ -1,87 +0,0 @@ -// ========================================================================== -// 生成日期：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(id 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(ids []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(ids []string) { - biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.VisualDataSetGroup{}, "id in (?)", ids).Error, "删除数据集分组失败") -} diff --git a/apps/visual/services/visual_data_set_field.go b/apps/visual/services/visual_data_set_field.go index c8a3079..4297614 100644 --- a/apps/visual/services/visual_data_set_field.go +++ b/apps/visual/services/visual_data_set_field.go @@ -51,26 +51,14 @@ func (m *datasetfieldModelImpl) FindListPage(page, pageSize int, data entity.Vis 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) + if data.GroupType != "" { + db = db.Where("group_type = ?", data.GroupType) } err := db.Count(&total).Error err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error @@ -82,26 +70,14 @@ func (m *datasetfieldModelImpl) FindList(data entity.VisualDataSetField) *[]enti 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) + if data.GroupType != "" { + db = db.Where("group_type = ?", data.GroupType) } biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询数据集字段列表失败") return &list diff --git a/apps/visual/services/visual_data_set_table.go b/apps/visual/services/visual_data_set_table.go index bde5631..29d62c1 100644 --- a/apps/visual/services/visual_data_set_table.go +++ b/apps/visual/services/visual_data_set_table.go @@ -40,7 +40,7 @@ func (m *datasettableModelImpl) Insert(data entity.VisualDataSetTable) *entity.V 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 + err := db.Preload("DataSource").Preload("Fields").First(resData).Error biz.ErrIsNil(err, "查询数据集表失败") return resData } @@ -57,11 +57,8 @@ func (m *datasettableModelImpl) FindListPage(page, pageSize int, data entity.Vis 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 + err = db.Order("create_time").Limit(pageSize).Offset(offset).Preload("DataSource").Preload("Fields").Find(&list).Error biz.ErrIsNil(err, "查询数据集表分页列表失败") return &list, total } @@ -76,10 +73,7 @@ func (m *datasettableModelImpl) FindList(data entity.VisualDataSetTable) *[]enti 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, "查询数据集表列表失败") + biz.ErrIsNil(db.Order("create_time").Preload("DataSource").Preload("Fields").Find(&list).Error, "查询数据集表列表失败") return &list } diff --git a/apps/visual/services/visual_data_set_table_task.go b/apps/visual/services/visual_data_set_table_task.go deleted file mode 100644 index bec0e5f..0000000 --- a/apps/visual/services/visual_data_set_table_task.go +++ /dev/null @@ -1,96 +0,0 @@ -// ========================================================================== -// 生成日期：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 deleted file mode 100644 index 6014d06..0000000 --- a/apps/visual/services/visual_data_set_table_task_log.go +++ /dev/null @@ -1,93 +0,0 @@ -// ========================================================================== -// 生成日期：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/pkg/initialize/table.go b/pkg/initialize/table.go index d8c0515..cb56037 100644 --- a/pkg/initialize/table.go +++ b/pkg/initialize/table.go @@ -49,7 +49,6 @@ func InitTable() { flowEntity.FlowWorkOrderTemplate{}, flowEntity.FlowWorkStage{}, - visualEntity.VisualDataSetGroup{}, visualEntity.VisualDataSource{}, visualEntity.VisualDataSetTable{}, visualEntity.VisualDataSetField{},