update asset.added and asset.removed

queencount/api/service-test.go

@@ -11,6 +11,7 @@ func TestRouter(r *GinRouter) {
 	r.GET("/test/print", Printa)
 	// r.GET("/test/print", Printa)
 	r.GET("/test/sb", TestSubscribe)
+	r.GET("/test/tim", TestInMongo)
 
 }
 
@@ -23,9 +24,16 @@ func Printa(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 func TestSubscribe(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
-	var assetCount model.AssetCount
-	assetCount.DefId = "AAA"
-	assetCount.Count = 222
+	var assetCount model.AssetEvent
+	bus.NatsCenter.PublishObj("asset.added", &assetCount)
+	return nil, nil
+}
+func TestInMongo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+
+	var assetCount model.AssetEvent
+	assetCount.Api = "upload"
+	assetCount.DbId = "628b4ae8633d10f8e3658557"
+	assetCount.DefId = "628c9b9f8790e88745f65903" // 针线车
 	bus.NatsCenter.PublishObj("asset.added", &assetCount)
 	return nil, nil
 }

queencount/app.yaml

@@ -21,7 +21,6 @@ debug:
   UserRole: string
 
 nats:
-  # url: nats://124.71.139.24:14220
-  url: nats://127.0.0.1:14220
+  url: nats://124.71.139.24:14220
   maxReconnect: 1000
   reconnDelaySecond: 5

queencount/bus/asset.added.go

@@ -1,7 +1,8 @@
 package bus
 
 import (
-	"fmt"
+	"encoding/json"
+	"queencount/db/model"
 
 	"github.com/nats-io/nats.go"
 	"infish.cn/comm"
@@ -13,7 +14,10 @@ func AssetAddedEnvent(bus *comm.NatsBus) {
 }
 
 func AssetAddHandler(msg *nats.Msg) {
-	fmt.Printf("%#s\n", msg.Data)
-
-	// dbcxt := &repo.RepoSession{Client: db.MongoClient, Ctx: context.Background()}
+	var req model.AssetEvent
+	err := json.Unmarshal(msg.Data, &req)
+	if err != nil {
+		return
+	}
+	AssetCountAction("add", &req)
 }

queencount/bus/asset.remove.go

@@ -1,6 +1,17 @@
 package bus
 
-import "github.com/nats-io/nats.go"
+import (
+	"encoding/json"
+	"queencount/db/model"
+
+	"github.com/nats-io/nats.go"
+)
 
 func AssetRemoveHandler(msg *nats.Msg) {
+	var req model.AssetEvent
+	err := json.Unmarshal(msg.Data, &req)
+	if err != nil {
+		return
+	}
+	AssetCountAction("remove", &req)
 }

queencount/bus/asset_action.go

@@ -0,0 +1,70 @@
+package bus
+
+import (
+	"context"
+	"fmt"
+	"queencount/db"
+	"queencount/db/model"
+	"queencount/db/repo"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+func AssetCountAction(actionName string, req *model.AssetEvent) {
+
+	dbcxt := &repo.RepoSession{Client: db.MongoClient, Ctx: context.Background()}
+
+	fmt.Printf("action req data =>\n%#v\n", *req)
+
+	var in model.AssetCount
+
+	var databaseDoc model.Database
+
+	dbId, _ := primitive.ObjectIDFromHex(req.DbId)
+	param := &repo.DocSearchOptions{
+		// Db: "queentree",
+		CollectName: repo.CollectionDatabase,
+		Query:       map[string]interface{}{"_id": dbId},
+		Project:     []string{"_id", "name"},
+		// Sort: bson.M{},
+	}
+
+	// 获取对应资产库 - 数据库
+	repo.RepoSeachDoc(dbcxt, param, &databaseDoc)
+	fmt.Printf("action database data =>\n%#v\n", databaseDoc)
+
+	// 跨库查询 对应的 assetcount文档
+	param1 := &repo.DocSearchOptions{
+		Db:          databaseDoc.Name,
+		CollectName: repo.CollectionAssetCount,
+		Query:       map[string]interface{}{"defId": req.DefId},
+		Project:     []string{"_id", "count"},
+		Sort:        bson.M{"createTime": -1},
+	}
+	// 拿到最新一条数据 获取count
+	var countData model.AssetCount
+	repo.RepoSeachDoc(dbcxt, param1, &countData)
+
+	fmt.Printf("action assetCount data =>\n%#v\n", countData)
+
+	// 统计新增
+	in.DefId = req.DefId
+	if actionName == "add" {
+		in.Count = countData.Count + 1
+
+	}
+	if actionName == "remove" {
+		in.Count = countData.Count - 1
+
+	}
+
+	in.CreateTime = time.Now()
+	// ???本地测试新增不生效
+	id, _ := repo.RepoDbAddDoc(dbcxt, databaseDoc.Name, repo.CollectionAssetCount, &in)
+	fmt.Printf("action add id =>\n%#v\n", id)
+	fmt.Println("----------------------------------")
+	fmt.Printf("action add data =>\n%#v\n", in)
+
+}

queencount/db/model/assetCount.go

@@ -12,3 +12,9 @@ type AssetCount struct {
 	Count      int                `bson:"count,omitempty" json:"count"`
 	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
 }
+
+type AssetEvent struct {
+	DefId string
+	DbId  string // 哪个资产库的统计表
+	Api   string
+}

queencount/db/repo/repo.go

@@ -18,50 +18,6 @@ type RepoSession struct {
 }
 
 const (
-	CollectionUser    = "users"
-	CollectionProject = "projects"
-	CollectionAdmin   = "admins"
-	CollectionTexture = "textures"
-
-	CollectionCategories      = "categories"
-	CollectionDbAssetCategory = "categories-asset"
-
-	CollectionLibCategory  = "libCategory"
-	CollectionLib2Category = "lib2Category"
-	CollectionTeam         = "team"
-	CollectionStickers     = "sticker"
-
-	CollectionMesh              = "meshes"
-	CollectionEvn3d             = "Env3ds"
-	CollectionTask              = "tasks"
-	CollectionTaskMeshConv      = "task-meshconv"
-	CollectionTaskHdrConv       = "task-hdrconv"
-	CollectionTaskShadowCreator = "task-shadowCreator"
-
-	CollectionTaskShadow = "task-shadow"
-
-	CollectionProductTpls = "productTpls"
-	CollectionMaterials   = "materials"
-	CollectionBaseMats    = "basemats"
-	CollectionDecorates   = "decorate-mesh"
-
-	CollectionInfoDesigns = "infoDesigns"
-	CollectionInfoTrends  = "infoTrends"
-
-	CollectionDesignProducts = "designProducts"
-
-	CollectionShoes      = "shoes"
-	CollectionImageMat   = "imgmats"
-	CollectionFabric     = "fabrics"
-	CollectionDesigns    = "designs"
-	CollectionBackground = "backgrounds"
-	CollectionLasts      = "last-mesh"
-	CollectionHeels      = "heel-mesh"
-	CollectionSoles      = "sole-mesh"
-
-	CollectionPerms = "perms"
-	CollectionRoles = "roles"
-
 	CollectionDatabase   = "database"
 	CollectionAssetCount = "assetcount"
 )