|
|
@@ -14,9 +14,9 @@ import (
|
|
|
|
|
|
func AssetCount(router *GinRouter) {
|
|
|
// 统计总信息
|
|
|
- router.GET("/count/info/types/:dbId", GetAssetCount)
|
|
|
+ router.GET("/asset/info/types/:dbId", GetAssetCount)
|
|
|
// 统计总图表
|
|
|
- router.GET("/count/info", GetInfo)
|
|
|
+ router.GET("/asset/info", GetInfo)
|
|
|
}
|
|
|
|
|
|
type AssetDefCountInfo struct {
|
|
|
@@ -258,7 +258,6 @@ func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
// query["dbId"], _ = primitive.ObjectIDFromHex(form.DbId)
|
|
|
dbId, _ := primitive.ObjectIDFromHex(form.DbId)
|
|
|
|
|
|
- // ??? 需要修改
|
|
|
// 根据id查询数据库名
|
|
|
var databaseDoc model.Database
|
|
|
dbParam := &repo.DocSearchOptions{
|
|
|
@@ -273,15 +272,15 @@ func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
|
|
|
// 查数据名下对应的assetcount
|
|
|
parm := &repo.DocSearchOptions{
|
|
|
- Db: databaseDoc.Name,
|
|
|
- CollectName: repo.CollectionAssetCount,
|
|
|
+ Db: databaseDoc.Name, // 对应资产数据库
|
|
|
+ CollectName: repo.CollectionAssetCount, // 统计表
|
|
|
Project: []string{"_id", "defId", "createTime"},
|
|
|
Sort: bson.M{"createTime": -1}, // 降序 小于等于createTime中取时间最近的 第一条
|
|
|
}
|
|
|
|
|
|
var assetCount model.AssetCount
|
|
|
|
|
|
- // 循环asset.id ->defId,defKey,defName
|
|
|
+ // 遍历获取 asset.id ->defId,defKey,defName
|
|
|
|
|
|
if databaseDoc.Assets == nil {
|
|
|
return nil, errors.New("资产不存在")
|
|
|
@@ -308,7 +307,7 @@ func GetInfo(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
meshDefItem.DefName = asset.Label
|
|
|
|
|
|
for _, timePoint := range timeSet {
|
|
|
- // 拼接条件 查询各个增量时间段的数据
|
|
|
+ // 拼接条件 查询各个时间段的数据
|
|
|
query["defId"] = asset.Id
|
|
|
parm.Query = query
|
|
|
bl, err := repo.RepoSeachDoc(ctx, parm, &assetCount)
|
