|
|
@@ -8,13 +8,15 @@ import (
|
|
|
"time"
|
|
|
|
|
|
"github.com/gin-gonic/gin"
|
|
|
+ "go.mongodb.org/mongo-driver/bson"
|
|
|
+ "go.mongodb.org/mongo-driver/bson/primitive"
|
|
|
)
|
|
|
|
|
|
func AssetCount(router *GinRouter) {
|
|
|
// 统计总信息
|
|
|
router.GET("/count/info/types/:dbId", GetAssetCount)
|
|
|
// 统计总图表
|
|
|
- router.GET("/count/info/chart", GetInfoChart)
|
|
|
+ router.GET("/count/info", GetInfo)
|
|
|
}
|
|
|
|
|
|
type AssetDefCountInfo struct {
|
|
|
@@ -145,221 +147,27 @@ func GetAssetCount(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
return assetDefCountInfo, nil
|
|
|
}
|
|
|
|
|
|
-// 增量时间段
|
|
|
-type IncrementDuration struct {
|
|
|
- Start time.Time
|
|
|
- End time.Time
|
|
|
+type CountInfo struct {
|
|
|
+ Mesh []DefItem `json:"mesh"`
|
|
|
+ Image []DefItem `json:"image"`
|
|
|
+ Material []DefItem `json:"material"`
|
|
|
+ Env3d []DefItem `json:"env3d"`
|
|
|
}
|
|
|
|
|
|
-// 增量时间段集合
|
|
|
-type IncrementTimes []IncrementDuration
|
|
|
-
|
|
|
-type ReqFrom struct {
|
|
|
- TimeType string `json:"timeType"` // day
|
|
|
- TimeStep string `json:"timeStep"` // 1h
|
|
|
-}
|
|
|
-
|
|
|
-type ListItem struct {
|
|
|
- Type string `json:"type"`
|
|
|
- Data []int `json:"data"`
|
|
|
-}
|
|
|
-type ResultData struct {
|
|
|
- Step string `json:"step"`
|
|
|
- Time []time.Time `json:"time"`
|
|
|
- List []ListItem `json:"list"`
|
|
|
-}
|
|
|
-
|
|
|
-// 步距代表的小时数
|
|
|
-var step2HourTimes = map[string]int32{"1h": 1, "1d": 24, "1w": 24 * 7, "1M": 24 * 30}
|
|
|
-
|
|
|
-// 类型代表的小时数
|
|
|
-var type2HourTimes = map[string]int32{"day": 24, "threeDay": 24, "week": 24 * 30, "month": 30 * 24, "year": 365 * 24, "all": 120 * 24}
|
|
|
-
|
|
|
-// 获取统计信息图表需要的信息
|
|
|
-func GetInfoChart(c *gin.Context, _ *ApiSession) (interface{}, error) {
|
|
|
-
|
|
|
- var form struct {
|
|
|
- TimeType string
|
|
|
- DbId string
|
|
|
- }
|
|
|
- err := c.ShouldBindJSON(&form)
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("参数错误")
|
|
|
- }
|
|
|
-
|
|
|
- if form.TimeType == "" {
|
|
|
- return nil, errors.New("时间类型不能为空")
|
|
|
- }
|
|
|
- if form.DbId == "" {
|
|
|
- return nil, errors.New("数据库id不为空")
|
|
|
- }
|
|
|
-
|
|
|
- // ctx := apictx.CreateRepoCtx()
|
|
|
- // userId := apictx.User.ID
|
|
|
- // var list ResultData
|
|
|
-
|
|
|
- // incrementTimes, timeSet := GetIncrementTimes(form.TimeType, form.TimeStep)
|
|
|
-
|
|
|
- query := make(map[string]interface{})
|
|
|
- query["dbId"] = form.DbId
|
|
|
-
|
|
|
- // parm := &repo.DocsSearchOptions{
|
|
|
- // CollectName: countCollection,
|
|
|
- // Project: []string{"_id", "productId", "type", "defKey", "defName", "createTime"},
|
|
|
- // }
|
|
|
-
|
|
|
- // // "mesh"
|
|
|
- // var meshItem ListItem
|
|
|
- // meshItem.Type = "mesh"
|
|
|
- // for _, incrementTime := range incrementTimes {
|
|
|
- // // 拼接条件 查询各个增量时间段的数据
|
|
|
- // query["$gt"] = incrementTime.Start
|
|
|
- // query["$lte"] = incrementTime.End
|
|
|
- // query["type"] = "mesh"
|
|
|
- // parm.Query = query
|
|
|
- // ok, res := repo.RepoSeachDocsMap(ctx, parm)
|
|
|
- // if ok {
|
|
|
- // meshItem.Data = append(meshItem.Data, len(res))
|
|
|
- // }
|
|
|
- // }
|
|
|
- // list.List = append(list.List, meshItem)
|
|
|
-
|
|
|
- // // "image"
|
|
|
- // var imageItem ListItem
|
|
|
- // imageItem.Type = "image"
|
|
|
- // for _, incrementTime := range incrementTimes {
|
|
|
- // // 拼接条件 查询各个增量时间段的数据
|
|
|
- // query["$gt"] = incrementTime.Start
|
|
|
- // query["$lte"] = incrementTime.End
|
|
|
- // query["type"] = "image"
|
|
|
- // parm.Query = query
|
|
|
- // ok, res := repo.RepoSeachDocsMap(ctx, parm)
|
|
|
- // if ok {
|
|
|
- // imageItem.Data = append(imageItem.Data, len(res))
|
|
|
- // }
|
|
|
- // }
|
|
|
- // list.List = append(list.List, imageItem)
|
|
|
-
|
|
|
- // // "material"
|
|
|
- // var materialItem ListItem
|
|
|
- // materialItem.Type = "material"
|
|
|
-
|
|
|
- // for _, incrementTime := range incrementTimes {
|
|
|
- // // 拼接条件 查询各个增量时间段的数据
|
|
|
- // query["$gt"] = incrementTime.Start
|
|
|
- // query["$lte"] = incrementTime.End
|
|
|
- // query["type"] = "material"
|
|
|
- // parm.Query = query
|
|
|
- // ok, res := repo.RepoSeachDocsMap(ctx, parm)
|
|
|
- // if ok {
|
|
|
- // materialItem.Data = append(materialItem.Data, len(res))
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // list.List = append(list.List, materialItem)
|
|
|
-
|
|
|
- // // "env3d"
|
|
|
- // var env3dItem ListItem
|
|
|
- // env3dItem.Type = "env3d"
|
|
|
- // for _, incrementTime := range incrementTimes {
|
|
|
- // // 拼接条件 查询各个增量时间段的数据
|
|
|
- // query["$gt"] = incrementTime.Start
|
|
|
- // query["$lte"] = incrementTime.End
|
|
|
- // query["type"] = "env3d"
|
|
|
- // parm.Query = query
|
|
|
- // ok, res := repo.RepoSeachDocsMap(ctx, parm)
|
|
|
- // if ok {
|
|
|
- // env3dItem.Data = append(env3dItem.Data, len(res))
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // list.List = append(list.List, env3dItem)
|
|
|
- // list.Step = form.TimeStep
|
|
|
- // list.Time = timeSet
|
|
|
-
|
|
|
- // return list, nil
|
|
|
-
|
|
|
- return nil, nil
|
|
|
+type DefItem struct {
|
|
|
+ DefName string `json:"defName"`
|
|
|
+ DefKey string `json:"defKey"`
|
|
|
+ Time []CountTime `json:"time"`
|
|
|
}
|
|
|
-
|
|
|
-type ItemCountResult struct {
|
|
|
- Step string `json:"step"`
|
|
|
- Time []time.Time `json:"time"`
|
|
|
- Data ItemCount `json:"data"`
|
|
|
-}
|
|
|
-
|
|
|
-type ItemCount struct {
|
|
|
- DefKey string `json:"defKey"`
|
|
|
- DefName string `json:"defName"`
|
|
|
- Data []int `json:"data"`
|
|
|
-}
|
|
|
-
|
|
|
-// 获取定义模型的统计数据
|
|
|
-func GetDefModelChart(_ *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
- // 接受timeType timeStep type defKey
|
|
|
- var form struct {
|
|
|
- TimeType string `json:"timeType"`
|
|
|
- TimeStep string `json:"timeStep"`
|
|
|
- Type string `json:"type"`
|
|
|
- DefKey string `json:"defKey"`
|
|
|
- }
|
|
|
- // err := c.ShouldBindJSON(&form)
|
|
|
- // if err != nil {
|
|
|
- // return nil, err
|
|
|
- // }
|
|
|
- form.TimeStep = "1h"
|
|
|
- form.TimeType = "day"
|
|
|
- if form.TimeType == "" {
|
|
|
- return nil, errors.New("时间类型不能为空")
|
|
|
- }
|
|
|
- if form.TimeStep == "" {
|
|
|
- return nil, errors.New("时间步距不能为空")
|
|
|
- }
|
|
|
- if form.Type == "" {
|
|
|
- return nil, errors.New("时间类型不能为空")
|
|
|
- }
|
|
|
- if form.TimeStep == "" {
|
|
|
- return nil, errors.New("时间步距不能为空")
|
|
|
- }
|
|
|
-
|
|
|
- ctx := apictx.CreateRepoCtx()
|
|
|
- userId := apictx.User.ID
|
|
|
- var result ItemCountResult
|
|
|
- var data ItemCount
|
|
|
- data.DefKey = form.DefKey
|
|
|
-
|
|
|
- incrementTimes, timeSet := GetIncrementTimes(form.TimeType, form.TimeStep)
|
|
|
- result.Time = timeSet
|
|
|
-
|
|
|
- countCollection := "assetcount"
|
|
|
- query := make(map[string]interface{})
|
|
|
- query["userId"] = userId
|
|
|
-
|
|
|
- parm := &repo.DocsSearchOptions{
|
|
|
- CollectName: countCollection,
|
|
|
- Project: []string{"_id", "productId", "type", "defKey", "defName", "createTime"},
|
|
|
- }
|
|
|
-
|
|
|
- for _, incrementTime := range incrementTimes {
|
|
|
- // 拼接条件 查询各个增量时间段的数据
|
|
|
- query["$gt"] = incrementTime.Start
|
|
|
- query["$lte"] = incrementTime.End
|
|
|
- query["type"] = form.Type
|
|
|
- query["defKey"] = form.DefKey
|
|
|
- parm.Query = query
|
|
|
- ok, res := repo.RepoSeachDocsMap(ctx, parm)
|
|
|
- if ok {
|
|
|
- data.Data = append(data.Data, len(res))
|
|
|
- }
|
|
|
- }
|
|
|
- result.Data = data
|
|
|
-
|
|
|
- return result, nil
|
|
|
+type CountTime struct {
|
|
|
+ TimePoint time.Time `json:"timePoint"`
|
|
|
+ Count int `json:"count"`
|
|
|
}
|
|
|
|
|
|
type DefInfo struct {
|
|
|
- DefName string `json:"defName"`
|
|
|
- DefKey string `json:"defKey"`
|
|
|
+ DefId string
|
|
|
+ DefName string
|
|
|
+ DefKey string
|
|
|
}
|
|
|
|
|
|
type DefCateInfo struct {
|
|
|
@@ -369,31 +177,12 @@ type DefCateInfo struct {
|
|
|
Env3d []DefInfo
|
|
|
}
|
|
|
|
|
|
-// 获取用户定义类型分类
|
|
|
-func GetDefModelCate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
-
|
|
|
- var form struct {
|
|
|
- Name string `json:"name"`
|
|
|
- }
|
|
|
- err := c.ShouldBindJSON(&form)
|
|
|
- if err != nil {
|
|
|
- return nil, errors.New("参数错误")
|
|
|
- }
|
|
|
- if form.Name == "" {
|
|
|
- return nil, errors.New("资产库名不能为空")
|
|
|
- }
|
|
|
- // 查询 database 根据name 和用户id查找用户的asset资产
|
|
|
- // 遍历资产信息，根据type获取对应类型的资产集合
|
|
|
- // 62f05931ae8ddfeb72cf684e sku3d-tree
|
|
|
+// 查找类型分类信息
|
|
|
+func GetDefCate(dbId string, ctx *repo.RepoSession) (defCateInfo DefCateInfo, err error) {
|
|
|
var database model.Database
|
|
|
- ctx := apictx.CreateRepoCtx()
|
|
|
- var defCateInfo DefCateInfo
|
|
|
var defInfo DefInfo
|
|
|
query := make(map[string]interface{})
|
|
|
- // query["userId"] = apictx.User.ID
|
|
|
- query["userId"] = "62f05931ae8ddfeb72cf684e"
|
|
|
- // query["name"] = form.Name
|
|
|
- query["name"] = "sku3d-tree"
|
|
|
+ query["_id"], _ = primitive.ObjectIDFromHex(dbId)
|
|
|
|
|
|
param := &repo.DocSearchOptions{
|
|
|
CollectName: repo.CollectionDatabase,
|
|
|
@@ -402,28 +191,28 @@ func GetDefModelCate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
}
|
|
|
ok, err := repo.RepoSeachDoc(ctx, param, &database)
|
|
|
if err != nil || !ok {
|
|
|
- return nil, errors.New("查询数据错误")
|
|
|
+ return defCateInfo, errors.New("查询数据错误")
|
|
|
}
|
|
|
|
|
|
for _, v := range database.Assets {
|
|
|
+ defInfo.DefKey = v.Collection
|
|
|
+ defInfo.DefName = v.Label
|
|
|
+ defInfo.DefId = v.Id
|
|
|
+
|
|
|
+ // mesh
|
|
|
if v.Type == 10 {
|
|
|
- defInfo.DefKey = v.Collection
|
|
|
- defInfo.DefName = v.Label
|
|
|
defCateInfo.Mesh = append(defCateInfo.Mesh, defInfo)
|
|
|
}
|
|
|
+ // image
|
|
|
if v.Type == 20 {
|
|
|
- defInfo.DefKey = v.Collection
|
|
|
- defInfo.DefName = v.Label
|
|
|
defCateInfo.Image = append(defCateInfo.Image, defInfo)
|
|
|
}
|
|
|
+ // material
|
|
|
if v.Type == 30 {
|
|
|
- defInfo.DefKey = v.Collection
|
|
|
- defInfo.DefName = v.Label
|
|
|
defCateInfo.Material = append(defCateInfo.Material, defInfo)
|
|
|
}
|
|
|
+ // env3d
|
|
|
if v.Type == 40 {
|
|
|
- defInfo.DefKey = v.Collection
|
|
|
- defInfo.DefName = v.Label
|
|
|
defCateInfo.Env3d = append(defCateInfo.Env3d, defInfo)
|
|
|
}
|
|
|
|
|
|
@@ -432,77 +221,186 @@ func GetDefModelCate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
return defCateInfo, nil
|
|
|
}
|
|
|
|
|
|
-// 根据时间段进行范围查找
|
|
|
-// [
|
|
|
-// {
|
|
|
-// "Start": "2022-10-13T15:35:11.072184706+08:00",
|
|
|
-// "End": "2022-10-13T17:35:11.072184706+08:00"
|
|
|
-// }
|
|
|
-// ]
|
|
|
+// TODO 需要优化
|
|
|
+type ReqAssetCount struct {
|
|
|
+ DbId string `json:"dbId"`
|
|
|
+ Step int `json:"step"`
|
|
|
+ StartTime string `json:"startTime"`
|
|
|
+ EndTime string `json:"endTime"`
|
|
|
+}
|
|
|
|
|
|
-// 获取当前用户各个资源类型的
|
|
|
+// 获取统计信息图表需要的信息
|
|
|
+func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
|
|
|
-// f := bson.M{"orderId": bson.M{"$gte": minId, "$lt": maxId}, "type": item["type"].(string)}
|
|
|
-// filters = append(filters, f)
|
|
|
+ var form ReqAssetCount
|
|
|
+ err := c.ShouldBindJSON(&form)
|
|
|
+ if err != nil {
|
|
|
+ return nil, errors.New("参数错误")
|
|
|
+ }
|
|
|
+
|
|
|
+ if form.Step == 0 {
|
|
|
+ return nil, errors.New("时间步距不能为空")
|
|
|
+ }
|
|
|
+ if form.StartTime == "" {
|
|
|
+ return nil, errors.New("开始时间不能为空")
|
|
|
+ }
|
|
|
+ if form.EndTime == "" {
|
|
|
+ return nil, errors.New("结束时间不能为空")
|
|
|
+ }
|
|
|
+ if form.DbId == "" {
|
|
|
+ return nil, errors.New("数据库id不为空")
|
|
|
+ }
|
|
|
|
|
|
-// ok, extendsItems := RepoSeachDocsMap(ctx, &DocsSearchOptions{CollectName: CollectionLibCategory, Query: Map{"$or": filters}, Project: []string{"_id"}})
|
|
|
+ ctx := apictx.CreateRepoCtx()
|
|
|
+ timeSet := GetCountTimeSet(form)
|
|
|
|
|
|
-// // return nil, nil
|
|
|
-// 今天用mongodb查昨天某个collection产生的记录数量，在mysql里面可以用between..and..或者 >、>=、<、<=来查
|
|
|
-// 询指定的时间范围数据，但是mongodb有自己的语法。mongodb里比较，用 "$gt" 、"$gte"、 "$lt"、 "$lte"（分别对应">"、 ">=" 、"<" 、"<="），
|
|
|
-// 组合起来可以进行范围的查找。比如查昨天的，就可以用
|
|
|
+ query := make(map[string]interface{})
|
|
|
+ query["dbId"], _ = primitive.ObjectIDFromHex(form.DbId)
|
|
|
|
|
|
-// db.CollectionAAA.find({ "CreateTime" : { "$gte" : ISODate("2017-04-20T00:00:00Z")
|
|
|
-// , "$lt" : ISODate("2017-04-21T00:00:00Z") } }).count()
|
|
|
-// 注意，开始的时候日期使用 "2017-04-20" 和"2017-04-21"，但是返回结果为空，应该日期字段需要指定格式吧，看了下存在库里的数据为ISODate类型，所以直接写成ISODate的方式，结果就正常了。
|
|
|
+ parm := &repo.DocSearchOptions{
|
|
|
+ CollectName: repo.CollectionAssetCount,
|
|
|
+ Project: []string{"_id", "defId", "createTime"},
|
|
|
+ Sort: bson.M{"createTime": -1}, // 降序 小于等于createTime中取时间最近的 第一条
|
|
|
+ }
|
|
|
|
|
|
-// }
|
|
|
+ var assetCount model.AssetCount
|
|
|
|
|
|
-// 根据类型/步距 = 时间点个数
|
|
|
+ // 返回的数据
|
|
|
+ var countInfo CountInfo
|
|
|
|
|
|
-// 获取时间集合 用于统计查询
|
|
|
-func GetIncrementTimes(timeType string, timeStep string) (incrementTimes IncrementTimes, timeSet []time.Time) {
|
|
|
- // key 对应 时间段 day threeDay ...
|
|
|
- step, ok := step2HourTimes[timeStep]
|
|
|
- if !ok {
|
|
|
- return
|
|
|
+ // 获取分类数据
|
|
|
+ defCateInfo, err := GetDefCate(form.DbId, ctx)
|
|
|
+ if err != nil {
|
|
|
+ return nil, err
|
|
|
}
|
|
|
|
|
|
- typev, ok := type2HourTimes[timeType]
|
|
|
- fmt.Println(typev)
|
|
|
- if !ok {
|
|
|
- return
|
|
|
+ var meshCountTime CountTime
|
|
|
+ var meshDefItem DefItem
|
|
|
+
|
|
|
+ counti := 0
|
|
|
+ countj := 0
|
|
|
+
|
|
|
+ for _, defMesh := range defCateInfo.Mesh {
|
|
|
+ counti++
|
|
|
+ query["type"] = 10
|
|
|
+ meshDefItem.DefKey = defMesh.DefKey
|
|
|
+ meshDefItem.DefName = defMesh.DefName
|
|
|
+ for _, timePoint := range timeSet {
|
|
|
+ // 拼接条件 查询各个增量时间段的数据
|
|
|
+ query["defKey"] = defMesh.DefKey
|
|
|
+ parm.Query = query
|
|
|
+ countj++
|
|
|
+ bl, err := repo.RepoSeachDoc(ctx, parm, &assetCount)
|
|
|
+ if !bl || err != nil {
|
|
|
+ meshCountTime.Count = 0
|
|
|
+ } else {
|
|
|
+ meshCountTime.Count = assetCount.Count
|
|
|
+ }
|
|
|
+ meshCountTime.TimePoint = timePoint
|
|
|
+ meshDefItem.Time = append(meshDefItem.Time, meshCountTime)
|
|
|
+
|
|
|
+ }
|
|
|
+ countInfo.Mesh = append(countInfo.Mesh, meshDefItem)
|
|
|
+
|
|
|
}
|
|
|
+ fmt.Println(counti) // 29
|
|
|
+ fmt.Println("---------------------------")
|
|
|
+ fmt.Println(countj) // 725
|
|
|
+
|
|
|
+ var imageCountTime CountTime
|
|
|
+ var imageDefItem DefItem
|
|
|
+ for _, defImage := range defCateInfo.Image {
|
|
|
+ query["type"] = 20
|
|
|
+ imageDefItem.DefKey = defImage.DefKey
|
|
|
+ imageDefItem.DefName = defImage.DefName
|
|
|
+ for _, timePoint := range timeSet {
|
|
|
+ // 拼接条件 查询各个增量时间段的数据
|
|
|
+ query["createTime"] = bson.M{"$lte": timePoint}
|
|
|
+ query["defKey"] = defImage.DefKey
|
|
|
+ parm.Query = query
|
|
|
+ bl, err := repo.RepoSeachDoc(ctx, parm, &assetCount)
|
|
|
+
|
|
|
+ if !bl || err != nil {
|
|
|
+ imageCountTime.Count = 0
|
|
|
+ } else {
|
|
|
+ imageCountTime.Count = assetCount.Count
|
|
|
+ }
|
|
|
+ imageCountTime.TimePoint = timePoint
|
|
|
+ imageDefItem.Time = append(imageDefItem.Time, imageCountTime)
|
|
|
|
|
|
- // 这个类型有多少个记录点
|
|
|
- times := typev/step + 1
|
|
|
+ }
|
|
|
+ countInfo.Image = append(countInfo.Image, imageDefItem)
|
|
|
|
|
|
- now := time.Now() //获取当前时间
|
|
|
- incrementDuration := IncrementDuration{}
|
|
|
+ }
|
|
|
|
|
|
- // 24小时之前
|
|
|
- // a, _ := time.ParseDuration(fmt.Sprintf("%dh", -counts))
|
|
|
- // start := now.Add(a)
|
|
|
+ var materialCountTime CountTime
|
|
|
+ var materialDefItem DefItem
|
|
|
+ for _, defMaterial := range defCateInfo.Material {
|
|
|
+ query["type"] = 30
|
|
|
+ materialDefItem.DefKey = defMaterial.DefKey
|
|
|
+ materialDefItem.DefName = defMaterial.DefName
|
|
|
+ for _, timePoint := range timeSet {
|
|
|
+ // 拼接条件 查询各个增量时间段的数据
|
|
|
+ query["createTime"] = bson.M{"$lte": timePoint}
|
|
|
+ query["defKey"] = defMaterial.DefKey
|
|
|
+ parm.Query = query
|
|
|
+ bl, err := repo.RepoSeachDoc(ctx, parm, &assetCount)
|
|
|
+
|
|
|
+ if !bl || err != nil {
|
|
|
+ materialCountTime.Count = 0
|
|
|
+ } else {
|
|
|
+ materialCountTime.Count = assetCount.Count
|
|
|
+ }
|
|
|
+ materialCountTime.TimePoint = timePoint
|
|
|
+ materialDefItem.Time = append(materialDefItem.Time, materialCountTime)
|
|
|
|
|
|
- for i := times; i > 0; i-- {
|
|
|
- if timeStep == "1d" {
|
|
|
- i = i * 24
|
|
|
- }
|
|
|
- if timeStep == "1w" {
|
|
|
- i = i * 24 * 7
|
|
|
}
|
|
|
- if timeStep == "1M" {
|
|
|
- i = i * 24 * 30
|
|
|
+ countInfo.Material = append(countInfo.Material, materialDefItem)
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ var env3dCountTime CountTime
|
|
|
+ var env3dDefItem DefItem
|
|
|
+ for _, defEnv3d := range defCateInfo.Env3d {
|
|
|
+ query["type"] = 40
|
|
|
+ env3dDefItem.DefKey = defEnv3d.DefKey
|
|
|
+ env3dDefItem.DefName = defEnv3d.DefName
|
|
|
+ for _, timePoint := range timeSet {
|
|
|
+ // 拼接条件 查询各个增量时间段的数据
|
|
|
+ query["createTime"] = bson.M{"$lte": timePoint}
|
|
|
+ query["defKey"] = defEnv3d.DefKey
|
|
|
+ parm.Query = query
|
|
|
+ bl, err := repo.RepoSeachDoc(ctx, parm, &assetCount)
|
|
|
+
|
|
|
+ if !bl || err != nil {
|
|
|
+ env3dCountTime.Count = 0
|
|
|
+ } else {
|
|
|
+ env3dCountTime.Count = assetCount.Count
|
|
|
+ }
|
|
|
+ env3dCountTime.TimePoint = timePoint
|
|
|
+ env3dDefItem.Time = append(env3dDefItem.Time, env3dCountTime)
|
|
|
+
|
|
|
}
|
|
|
- a, _ := time.ParseDuration(fmt.Sprintf("%dh", -i))
|
|
|
- b, _ := time.ParseDuration(fmt.Sprintf("%dh", -i+1))
|
|
|
- start := now.Add(a)
|
|
|
- end := now.Add(b)
|
|
|
- incrementDuration.Start = start
|
|
|
- incrementDuration.End = end
|
|
|
- incrementTimes = append(incrementTimes, incrementDuration)
|
|
|
- timeSet = append(timeSet, end)
|
|
|
+ countInfo.Env3d = append(countInfo.Env3d, env3dDefItem)
|
|
|
+
|
|
|
}
|
|
|
- return incrementTimes, timeSet
|
|
|
|
|
|
+ return countInfo, nil
|
|
|
+}
|
|
|
+
|
|
|
+// 获取需要查询数据的时间点
|
|
|
+func GetCountTimeSet(form ReqAssetCount) (timeSet []time.Time) {
|
|
|
+ // 计算有多少个时间段
|
|
|
+ startTime, _ := time.Parse("2006-01-02 15:04:05", form.StartTime)
|
|
|
+ endTime, _ := time.Parse("2006-01-02 15:04:05", form.EndTime)
|
|
|
+ duration := endTime.Unix() - startTime.Unix()
|
|
|
+ counts := int(duration / int64(form.Step)) // 取整
|
|
|
+
|
|
|
+ for i := 0; i <= counts; i++ {
|
|
|
+ b, _ := time.ParseDuration(fmt.Sprintf("%ds", i*form.Step))
|
|
|
+ start := startTime.Add(b)
|
|
|
+ // 第一个元素为开始时间
|
|
|
+ timeSet = append(timeSet, start)
|
|
|
+ }
|
|
|
+ return
|
|
|
}
|
