zhangjq 6 lat temu
rodzic
commit
13d6704ade

+ 48 - 7
controllers/SystemController.go

@@ -40,10 +40,15 @@ func System_Login(c *SystemController) {
 // @Failure 403 :id is empty
 func System_Logout(c *SystemController) {
 
-	__none_func__()
-	//c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__()
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
+
 // _GetMenuTree
 // @Title _GetMenuTree
 // @Description 获取系统菜单
@@ -52,7 +57,7 @@ func System_Logout(c *SystemController) {
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
+	ret := __none_func__(user)
 	var menus []models.SysMenuTree
 	c.Db.SQL(models.Selectall_sys_menu).Find(&menus)
 
@@ -61,7 +66,10 @@ func System_GetMenuTree(c *SystemController) {
 	for i:=0;i<len(menutree);i++{
 		finChildrenMenu( &menus, menutree[i].Id, &menutree[i], &menutree)
 	}
-	c.Ctx.JSON(200, models.SysReturn{200, "", menutree})
+	if ret{
+		c.Ctx.JSON(200, models.SysReturn{200, "", menutree})
+	}
+
 }
 
 func finChildrenMenu(menus *[]models.SysMenuTree, parent string, parent_menu* models.SysMenuTree, menutree *[]models.SysMenuTree) {
@@ -78,6 +86,28 @@ func finChildrenMenu(menus *[]models.SysMenuTree, parent string, parent_menu* mo
 	}
 }
 
+// _FindUserPage
+// @Title _FindUserPage
+// @Description 获取用户分布数据
+// @Param	page      false  "分页参数"
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindUserPage(c *SystemController) {
+	var getpageinfo models.GetPageInfo
+	c.Ctx.BindJSON(&getpageinfo)
+	__none_func__(getpageinfo)
+	fmt.Println(getpageinfo)
+	var users []models.SysUser
+	err := c.Db.SQL(models.Selectall_sys_user).Limit(getpageinfo.PageSize, (getpageinfo.PageNum -1)*getpageinfo.PageSize).Find(&users)
+	if err==nil{
+		c.Ctx.JSON(200, models.SysReturn{200, "", users})
+	}else {
+		fmt.Println(err.Error())
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
+
+}
+
 // _FindPermissions
 // @Title _FindPermissions
 // @Description 查找用户的菜单权限标识集合
@@ -86,7 +116,12 @@ func finChildrenMenu(menus *[]models.SysMenuTree, parent string, parent_menu* mo
 // @Failure 403 :id is empty
 func System_FindPermissions(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
+	ret := __none_func__(user)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 // _AddPermission
@@ -97,9 +132,15 @@ func System_FindPermissions(c *SystemController) {
 // @Failure 403 :id is empty
 func System_AddPermission(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
+	ret := __none_func__(user)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 
-func __none_func__(params ... interface{}){
+func __none_func__(params ... interface{}) bool{
+	return true
 }

+ 49 - 11
controllers/SystemController.go_new

@@ -15,8 +15,12 @@ import (
 func System_Login(c *SystemController) {
 	var logininfo models.LoginInfo 
 	c.Ctx.BindJSON(&logininfo)
-	__none_func__(logininfo)
-	c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__(logininfo)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 // _Logout
@@ -26,8 +30,12 @@ func System_Login(c *SystemController) {
 // @Failure 403 :id is empty
 func System_Logout(c *SystemController) {
 	
-	__none_func__()
-	c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__()
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 // _GetMenuTree
@@ -38,8 +46,29 @@ func System_Logout(c *SystemController) {
 // @Failure 403 :id is empty
 func System_GetMenuTree(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
-	c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__(user)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
+}
+
+// _FindUserPage
+// @Title _FindUserPage
+// @Description 获取用户分布数据         
+// @Param	page      false  "分页参数"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+func System_FindUserPage(c *SystemController) {
+	var getpageinfo models.GetPageInfo 
+	c.Ctx.BindJSON(&getpageinfo)
+	ret := __none_func__(getpageinfo)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 // _FindPermissions
@@ -50,8 +79,12 @@ func System_GetMenuTree(c *SystemController) {
 // @Failure 403 :id is empty
 func System_FindPermissions(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
-	c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__(user)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 // _AddPermission
@@ -62,10 +95,15 @@ func System_FindPermissions(c *SystemController) {
 // @Failure 403 :id is empty
 func System_AddPermission(c *SystemController) {
 	user := c.Ctx.Param(":user")
-	__none_func__(user)
-	c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	ret := __none_func__(user)
+	if ret {
+		c.Ctx.JSON(200, models.SysReturn{200, "", nil})
+	}else{
+		c.Ctx.JSON(200, models.SysReturn{500, "", nil})
+	}
 }
 
 
-func __none_func__(params ... interface{}){
+func __none_func__(params ... interface{}) bool{
+	return true
 }

+ 12 - 0
controllers/SystemController_gen.go

@@ -56,6 +56,18 @@ func (c *SystemController) GetMenuTree() {
 	System_GetMenuTree(c)
 }
 
+// FindUserPage
+// @Title FindUserPage
+// @Description 获取用户分布数据         
+// @Param	page      false  "分页参数"  
+// @Success 200 {object} models.Account
+// @Failure 403 :id is empty
+// @router /find_user_page  [post,get]
+func (c *SystemController) FindUserPage() {
+	//
+	System_FindUserPage(c)
+}
+
 // FindPermissions
 // @Title FindPermissions
 // @Description 查找用户的菜单权限标识集合         

+ 6 - 0
engine/system_init.go

@@ -77,31 +77,37 @@ func InitSystemDb(engine *ApiEngine)  {
 			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-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-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",
 		},
 	}
 	_,err = engine.OrmEngine.Insert(orgs)

+ 14 - 0
models/ColumnFilter_gen.go

@@ -0,0 +1,14 @@
+
+package models
+import (
+
+)
+
+type ColumnFilter struct {
+	
+	//过滤名称列表
+	Name   string `json:"name"`
+	//过滤值
+	Value   string `json:"value"`
+
+}

+ 12 - 0
models/ColumnFilters_gen.go

@@ -0,0 +1,12 @@
+
+package models
+import (
+
+)
+
+type ColumnFilters struct {
+	
+	//过滤名称列表
+	Name   ColumnFilter `json:"name"`
+
+}

+ 16 - 0
models/GetPageInfo_gen.go

@@ -0,0 +1,16 @@
+
+package models
+import (
+
+)
+
+type GetPageInfo struct {
+	
+	//页码
+	PageNum   int `json:"pageNum"`
+	//单页数
+	PageSize   int `json:"pageSize"`
+	//过滤条件
+	ColumnFilters   ColumnFilters `json:"columnFilters"`
+
+}

+ 8 - 0
routers/router_gen.go

@@ -24,6 +24,10 @@ func systemController_get_menu_tree(c* gin.Context)  {
 	controllers.NewSystemController(c,g_engine).GetMenuTree()
 }
 
+func systemController_find_user_page(c* gin.Context)  {
+	controllers.NewSystemController(c,g_engine).FindUserPage()
+}
+
 func systemController_find_permissions(c* gin.Context)  {
 	controllers.NewSystemController(c,g_engine).FindPermissions()
 }
@@ -53,6 +57,10 @@ func InitRouter(e *engine.ApiEngine)  {
 	v1.POST("/system/get_menu_tree",systemController_get_menu_tree)
     //v1.PUT("/system/get_menu_tree",systemController_get_menu_tree)
 
+	v1.GET("/system/find_user_page",systemController_find_user_page)
+	v1.POST("/system/find_user_page",systemController_find_user_page)
+    //v1.PUT("/system/find_user_page",systemController_find_user_page)
+
 	v1.GET("/system/find_permissions",systemController_find_permissions)
 	v1.POST("/system/find_permissions",systemController_find_permissions)
     v1.PUT("/system/find_permissions",systemController_find_permissions)