feat: 自动化树形结构完结

flipped-aurora · Nov 19, 2024 · 321201e · 321201e
1 parent f684ce1
commit 321201e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/server/model/common/basetypes.go b/server/model/common/basetypes.go
@@ -37,7 +37,7 @@ func (m *JSONMap) Scan(value interface{}) error {
 
 type TreeNode[T any] interface {
 	GetChildren() []T
-	SetChildren(in *T, children T)
+	SetChildren(children T)
 	GetID() int
 	GetParentID() int
 }
diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl
@@ -73,7 +73,7 @@ type {{.StructName}} struct {
     DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
     {{- end }}
     {{- if .IsTree }}
-    Children   []{{.StructName}} `json:"children" gorm:"-"`     //子节点
+    Children   []*{{.StructName}} `json:"children" gorm:"-"`     //子节点
     ParentID   int             `json:"parentID" gorm:"column:parent_id;comment:父节点"`
     {{- end }}
 {{- end }}
@@ -88,22 +88,22 @@ func ({{.StructName}}) TableName() string {
 
 {{if .IsTree }}
 // GetChildren 实现TreeNode接口
-func (s {{.StructName}}) GetChildren() []{{.StructName}} {
+func (s *{{.StructName}}) GetChildren() []*{{.StructName}} {
     return s.Children
 }
 
 // SetChildren 实现TreeNode接口
-func (s {{.StructName}}) SetChildren(in *{{.StructName}},children {{.StructName}}) {
-	in.Children = append(in.Children, children)
+func (s *{{.StructName}}) SetChildren(children *{{.StructName}}) {
+	s.Children = append(s.Children, children)
 }
 
 // GetID 实现TreeNode接口
-func (s {{.StructName}}) GetID() int {
+func (s *{{.StructName}}) GetID() int {
     return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}})
 }
 
 // GetParentID 实现TreeNode接口
-func (s {{.StructName}}) GetParentID() int {
+func (s *{{.StructName}}) GetParentID() int {
     return s.ParentID
 }
 {{ end }}

diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
@@ -63,15 +63,13 @@ import (
 	{{- if not .IsTree}}
     {{.Package}}Req "{{.Module}}/model/{{.Package}}/request"
     {{- else }}
+    "{{.Module}}/utils"
     "errors"
     {{- end }}
     {{- if .AutoCreateResource }}
     "gorm.io/gorm"
     {{- end}}
 {{- end }}
-{{- if .IsTree }}
-    "{{.Module}}/utils"
-{{- end }}
 )
 
 type {{.StructName}}Service struct {}
@@ -151,10 +149,10 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}({{.Pri
 {{- if .IsTree }}
 // Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索
 // Author [yourname](https://github.com/yourname)
-func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList() (list []{{.Package}}.{{.StructName}},err error) {
+func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList() (list []*{{.Package}}.{{.StructName}},err error) {
     // 创建db
 	db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{})
-    var {{.Abbreviation}}s []{{.Package}}.{{.StructName}}
+    var {{.Abbreviation}}s []*{{.Package}}.{{.StructName}}
 
 	err = db.Find(&{{.Abbreviation}}s).Error
 

diff --git a/server/resource/plugin/server/model/model.go.template b/server/resource/plugin/server/model/model.go.template
@@ -72,7 +72,7 @@ type {{.StructName}} struct {
     DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
     {{- end }}
     {{- if .IsTree }}
-    Children   []{{.StructName}} `json:"children" gorm:"-"`     //子节点
+    Children   []*{{.StructName}} `json:"children" gorm:"-"`     //子节点
     ParentID   int             `json:"parentID" gorm:"column:parent_id;comment:父节点"`
     {{- end }}
     {{- end }}
@@ -86,24 +86,24 @@ func ({{.StructName}}) TableName() string {
 {{ end }}
 
 
-{{ if .IsTree }}
+{{if .IsTree }}
 // GetChildren 实现TreeNode接口
-func (s {{.StructName}}) GetChildren() []{{.StructName}} {
+func (s *{{.StructName}}) GetChildren() []*{{.StructName}} {
     return s.Children
 }
 
 // SetChildren 实现TreeNode接口
-func (s {{.StructName}}) SetChildren(in *{{.StructName}},children {{.StructName}}) {
-	in.Children = append(in.Children, children)
+func (s *{{.StructName}}) SetChildren(children *{{.StructName}}) {
+	s.Children = append(s.Children, children)
 }
 
 // GetID 实现TreeNode接口
-func (s {{.StructName}}) GetID() int {
+func (s *{{.StructName}}) GetID() int {
     return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}})
 }
 
 // GetParentID 实现TreeNode接口
-func (s {{.StructName}}) GetParentID() int {
+func (s *{{.StructName}}) GetParentID() int {
     return s.ParentID
 }
 {{ end }}

diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template
@@ -160,10 +160,10 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}({{.PrimaryField.FieldJson}} strin
 {{- if .IsTree }}
 // Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索
 // Author [yourname](https://github.com/yourname)
-func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList() (list []model.{{.StructName}},err error) {
+func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList() (list []*model.{{.StructName}},err error) {
     // 创建db
 	db := {{$db}}.Model(&model.{{.StructName}}{})
-    var {{.Abbreviation}}s []model.{{.StructName}}
+    var {{.Abbreviation}}s []*model.{{.StructName}}
 
 	err = db.Find(&{{.Abbreviation}}s).Error
 

diff --git a/server/utils/fmt_plus.go b/server/utils/fmt_plus.go
@@ -93,8 +93,7 @@ func BuildTree[T common.TreeNode[T]](nodes []T) []T {
 	for i := range nodes {
 		if nodes[i].GetParentID() != 0 {
 			parent := nodeMap[nodes[i].GetParentID()]
-			parent.SetChildren(&parent, nodes[i])
-			nodeMap[nodes[i].GetParentID()] = parent
+			parent.SetChildren(nodes[i])
 		}
 	}