update

queencount/api/service-asset.go

@@ -163,10 +163,14 @@ func (req *ReqAssetCount) GetEndTime() (time.Time, error) {
 }
 
 type TypeCount struct {
-	Time    []*model.AssetCount `json:"times"`
-	DefName string              `json:"defName"`
-	DefType int                 `json:"defType"`
-	DefId   string              `json:"defId"`
+	Time    []*model.AssetCountV0 `json:"times"`
+	DefName string                `json:"defName"`
+	DefType int                   `json:"defType"`
+	DefId   string                `json:"defId"`
+}
+
+func GetStepIndex(t time.Time, endTime time.Time, step int) int64 {
+	return int64(endTime.Sub(t).Seconds()) / int64(step)
 }
 
 // 获取统计信息图表需要的信息
@@ -245,7 +249,14 @@ func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		defId := item.DefId
 
 		if defCountsMap[defId] == nil {
-			defCountsMap[defId] = &TypeCount{Time: []*model.AssetCount{item}}
+			defCountsMap[defId] = &TypeCount{Time: []*model.AssetCountV0{
+				{
+					DefId:      item.DefId,
+					CreateTime: item.CreateTime,
+					Count:      item.Count,
+					StepIndex:  int(GetStepIndex(item.CreateTime, endTime, form.Step)),
+				},
+			}}
 			continue
 		}
 
@@ -254,7 +265,12 @@ func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 		b, _ := time.ParseDuration(fmt.Sprintf("%ds", form.Step))
 		if item.CreateTime.Unix() <= lastType.CreateTime.Add(b*-1).Unix() {
-			typeList.Time = append(typeList.Time, item)
+			typeList.Time = append(typeList.Time, &model.AssetCountV0{
+				DefId:      item.DefId,
+				CreateTime: item.CreateTime,
+				Count:      item.Count,
+				StepIndex:  int(GetStepIndex(item.CreateTime, endTime, form.Step)),
+			})
 		}
 	}
 

queencount/bus/asset_action.go

@@ -14,9 +14,6 @@ import (
 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

queencount/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("tree-mongo")
+	inst, err := bus.NewMongoDBFromConfig("tree-mongo")
 	if err != nil {
 		panic(err)
 	}

queencount/db/model/assetCount.go

@@ -13,6 +13,14 @@ type AssetCount struct {
 	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
 }
 
+type AssetCountV0 struct {
+	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	DefId      string             `bson:"defId,omitempty" json:"defId"`
+	Count      int                `bson:"count,omitempty" json:"count"`
+	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
+	StepIndex  int                `bson:"count,omitempty" json:"stepIndex"`
+}
+
 type AssetEvent struct {
 	DefId string
 	DbId  string // 哪个资产库的统计表

queencount/db/redis.go

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