添加树形接口

controllers/gen/SystemController_gen.go

@@ -325,3 +325,15 @@ func (c *SystemController) PageOrg(ctx *gin.Context) {
 	partial.System_PageOrg(&entitys.CtrlContext{ctx, c.Db})
 }
 
+// TreeList
+// @Title TreeList
+// @Description 获取树形数据
+// @Param	    string  false  ""
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /tree_list  [post,get,put]
+func (c *SystemController) TreeList(ctx *gin.Context) {
+	//
+	partial.System_TreeList(&entitys.CtrlContext{ctx, c.Db})
+}
+

engine/system_init.go

@@ -1,117 +1,116 @@
 package engine
 
 import (
-	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
-	"regexp"
 	"fmt"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/models"
 	"github.com/xormplus/xorm"
+	"regexp"
 )
 
-
-func CreateDatabase(engine *ApiEngine)  {
-	if engine.OrmEngine.DriverName() == "mysql"{
-		dbname :=engine.OrmEngine.DataSourceName()
-		reg:= regexp.MustCompile("(.*)/(.*)(\\?.*)")
+func CreateDatabase(engine *ApiEngine) {
+	if engine.OrmEngine.DriverName() == "mysql" {
+		dbname := engine.OrmEngine.DataSourceName()
+		reg := regexp.MustCompile("(.*)/(.*)(\\?.*)")
 		//strings := reg.FindAllStringSubmatch(s, -1)
 		strings := reg.FindStringSubmatch(dbname)
 		fmt.Println(strings)
-		if len(strings) >3{
-			dbname= strings[2]
-			db,_:= xorm.NewEngine(engine.OrmEngine.DriverName(), strings[1]+"/")
+		if len(strings) > 3 {
+			dbname = strings[2]
+			db, _ := xorm.NewEngine(engine.OrmEngine.DriverName(), strings[1]+"/")
 			db.ShowSQL(true)
-			_,err:=db.Sql("CREATE DATABASE IF NOT EXISTS `"+dbname+"` default charset utf8 COLLATE utf8_general_ci").Execute()
-			if err!=nil{
-				fmt.Println("create database error",err)
-			}else {
-				fmt.Println("create database success:",dbname)
+			_, err := db.Sql("CREATE DATABASE IF NOT EXISTS `" + dbname + "` default charset utf8 COLLATE utf8_general_ci").Execute()
+			if err != nil {
+				fmt.Println("create database error", err)
+			} else {
+				fmt.Println("create database success:", dbname)
 			}
 		}
 	}
 }
 
-func InitDbData(engine *ApiEngine)  {
+func InitDbData(engine *ApiEngine) {
 
-	orgs:= []models.SysOrg{
+	orgs := []models.SysOrganization{
 		{
-			Id:"287c50a4-caad-4557-80c8-aca81af9f370",
-			Name:"千秋软件",
+			Id:   "287c50a4-caad-4557-80c8-aca81af9f370",
+			Name: "千秋软件",
 		},
 	}
-	users:= []models.SysUser{
+	users := []models.SysUser{
 		{
-			Id:"187c50a4-caad-4557-80c8-aca81af9f370",
-			Name:"管理员",
-			LoginId:"admin",
-			OrgId:"287c50a4-caad-4557-80c8-aca81af9f370",
-			Password:"123456",
+			Id:       "187c50a4-caad-4557-80c8-aca81af9f370",
+			Name:     "管理员",
+			LoginId:  "admin",
+			OrgId:    "287c50a4-caad-4557-80c8-aca81af9f370",
+			Password: "123456",
 		},
 	}
 
 	roles := []models.SysRole{
 		{
-			Id:	"487c50a4-caad-4557-80c8-aca81af9f370",
-			Name:"超级管理员",
+			Id:   "487c50a4-caad-4557-80c8-aca81af9f370",
+			Name: "超级管理员",
 		},
 	}
 
-	userRoles:=[]models.SysUserRole{
+	userRoles := []models.SysUserRole{
 		{
-			Id:"587c50a4-caad-4557-80c8-aca81af9f370",
-			RoleId:"387c50a4-caad-4557-80c8-aca81af9f370",
-			UserId:"187c50a4-caad-4557-80c8-aca81af9f370",
+			Id:     "587c50a4-caad-4557-80c8-aca81af9f370",
+			RoleId: "387c50a4-caad-4557-80c8-aca81af9f370",
+			UserId: "187c50a4-caad-4557-80c8-aca81af9f370",
 		},
 	}
 
-	menus:= []models.SysMenu{
+	menus := []models.SysMenu{
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Name:"系统管理",
+			Id:   "387c50a4-caad-4557-80c8-aca81af9f370",
+			Name: "系统管理",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f371",
-			Name:"用户管理",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/user",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f371",
+			Name:   "用户管理",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/user",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f372",
-			Name:"组织架构",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/org",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f372",
+			Name:   "组织架构",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/org",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f373",
-			Name:"角色管理",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/role",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f373",
+			Name:   "角色管理",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/role",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f374",
-			Name:"菜单管理",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/menu",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f374",
+			Name:   "菜单管理",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/menu",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f375",
-			Name:"字典管理",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/dict",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f375",
+			Name:   "字典管理",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/dict",
 		},
 		{
-			Id:"387c50a4-caad-4557-80c8-aca81af9f376",
-			Name:"日志管理",
-			Parent:"387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:"/sys/log",
+			Id:     "387c50a4-caad-4557-80c8-aca81af9f376",
+			Name:   "日志管理",
+			Parent: "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:    "/sys/log",
 		},
 	}
-	_,err := engine.OrmEngine.Insert(orgs)
+	_, err := engine.OrmEngine.Insert(orgs)
 	printError(err)
-	_,err = engine.OrmEngine.Insert(users)
+	_, err = engine.OrmEngine.Insert(users)
 	printError(err)
-	_,err = engine.OrmEngine.Insert(roles)
+	_, err = engine.OrmEngine.Insert(roles)
 	printError(err)
-	_,err = engine.OrmEngine.Insert(userRoles)
+	_, err = engine.OrmEngine.Insert(userRoles)
 	printError(err)
-	_,err = engine.OrmEngine.Insert(menus)
+	_, err = engine.OrmEngine.Insert(menus)
 	printError(err)
 }

models/SysOrg_gen.go

@@ -1,41 +0,0 @@
-
-package models
-import (
-"time"
-)
-
-type SysOrg struct {
-	//主键
-	Id   string    `xorm:"'id' varchar(36) pk notnull "json:"id"`
-	//上级组织
-	Parent   string    `xorm:"'parent' varchar(36) null "json:"parent"`
-	//名称
-	Name   string    `xorm:"'name' varchar(36) notnull "json:"name"`
-	//全名
-	FullName   string    `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
-	//领导人
-	Leader   string    `xorm:"'leader' varchar(36) notnull "json:"leader"`
-	//组织类型
-	Type   int32    `xorm:"'type' notnull "json:"type"`
-	//排序
-	Order   int32    `xorm:"'order' notnull "json:"order"`
-	//状态 0：禁用   1：正常
-	Status   int32    `xorm:"'status' notnull "json:"status"`
-	//域
-	Domain   string    `xorm:"'domain' varchar(36) notnull "json:"domain"`
-	//创建人
-	CreateBy   string    `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
-	//创建时间
-	CreateTime   time.Time    `xorm:"'create_time' notnull "json:"create_time"`
-	//最后更新人
-	LastUpdateBy   string    `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
-	//最后更新时间
-	LastUpdateDate   time.Time    `xorm:"'last_update_date' notnull "json:"last_update_date"`
-	//是否删除 0：删除   1：正常
-	DelFlag   int32    `xorm:"'del_flag' notnull "json:"del_flag"`
-
-}
-
-func (t *SysOrg) TableName() string {
-	return "sys_org"
-}

models/SysOrganization_gen.go

@@ -0,0 +1,46 @@
+package models
+
+import (
+	"time"
+)
+
+type SysOrganization struct {
+	//主键
+	Id string `xorm:"'id' varchar(36) pk notnull "json:"id"`
+
+	Inheritance string `xorm:"'inheritance' varchar(3000) notnull "json:"inheritance"`
+	//上级组织
+	Parent string `xorm:"'parent' varchar(36) null "json:"parent"`
+	//名称
+	Name string `xorm:"'name' varchar(36) notnull "json:"name"`
+	//全名
+	FullName string `xorm:"'full_name' varchar(36) notnull "json:"full_name"`
+	//领导人
+	Leader string `xorm:"'leader' varchar(36) notnull "json:"leader"`
+	//组织类型
+	Type int32 `xorm:"'type' notnull "json:"type"`
+	//排序
+	Order int32 `xorm:"'order' notnull "json:"order"`
+	//状态 0：禁用   1：正常
+	Status int32 `xorm:"'status' notnull "json:"status"`
+	//域
+	Domain string `xorm:"'domain' varchar(36) notnull "json:"domain"`
+	//创建人
+	CreateBy string `xorm:"'create_by' varchar(36) notnull "json:"create_by"`
+	//创建时间
+	CreateTime time.Time `xorm:"'create_time' notnull "json:"create_time"`
+	//最后更新人
+	LastUpdateBy string `xorm:"'last_update_by' varchar(36) notnull "json:"last_update_by"`
+	//最后更新时间
+	LastUpdateDate time.Time `xorm:"'last_update_date' notnull "json:"last_update_date"`
+	//是否删除 0：删除   1：正常
+	DelFlag int32 `xorm:"'del_flag' notnull "json:"del_flag"`
+
+	PY string `xorm:"'py' varchar(100) notnull "json:"py"`
+
+	PinYin string `xorm:"'pinyin' varchar(255) notnull "json:"pinyin"`
+}
+
+func (t *SysOrganization) TableName() string {
+	return "sys_organization"
+}

models/model.go

@@ -1,4 +1,3 @@
-
 package models
 
 import (
@@ -13,7 +12,7 @@ func SyncDb(db *xorm.Engine) {
 
 	db.Sync2(new(SysUser))
 
-	db.Sync2(new(SysOrg))
+	db.Sync2(new(SysOrganization))
 
 	db.Sync2(new(SysRole))
 

routers/common.go

@@ -0,0 +1,24 @@
+package routers
+
+import (
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/controllers/gen"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/engine"
+	"git.qianqiusoft.com/qianqiusoft/light-apiengine/middleware"
+)
+
+func init(){
+	addRegisterHandler(registerCommonRouter)
+}
+
+func registerCommonRouter(e *engine.ApiEngine){
+	api:=e.GinEngine.Group("/api")
+	v1:=api.Group("/v1")
+
+	v1.Use(middleware.LoginWare())
+
+	ctrler := gen.NewSystemController(e.OrmEngine)
+
+	v1.GET("/system/tree_list", ctrler.TreeList)
+	v1.POST("/system/tree_list", ctrler.TreeList)
+
+}