chore: domain code optimize

@@ -24,14 +24,11 @@ type (
 		Url      string `json:"url"`
 		Url      string `json:"url"`
 		Ext      string `json:"ext"`
 		Ext      string `json:"ext"`
 		Where
 		Where
-		OriginalTableId     string         `json:"originalTableId"`
-		IsFromOriginalTable bool           `json:"isFromOriginalTable"`
-		TableFileUrl        string         `json:"tableFileUrl"`
-		ColumnSchemas       []ColumnSchema `json:"columnSchemas"`
-		//PageNumber          int                    `json:"pageNumber"`
-		//PageSize            int                    `json:"pageSize"`
-		//QueryParameters []QueryParameter       `json:"queryParameters"`
-		SortParameters map[string]interface{} `json:"sortParameters"`
+		OriginalTableId     string                 `json:"originalTableId"`
+		IsFromOriginalTable bool                   `json:"isFromOriginalTable"`
+		TableFileUrl        string                 `json:"tableFileUrl"`
+		ColumnSchemas       []ColumnSchema         `json:"columnSchemas"`
+		SortParameters      map[string]interface{} `json:"sortParameters"`
 	}
 	}
 
 
 	DataLoadDataTable struct {
 	DataLoadDataTable struct {
@@ -50,14 +47,6 @@ type (
 		ColumnContents   []string `json:"columnContents"`
 		ColumnContents   []string `json:"columnContents"`
 		IsContainContent bool     `json:"isContainContent"`
 		IsContainContent bool     `json:"isContainContent"`
 	}
 	}
-	//Field struct {
-	//	// 索引序号
-	//	Index int `json:"index"`
-	//	// 名称
-	//	Name string `json:"name"`
-	//	// 对应数据库类型
-	//	Type string `json:"sqlType"`
-	//}
 
 
 	InValidCell struct {
 	InValidCell struct {
 		Col   string `json:"col"`
 		Col   string `json:"col"`
@@ -157,11 +146,6 @@ type (
 		MainTable   *Table
 		MainTable   *Table
 		Table       *Table
 		Table       *Table
 		CopyToTable *Table
 		CopyToTable *Table
-
-		// 数据列
-		//DataFields []*Field `json:"dataFields"`
-		// 手动添加的列
-		//ManualFields []*Field `json:"manualFields"`
 	}
 	}
 
 
 	DataCopyTable struct {
 	DataCopyTable struct {
@@ -249,34 +233,13 @@ func ToFields(fields []*Field) []*Field {
 	return result
 	return result
 }
 }
 
 
-//func ToFieldData(fields []*Field, data [][]string, byteName bool) []map[string]string {
-//	var result = make([]map[string]string, 0)
-//	var key string
-//	for _, d := range data {
-//		var item = make(map[string]string)
-//		for j, f := range fields {
-//			key = f.Name
-//			if byteName {
-//				key = f.Name
-//			}
-//			if len(d) >= j {
-//				item[key] = d[j]
-//			} else {
-//				item[key] = ""
-//			}
-//		}
-//		result = append(result, item)
-//	}
-//	return result
-//}
-
 type (
 type (
 	ReqFormulasGenerate struct {
 	ReqFormulasGenerate struct {
 		QuerySet        *QuerySet
 		QuerySet        *QuerySet
 		Table           *Table
 		Table           *Table
 		QueryComponents []*QueryComponent
 		QueryComponents []*QueryComponent
 		QuerySetService interface{}
 		QuerySetService interface{}
-		Context interface{}
+		Context         interface{}
 	}
 	}
 
 
 	DataFormulasGenerate struct {
 	DataFormulasGenerate struct {

@@ -9,7 +9,7 @@ type Context struct {
 	OperatorName string `json:"operatorName"`
 	OperatorName string `json:"operatorName"`
 	// 租户 （个人、企业）
 	// 租户 （个人、企业）
 	TenantId int `json:"tenantId"`
 	TenantId int `json:"tenantId"`
-
+	// 附加数据
 	data map[string]interface{}
 	data map[string]interface{}
 }
 }
 
 

@@ -16,8 +16,6 @@ type File struct {
 	FileInfo *FileInfo `json:"fileInfo"`
 	FileInfo *FileInfo `json:"fileInfo"`
 	// 源文件Id（FileType为TemporaryFile或VerifiedFile时有值）
 	// 源文件Id（FileType为TemporaryFile或VerifiedFile时有值）
 	SourceFileId int `json:"sourceFileId"`
 	SourceFileId int `json:"sourceFileId"`
-	// 操作人
-	// Operator string `json:"operator"`
 	// 创建时间
 	// 创建时间
 	CreatedAt time.Time `json:"createdAt"`
 	CreatedAt time.Time `json:"createdAt"`
 	// 更新时间
 	// 更新时间
@@ -78,8 +76,7 @@ func (file *File) CopyTo(fileType FileType, ctx *Context) *File {
 		CreatedAt:    time.Now(),
 		CreatedAt:    time.Now(),
 		UpdatedAt:    time.Now(),
 		UpdatedAt:    time.Now(),
 		SourceFileId: file.FileId,
 		SourceFileId: file.FileId,
-		//Operator:     file.Operator,
-		Context: ctx,
+		Context:      ctx,
 	}
 	}
 	return t
 	return t
 }
 }

@@ -8,8 +8,6 @@ type FileInfo struct {
 	Url string `json:"url"`
 	Url string `json:"url"`
 	// 文件大小
 	// 文件大小
 	FileSize int `json:"fileSize"`
 	FileSize int `json:"fileSize"`
-	// 文件编号，以固定字符“F”+4位年+2位月+2位日+三位流水，每天编号从001开始
-	// FileCode string `json:"fileCode"`
 	// 后缀扩展
 	// 后缀扩展
 	Ext string `json:"ext"`
 	Ext string `json:"ext"`
 	// 记录数
 	// 记录数

@@ -45,6 +45,5 @@ func (log *Log) Identify() interface{} {
 }
 }
 
 
 func (log *Log) Update(data map[string]interface{}) error {
 func (log *Log) Update(data map[string]interface{}) error {
-
 	return nil
 	return nil
 }
 }

@@ -2,7 +2,7 @@ package domain
 
 
 import "time"
 import "time"
 
 
-// 匹配规则配置
+// MappingRule 匹配规则配置
 type MappingRule struct {
 type MappingRule struct {
 	// 匹配规则ID
 	// 匹配规则ID
 	MappingRuleId int `json:"mappingRuleId"`
 	MappingRuleId int `json:"mappingRuleId"`
@@ -53,7 +53,6 @@ type MappingField struct {
 
 
 func NewMappingFields(all []*Field, some []*Field) []*MappingField {
 func NewMappingFields(all []*Field, some []*Field) []*MappingField {
 	var result []*MappingField
 	var result []*MappingField
-	//allMap :=(Fields)(all).ToMap()
 	someMap := (Fields)(some).ToMap()
 	someMap := (Fields)(some).ToMap()
 	for _, f := range all {
 	for _, f := range all {
 		item := &MappingField{
 		item := &MappingField{

@@ -8,7 +8,7 @@ import (
 	"time"
 	"time"
 )
 )
 
 
-// 查询集合
+// QuerySet 查询集合
 type QuerySet struct {
 type QuerySet struct {
 	// 查询集合ID
 	// 查询集合ID
 	QuerySetId int `json:"querySetId"`
 	QuerySetId int `json:"querySetId"`

@@ -76,7 +76,6 @@ type SelectExpr struct { // 查询表达式
 	FieldLeft  FieldExpr `json:"fieldLeft"`
 	FieldLeft  FieldExpr `json:"fieldLeft"`
 	FieldRight FieldExpr `json:"fieldRight"` // has value when type is equal to 1
 	FieldRight FieldExpr `json:"fieldRight"` // has value when type is equal to 1
 	Type       string    `json:"type"`       // 1.拆分 2.拆方赋值 3.正常赋值
 	Type       string    `json:"type"`       // 1.拆分 2.拆方赋值 3.正常赋值
-	//SubGroup    []SelectExpr `json:"subGroup,omitempty"`
 }
 }
 
 
 func (s SelectExpr) Equal(compare SelectExpr) bool {
 func (s SelectExpr) Equal(compare SelectExpr) bool {
@@ -94,7 +93,6 @@ type SelectExprGroup struct { // 查询表达式
 }
 }
 
 
 type FieldExpr struct {
 type FieldExpr struct {
-	//LabelColumns []LabelColumn `json:"labelColumns"`
 	TableFields []TableField `json:"tableFields"`
 	TableFields []TableField `json:"tableFields"`
 	ExprHuman   string       `json:"exprHuman"`
 	ExprHuman   string       `json:"exprHuman"`
 	ExprSql     string       `json:"exprSql"`
 	ExprSql     string       `json:"exprSql"`
@@ -104,15 +102,11 @@ func (expr *FieldExpr) Complete() string {
 	exprSql := expr.ExprSql
 	exprSql := expr.ExprSql
 	for _, f := range expr.TableFields {
 	for _, f := range expr.TableFields {
 		sql := fmt.Sprintf("%s.%s", f.TableSqlName, f.FieldSqlName)
 		sql := fmt.Sprintf("%s.%s", f.TableSqlName, f.FieldSqlName)
-		//zhSql := fmt.Sprintf("%s.%s", f.TableName, f.FieldSqlName)
 		sub := fmt.Sprintf("max(%s.%s)", f.TableSqlName, f.FieldSqlName)
 		sub := fmt.Sprintf("max(%s.%s)", f.TableSqlName, f.FieldSqlName)
-		//zhSub := fmt.Sprintf("max(%s.%s)", f.TableName, f.FieldSqlName)
 		if strings.Contains(expr.ExprSql, fmt.Sprintf("(%s)", sql)) {
 		if strings.Contains(expr.ExprSql, fmt.Sprintf("(%s)", sql)) {
 			continue
 			continue
 		}
 		}
 		exprSql = strings.ReplaceAll(exprSql, sql, sub)
 		exprSql = strings.ReplaceAll(exprSql, sql, sub)
-		//expr.ExprSql = strings.ReplaceAll(expr.ExprSql, sql, sub)
-		//expr.ExprHuman = strings.ReplaceAll(expr.ExprHuman, zhSql, zhSub)
 	}
 	}
 	return exprSql
 	return exprSql
 }
 }

@@ -2,8 +2,8 @@ package domain
 
 
 import (
 import (
 	"github.com/zeromicro/go-zero/core/collection"
 	"github.com/zeromicro/go-zero/core/collection"
-	"strings"
 	"sort"
 	"sort"
+	"strings"
 )
 )
 
 
 const (
 const (
@@ -44,24 +44,12 @@ type Location struct {
 }
 }
 
 
 type LayoutCellData struct {
 type LayoutCellData struct {
-	//Table      *Table      `json:"table,omitempty"`
-	//Field      *Field      `json:"field,omitempty"`
 	TableField *TableField `json:"tableField"`
 	TableField *TableField `json:"tableField"`
 	Text       string      `json:"text,omitempty"`
 	Text       string      `json:"text,omitempty"`
 }
 }
 
 
 func (l *LayoutRuleItem) LayoutCells() []*LayoutCell {
 func (l *LayoutRuleItem) LayoutCells() []*LayoutCell {
 	var cells = make([]*LayoutCell, 0)
 	var cells = make([]*LayoutCell, 0)
-	//for i, rows := range l.Cells {
-	//	for j, item := range rows {
-	//		if item.Type == CellTypeNull || item.Type == "" {
-	//			continue
-	//		}
-	//		item.X = i
-	//		item.Y = j
-	//		cells = append(cells, item)
-	//	}
-	//}
 	for _, item := range l.Cells {
 	for _, item := range l.Cells {
 		item.X = item.Position.X
 		item.X = item.Position.X
 		item.Y = item.Position.Y
 		item.Y = item.Position.Y
@@ -70,19 +58,18 @@ func (l *LayoutRuleItem) LayoutCells() []*LayoutCell {
 	return cells
 	return cells
 }
 }
 
 
-
 type LayoutCells []*LayoutCell
 type LayoutCells []*LayoutCell
 
 
-func(cells LayoutCells)CellsRange(direction string)[]int{
-	list:=collection.NewSet()
-	for i:=range cells{
-		if strings.ToLower(direction)=="x"{
+func (cells LayoutCells) CellsRange(direction string) []int {
+	list := collection.NewSet()
+	for i := range cells {
+		if strings.ToLower(direction) == "x" {
 			list.Add(cells[i].X)
 			list.Add(cells[i].X)
-		}else{
+		} else {
 			list.Add(cells[i].Y)
 			list.Add(cells[i].Y)
 		}
 		}
 	}
 	}
-	sortList :=list.KeysInt()
+	sortList := list.KeysInt()
 	sort.Ints(sortList)
 	sort.Ints(sortList)
 	return sortList
 	return sortList
-}
+}

@@ -2,5 +2,4 @@ package domain
 
 
 type QuerySetInfo struct {
 type QuerySetInfo struct {
 	BindTableId int // 查询集绑定的表
 	BindTableId int // 查询集绑定的表
-	//DependentTables []int // 依赖的表
 }
 }

@@ -114,42 +114,42 @@ func (table *Table) Update(data map[string]interface{}) error {
 	return nil
 	return nil
 }
 }
 
 
-func (t *Table) Fields(includePK bool) []*Field {
+func (table *Table) Fields(includePK bool) []*Field {
 	var fields []*Field
 	var fields []*Field
 
 
-	if includePK && t.PK != nil {
-		fields = append(fields, t.PK)
+	if includePK && table.PK != nil {
+		fields = append(fields, table.PK)
 	}
 	}
-	fields = append(fields, t.DataFields...)
-	if t.TableType == SubTable.ToString() {
-		fields = append(fields, t.ManualFields...)
+	fields = append(fields, table.DataFields...)
+	if table.TableType == SubTable.ToString() {
+		fields = append(fields, table.ManualFields...)
 	}
 	}
-	t.fields = fields
+	table.fields = fields
 
 
-	return t.fields
+	return table.fields
 }
 }
 
 
-func (t *Table) MatchField(field *Field) (*Field, bool) {
-	if len(t.fields) == 0 {
-		t.fields = t.Fields(true)
+func (table *Table) MatchField(field *Field) (*Field, bool) {
+	if len(table.fields) == 0 {
+		table.fields = table.Fields(true)
 	}
 	}
-	mField := (Fields)(t.fields).ToMap()
+	mField := (Fields)(table.fields).ToMap()
 	if v, ok := mField[field.Name]; ok {
 	if v, ok := mField[field.Name]; ok {
 		return v, true
 		return v, true
 	}
 	}
 	return nil, false
 	return nil, false
 }
 }
 
 
-func (t *Table) DependencyTables() []int {
-	if t.TableInfo == nil {
+func (table *Table) DependencyTables() []int {
+	if table.TableInfo == nil {
 		return []int{}
 		return []int{}
 	}
 	}
-	return t.TableInfo.DependencyTables
+	return table.TableInfo.DependencyTables
 }
 }
 
 
-func (t *Table) AssertTableType(types ...TableType) bool {
+func (table *Table) AssertTableType(types ...TableType) bool {
 	for _, item := range types {
 	for _, item := range types {
-		if t.TableType == item.ToString() {
+		if table.TableType == item.ToString() {
 			return true
 			return true
 		}
 		}
 	}
 	}

 package domain
 package domain
 
 
-// 用户对象
+// User 用户对象
 type User struct {
 type User struct {
 	// 用户Id 用户唯一标识
 	// 用户Id 用户唯一标识
 	Id int `json:"id"`
 	Id int `json:"id"`