From 3085ef46ed891c4e4a0f8c2c4923a12b15b2bf05 Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Mon, 5 Jun 2023 19:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=A6=BBmodel=E7=9A=84=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                       |  3 +++
 model/fscanteentypemodel_gen.go | 21 ---------------------
 model/fsfontmodel_gen.go        | 15 +--------------
 model/self_fscanteentype.go     | 29 +++++++++++++++++++++++++++++
 model/self_fsfont.go            | 23 +++++++++++++++++++++++
 5 files changed, 56 insertions(+), 35 deletions(-)
 create mode 100644 model/self_fscanteentype.go
 create mode 100644 model/self_fsfont.go

diff --git a/README.md b/README.md
index a96ea471..4ae582da 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,9 @@
 2.  sh fs_gen_mysql_model.sh fs_canteen_type # 根据ddl序列化mysql model
 3.  xxxx
 
+#### 规范
+model的自定义函数前缀使用self_的文件命名 eg: self_fsfont.go
+
 #### 参与贡献
 
 1.  Fork 本仓库
diff --git a/model/fscanteentypemodel_gen.go b/model/fscanteentypemodel_gen.go
index 4b4532a9..79900f2f 100755
--- a/model/fscanteentypemodel_gen.go
+++ b/model/fscanteentypemodel_gen.go
@@ -43,11 +43,6 @@ type (
 		Status int64  `db:"status"` // 状态位 1启用0停用
 		Ctime  int64  `db:"ctime"`  // 添加时间
 	}
-
-	FsGetTypeCanteenType struct {
-		Id   int64  `db:"id" json:"key"`    // ID
-		Name string `db:"name" json:"name"` // 餐厅名字
-	}
 )
 
 func newFsCanteenTypeModel(conn sqlx.SqlConn) *defaultFsCanteenTypeModel {
@@ -77,22 +72,6 @@ func (m *defaultFsCanteenTypeModel) FindOne(ctx context.Context, id int64) (*FsC
 	}
 }
 
-func (m *defaultFsCanteenTypeModel) FindGetType(ctx context.Context) ([]*FsGetTypeCanteenType, error) {
-
-	query := fmt.Sprintf("select X.id,X.name from (select %s from %s where status = 1 order by sort desc) X", fsCanteenTypeRows, m.table)
-	var resp []*FsGetTypeCanteenType
-	err := m.conn.QueryRows(&resp, query)
-	switch err {
-	case nil:
-		return resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-
-}
-
 func (m *defaultFsCanteenTypeModel) Insert(ctx context.Context, data *FsCanteenType) (sql.Result, error) {
 	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?)", m.table, fsCanteenTypeRowsExpectAutoSet)
 	ret, err := m.conn.ExecCtx(ctx, query, data.Name, data.Sort, data.Status, data.Ctime)
diff --git a/model/fsfontmodel_gen.go b/model/fsfontmodel_gen.go
index 30021b69..9a8c5c37 100755
--- a/model/fsfontmodel_gen.go
+++ b/model/fsfontmodel_gen.go
@@ -71,20 +71,7 @@ func (m *defaultFsFontModel) FindOne(ctx context.Context, id int64) (*FsFont, er
 	}
 }
 
-func (m *defaultFsFontModel) FindAllOrderSortByDesc(ctx context.Context) ([]*FsFont, error) {
-	
-	query := fmt.Sprintf("select %s from %s  order by sort desc", fsFontRows, m.table)
-	var resp []*FsFont
-	err := m.conn.QueryRows(&resp, query)
-	switch err {
-	case nil:
-		return resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
+
 
 func (m *defaultFsFontModel) Insert(ctx context.Context, data *FsFont) (sql.Result, error) {
 	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?)", m.table, fsFontRowsExpectAutoSet)
diff --git a/model/self_fscanteentype.go b/model/self_fscanteentype.go
new file mode 100644
index 00000000..051fa19a
--- /dev/null
+++ b/model/self_fscanteentype.go
@@ -0,0 +1,29 @@
+package model
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/zeromicro/go-zero/core/stores/sqlc"
+)
+
+type FsGetTypeCanteenType struct {
+	Id   int64  `db:"id" json:"key"`    // ID
+	Name string `db:"name" json:"name"` // 餐厅名字
+}
+
+func (m *defaultFsCanteenTypeModel) FindGetType(ctx context.Context) ([]*FsGetTypeCanteenType, error) {
+
+	query := fmt.Sprintf("select X.id,X.name from (select %s from %s where status = 1 order by sort desc) X", fsCanteenTypeRows, m.table)
+	var resp []*FsGetTypeCanteenType
+	err := m.conn.QueryRows(&resp, query)
+	switch err {
+	case nil:
+		return resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+
+}
diff --git a/model/self_fsfont.go b/model/self_fsfont.go
new file mode 100644
index 00000000..ed557b2d
--- /dev/null
+++ b/model/self_fsfont.go
@@ -0,0 +1,23 @@
+package model
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/zeromicro/go-zero/core/stores/sqlc"
+)
+
+func (m *defaultFsFontModel) FindAllOrderSortByDesc(ctx context.Context) ([]*FsFont, error) {
+
+	query := fmt.Sprintf("select %s from %s  order by sort desc", fsFontRows, m.table)
+	var resp []*FsFont
+	err := m.conn.QueryRows(&resp, query)
+	switch err {
+	case nil:
+		return resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+}