From ec971561bbb7f6a6f4cc3dd10cf7e8118c08aaa8 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 2 Sep 2021 16:35:48 +0800
Subject: [PATCH] aa

---
 dao/user_dao.go  | 16 ++++++++++++++++
 model/model.go   | 18 ++++++++++++++++++
 services/user.go |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dao/user_dao.go b/dao/user_dao.go
index 4fd1e24..1d1d3ff 100644
--- a/dao/user_dao.go
+++ b/dao/user_dao.go
@@ -70,3 +70,19 @@ func GetMenus(db *sqlx.DB) (menus []*model.Menu, err error) {
 	}
 	return menus, err
 }
+
+func GetMenuDetail(db *sqlx.DB, id int) (menu *model.MenuDetail, err error) {
+	var (
+		menus []*model.MenuDetail
+	)
+	sql := `
+		SELECT * 
+		  FROM menu_detail
+         WHERE 1 = 1 AND deleted_at = ? AND id = ?
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue, id}
+	if err = db.Select(&menus, sql, sqlParams...); err == nil {
+		return menus[0], err
+	}
+	return menus[0], err
+}
diff --git a/model/model.go b/model/model.go
index 6957493..06e84b3 100644
--- a/model/model.go
+++ b/model/model.go
@@ -153,6 +153,24 @@ type Menu struct {
 	Content      string     `json:"content"`                  //菜单内容
 }
 
+type MenuDetail struct {
+	ID           int        `json:"id" db:"id"`
+	CreatedAt    *time.Time `json:"created_at" db:"created_at"`
+	UpdatedAt    *time.Time `json:"updated_at" db:"updated_at"`
+	LastOperator string     `json:"last_operator" db:"last_operator"`
+	DeletedAt    *time.Time `json:"deleted_at" db:"deleted_at"`
+	MenuID       int        `json:"menu_id" db:"menu_id"`
+	Name         string     `json:"name"`
+	Content      string     `json:"content"`
+	URL          string     `json:"url" db:"url"`
+	Method       string     `json:"method"`
+	PublicParam  string     `json:"public_param" db:"public_param"`
+	PrivateParam string     `json:"private_param" db:"private_param"`
+	CallParam    string     `json:"call_param" db:"call_param"`
+	ReturnParam  string     `json:"return_param" db:"return_param"`
+	ReturnEX     string     `json:"return_ex" db:"return_ex"`
+}
+
 type Printer struct {
 	ID           int        `json:"id" db:"id"`
 	CreatedAt    *time.Time `json:"created_at" db:"created_at"`
diff --git a/services/user.go b/services/user.go
index e7ed434..a85a749 100644
--- a/services/user.go
+++ b/services/user.go
@@ -142,6 +142,6 @@ func GetMenus(c *gin.Context) (menus []*model.Menu, err error) {
 	return dao.GetMenus(globals.GetDB())
 }
 
-func GetMenuDetail(c *gin.Context, id int) (menus []*model.Menu, err error) {
-	return
+func GetMenuDetail(c *gin.Context, id int) (menu *model.MenuDetail, err error) {
+	return dao.GetMenuDetail(globals.GetDB(), id)
 }