add testNum

oilseal-train/api/bank.go

@@ -57,7 +57,7 @@ func BankList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	if _name, ok := query["name"]; ok {
 		query["name"] = bson.M{"$regex": _name.(string)}
 	}
-	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
+	result, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
 		CollectName: repo.CollectionBank,
 		Page:        page,
 		Size:        size,
@@ -65,6 +65,14 @@ func BankList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		Project:     []string{"name", "state", "desc", "createTime", "updateTime"},
 		Sort:        bson.M{"_id": -1},
 	})
+	if len(result.List) > 0 {
+		for _, list := range result.List {
+			id := list["_id"].(primitive.ObjectID)
+			list["testNum"], _ = repo.RepoCountDoc(apictx.CreateRepoCtx(), repo.CollectionTest, repo.Map{"bankId": id, "state": 1})
+		}
+	}
+	return result, err
+
 }
 
 func BankEdit(c *gin.Context, apictx *ApiSession) (interface{}, error) {

oilseal-train/api/collect.go

@@ -1,84 +0,0 @@
-package api
-
-// import (
-// 	"errors"
-// 	"oilseal-train/db/model"
-// 	"oilseal-train/db/repo"
-// 	"time"
-
-// 	"github.com/gin-gonic/gin"
-// 	"go.mongodb.org/mongo-driver/bson/primitive"
-// )
-
-// func Collect(r *GinRouter) {
-// 	CreateCRUD(r, "/collect", &CRUDOption{
-// 		Collection: repo.CollectionCollect,
-// 		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-// 			entity := &model.Collect{}
-// 			err := c.ShouldBindJSON(entity)
-// 			if err != nil {
-// 				return nil, errors.New("参数错误")
-// 			}
-// 			entity.CreateTime = time.Now()
-// 			_userId := apictx.User.ID
-// 			userId, _ := primitive.ObjectIDFromHex(_userId)
-
-// 			// 同一用户对同一产品只能有一条收藏记录
-// 			// 联合唯一索引 db.collect.ensureIndex({userId:1,productId:1},{unique:true})
-// 			collect := &model.Collect{}
-// 			found, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-// 				CollectName: repo.CollectionCollect,
-// 				Query:       repo.Map{"userId": userId, "productId": entity.ProductId},
-// 			}, &collect)
-// 			if found {
-// 				return entity, errors.New("该物品已被收藏")
-// 			}
-
-// 			entity.UserId = userId
-// 			return entity, nil
-// 		},
-// 		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
-// 			return &model.Collect{}
-// 		},
-// 		noUpdate: true,
-// 		JWT:      true,
-// 		SearchFilter: func(_ *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
-// 			_userId := apictx.User.ID
-// 			userId, _ := primitive.ObjectIDFromHex(_userId)
-// 			query["userId"] = userId
-// 			return query
-// 		},
-// 		SearchPostProcess: func(page *repo.PageResult, _ *gin.Context, apictx *ApiSession, _ map[string]interface{}) (interface{}, error) {
-// 			// 查询组装数据
-// 			if len(page.List) > 0 {
-// 				for _, v := range page.List {
-// 					// 查询产品信息
-// 					productId := v["productId"].(primitive.ObjectID)
-// 					supplyId := v["supplyId"].(primitive.ObjectID)
-// 					product := model.Product{}
-// 					supply := model.UserSmaple{}
-// 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-// 						CollectName: repo.CollectionProduct,
-// 						Query:       repo.Map{"_id": productId},
-// 						Project:     []string{"name", "unit", "cover"},
-// 					}, &product)
-// 					// 供应商信息
-// 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-// 						Db:          "supply-user",
-// 						CollectName: "users",
-// 						Query:       repo.Map{"_id": supplyId},
-// 						Project:     []string{"name", "avatar", "email"},
-// 					}, &supply)
-// 					v["productName"] = product.Name
-// 					v["productUnit"] = product.Unit
-// 					v["productCover"] = product.Cover
-// 					v["supplyName"] = supply.Name
-// 					v["supplyAvatar"] = supply.Avatar
-// 					v["supplyEmail"] = supply.Email
-
-// 				}
-// 			}
-// 			return page, nil
-// 		},
-// 	})
-// }

oilseal-train/db/db.go

@@ -35,7 +35,7 @@ func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
 }
 
 func NewMongoDB(bus *comm.NatsBus) *MongoDB {
-	inst, err := bus.NewMongoDBFromConfigDev("oilseal-train-mongo")
+	inst, err := bus.NewMongoDBFromConfig("oilseal-train-mongo")
 	if err != nil {
 		panic(err)
 	}

oilseal-train/db/redis.go

@@ -6,7 +6,7 @@ import (
 )
 
 func NewRedisClient(bus *comm.NatsBus) *redis.Client {
-	client, err := bus.NewRedisFromConfigDev("oilseal-train-redis")
+	client, err := bus.NewRedisFromConfig("oilseal-train-redis")
 	if err != nil {
 		return nil
 	}