update

3dshow-customer/api/supply.go

@@ -1,28 +1,41 @@
 package api
 
 import (
-	"3dshow-customer/db/model"
 	"3dshow-customer/db/repo"
-	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
 func Supply(r *GinRouter) {
 
-	CreateCRUD(r, "/supply", &CRUDOption{
-		Collection: repo.CollectionSupply,
-		NewModel: func(c *gin.Context, _ *ApiSession) (interface{}, error) {
-			entity := &model.Supply{}
-			c.ShouldBindJSON(entity)
-			entity.CreateTime = time.Now()
-			return entity, nil
-		},
-		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-			return &model.Supply{}
-		},
-		JWT:           true,
-		SearchProject: []string{"name", "avatar", "contact", "createTime"},
-		DetailProject: []string{"name", "avatar", "contact", "createTime"},
+	// CreateCRUD(r, "/supply", &CRUDOption{
+	// 	Collection: repo.CollectionSupply,
+	// 	NewModel: func(c *gin.Context, _ *ApiSession) (interface{}, error) {
+	// 		entity := &model.Supply{}
+	// 		c.ShouldBindJSON(entity)
+	// 		return entity, nil
+	// 	},
+	// 	EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
+	// 		return &model.Supply{}
+	// 	},
+	// 	JWT:           true,
+	// 	SearchProject: []string{"name", "avatar", "contact", "createTime"},
+	// 	DetailProject: []string{"name", "avatar", "contact", "createTime"},
+	// })
+
+	r.GET("/supply/list", supplyList)
+}
+
+func supplyList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	page, size, query := UtilQueryPageSize(c)
+	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
+		Db:          "supply-user",
+		CollectName: "users",
+		Page:        page,
+		Size:        size,
+		Query:       query,
+		Project:     []string{"_id", "name", "avatar", "email"},
+		Sort:        repo.Map{"createTime": -1},
 	})
+
 }

3dshow-customer/db/model/supply.go

@@ -1,17 +1,14 @@
 package model
 
 import (
-	"time"
-
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 // 供应链
 type Supply struct {
-	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
-	Name       string             `bson:"name,omitempty" json:"name"`
-	Avatar     string             `bson:"avatar,omitempty" json:"avatar"`
-	Contact    string             `bson:"contact,omitempty" json:"contact"`
-	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
-	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
+	Id      primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	Name    string             `bson:"name,omitempty" json:"name"`
+	Avatar  string             `bson:"avatar,omitempty" json:"avatar"`
+	Contact string             `bson:"contact,omitempty" json:"contact"`
+	Email   string             `bson:"email,omitempty" json:"email"`
 }