feat：完善项目

app/controller/tenant/instance.go

@@ -5,31 +5,90 @@ import (
 	"ArmedPolice/app/controller/basic"
 	"ArmedPolice/app/model"
 	"ArmedPolice/app/service"
+	"errors"
 )
 
 type Instance struct{ *service.Session }
 
 type InstanceHandle func(session *service.Session) *Instance
 
-func (c *Instance) List(name string, page, pageSize int) (*basic.PageDataResponse, error) {
+type (
+	// InstanceInfo 租户信息
+	InstanceInfo struct {
+		ID   string `json:"id"`
+		Name string `json:"name"`
+		*model2.AreaInfo
+		Children []*InstanceInfo `json:"children"`
+	}
+	// InstanceParams 参数信息
+	InstanceParams struct {
+		ID, ParentID uint64
+		Name, Remark string
+		basic.CommonArea
+	}
+)
+
+func (c *Instance) tree(src []*model2.SysTenant, parentID uint64) []*InstanceInfo {
+	out := make([]*InstanceInfo, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &InstanceInfo{
+				ID:       v.GetEncodeID(),
+				Name:     v.Name,
+				AreaInfo: v.Area.Format(),
+				Children: c.tree(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+// List 列表信息
+func (c *Instance) List() ([]*InstanceInfo, error) {
 	mSysTenant := model.NewSysTenant()
 
 	out := make([]*model2.SysTenant, 0)
 
-	var count int64
-
-	if err := model2.Pages(mSysTenant.SysTenant, &out, page, pageSize, &count); err != nil {
+	if err := model2.Find(mSysTenant.SysTenant, &out); err != nil {
 		return nil, err
 	}
-	return &basic.PageDataResponse{Data: nil, Count: 0}, nil
+	return c.tree(out, 0), nil
 }
 
-func (c *Instance) Form() error {
-	return nil
+// Form 数据操作
+func (c *Instance) Form(params *InstanceParams) error {
+	mSysTenant := model.NewSysTenant()
+
+	if params.ID > 0 {
+		mSysTenant.ID = params.ID
+
+		isExist, err := model2.First(mSysTenant.SysTenant)
+
+		if err != nil {
+			return err
+		} else if !isExist {
+			return errors.New("操作错误，数据不存在")
+		}
+	}
+	mSysTenant.ParentID = params.ParentID
+	mSysTenant.Name = params.Name
+	mSysTenant.Area = model2.Area{
+		Province: params.Province, City: params.City, District: params.District, Address: params.Address,
+	}
+	mSysTenant.Remark = params.Remark
+
+	if mSysTenant.ID > 0 {
+		return model2.Updates(mSysTenant.SysTenant, mSysTenant.SysTenant)
+	}
+	return model2.Create(mSysTenant.SysTenant)
 }
 
+// Delete 删除操作
 func (c *Instance) Delete(id uint64) error {
-	return nil
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = id
+	return model2.Delete(mSysTenant.SysTenant)
 }
 
 func NewInstance() InstanceHandle {