update

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -19,6 +19,7 @@ type DateCloudbrainNum struct {
 	CloudOneJobTypeRes        map[string]int `json:"cloudOneJobTypeRes"`
 	CloudTwoJobTypeRes        map[string]int `json:"cloudTwoJobTypeRes"`
 	IntelligentNetJobTypeRes  map[string]int `json:"intelligentNetJobTypeRes"`
+	CDCenterJobTypeRes        map[string]int `json:"cDCenterJobTypeRes"`
 	CloudBrainPeriodNum       map[int]int    `json:"cloudBrainPeriodNum"`
 	CloudBrainComputeResource map[string]int `json:"cloudBrainComputeResource"`
 }
@@ -612,6 +613,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	cloudOneJobTypeRes := make(map[string]int)
 	cloudTwoJobTypeRes := make(map[string]int)
 	intelligentNetJobTypeRes := make(map[string]int)
+	cDCenterJobTypeRes := make(map[string]int)
 	cloudBrainPeriodNum := make(map[int]int)
 	cloudBrainComputeResource := make(map[string]int)
 	beginTimeTemp := beginTime.Unix()
@@ -620,7 +622,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	}
 
 	page := 1
-	pagesize := 1000
+	pagesize := 10000
 	count := pagesize
 	//Each time a maximum of 1000 pieces of data are detected to the memory, batch processing
 	for count == pagesize && count != 0 {
@@ -660,6 +662,13 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 					intelligentNetJobTypeRes[cloudbrain.JobType] += 1
 				}
 			}
+			if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
+				if _, ok := cDCenterJobTypeRes[cloudbrain.JobType]; !ok {
+					cDCenterJobTypeRes[cloudbrain.JobType] = 1
+				} else {
+					cDCenterJobTypeRes[cloudbrain.JobType] += 1
+				}
+			}
 
 			if _, ok := cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type]; !ok {
 				cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] = 1
@@ -690,7 +699,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 			intelligentNetJobTypeRes[v] = 0
 		}
 	}
-	cloudBrainTypeList := []int{0, 1, 2}
+	cloudBrainTypeList := []int{0, 1, 2, 3}
 	for _, v := range cloudBrainTypeList {
 		if _, ok := cloudBrainPeriodNum[v]; !ok {
 			cloudBrainPeriodNum[v] = 0
@@ -711,6 +720,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 		"cloudOneJobTypeRes":        cloudOneJobTypeRes,
 		"cloudTwoJobTypeRes":        cloudTwoJobTypeRes,
 		"intelligentNetJobTypeRes":  intelligentNetJobTypeRes,
+		"cDCenterJobTypeRes":        cDCenterJobTypeRes,
 		"cloudBrainPeriodNum":       cloudBrainPeriodNum,
 		"cloudBrainComputeResource": cloudBrainComputeResource,
 	})
@@ -1086,11 +1096,12 @@ func GetRunningTop(ctx *context.Context) {
 	})
 }
 
-func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*models.CloudbrainInfo) (map[string]int, map[string]int, map[string]int, map[int]int, map[string]int) {
+func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*models.CloudbrainInfo) (map[string]int, map[string]int, map[string]int, map[string]int, map[int]int, map[string]int) {
 
 	cloudOneJobTypeRes := make(map[string]int)
 	cloudTwoJobTypeRes := make(map[string]int)
 	intelligentNetJobTypeRes := make(map[string]int)
+	cDCenterJobTypeRes := make(map[string]int)
 	cloudBrainPeriodNum := make(map[int]int)
 	cloudBrainComputeResource := make(map[string]int)
 	for _, cloudbrain := range cloudbrains {
@@ -1133,7 +1144,7 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*m
 	}
 
 	jobTypeList := []string{"DEBUG", "BENCHMARK", "INFERENCE", "TRAIN", "SNN4IMAGENET", "BRAINSCORE"}
-	cloudBrainTypeList := []int{0, 1, 2}
+	cloudBrainTypeList := []int{0, 1, 2, 3}
 	for _, v := range jobTypeList {
 		if _, ok := cloudOneJobTypeRes[v]; !ok {
 			cloudOneJobTypeRes[v] = 0
@@ -1144,6 +1155,9 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*m
 		if _, ok := intelligentNetJobTypeRes[v]; !ok {
 			intelligentNetJobTypeRes[v] = 0
 		}
+		if _, ok := cDCenterJobTypeRes[v]; !ok {
+			cDCenterJobTypeRes[v] = 0
+		}
 	}
 	for _, v := range cloudBrainTypeList {
 		if _, ok := cloudBrainPeriodNum[v]; !ok {
@@ -1151,7 +1165,7 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time, cloudbrains []*m
 		}
 	}
 	cloudBrainPeriodNum[-1] = cloudBrainPeriodNum[0] + cloudBrainPeriodNum[1] + cloudBrainPeriodNum[2]
-	return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource
+	return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cDCenterJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource
 }
 
 func getDayCloudbrainNum(beginTime time.Time, endTime time.Time) ([]DateCloudbrainNum, error) {
@@ -1168,12 +1182,13 @@ func getDayCloudbrainNum(beginTime time.Time, endTime time.Time) ([]DateCloudbra
 	}
 	dayCloudbrainNum := make([]DateCloudbrainNum, 0)
 	for endTimeTemp.Before(endTime) || endTimeTemp.Equal(endTime) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cDCenterJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
 		dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{
 			Date:                      beginTime.Format("2006/01/02"),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,
 			CloudTwoJobTypeRes:        cloudTwoJobTypeRes,
 			IntelligentNetJobTypeRes:  intelligentNetJobTypeRes,
+			CDCenterJobTypeRes:        cDCenterJobTypeRes,
 			CloudBrainPeriodNum:       cloudBrainPeriodNum,
 			CloudBrainComputeResource: cloudBrainComputeResource,
 		})
@@ -1203,12 +1218,13 @@ func getMonthCloudbrainNum(beginTime time.Time, endTime time.Time) ([]DateCloudb
 		return nil, err
 	}
 	for endTimeTemp.Before(endTime) || endTimeTemp.Equal(endTime) {
-		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
+		cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cDCenterJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(beginTime, endTimeTemp, cloudbrains)
 		monthCloudbrainNum = append(monthCloudbrainNum, DateCloudbrainNum{
 			Date:                      beginTime.Format("2006/01"),
 			CloudOneJobTypeRes:        cloudOneJobTypeRes,
 			CloudTwoJobTypeRes:        cloudTwoJobTypeRes,
 			IntelligentNetJobTypeRes:  intelligentNetJobTypeRes,
+			CDCenterJobTypeRes:        cDCenterJobTypeRes,
 			CloudBrainPeriodNum:       cloudBrainPeriodNum,
 			CloudBrainComputeResource: cloudBrainComputeResource,
 		})
@@ -1241,7 +1257,7 @@ func getDayCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloudbr
 	dayCloudbrainInfo := make([]DateCloudbrainInfo, 0)
 	count := 0
 	for beginTime.Before(endTimeTemp) || beginTime.Equal(endTimeTemp) {
-		_, _, _, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(endTimeTemp, endTime, cloudbrains)
+		_, _, _, _, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(endTimeTemp, endTime, cloudbrains)
 		dayCloudbrainInfo = append(dayCloudbrainInfo, DateCloudbrainInfo{
 			Date:                      endTimeTemp.Format("2006/01/02"),
 			CloudBrainPeriodNum:       cloudBrainPeriodNum,
@@ -1272,7 +1288,7 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 	dayCloudbrainInfo := make([]DateCloudbrainInfo, 0)
 	count := 0
 	for beginTime.Before(endTimeTemp) || beginTime.Equal(endTimeTemp) || (endTimeTemp.Before(beginTime) && beginTime.Before(endTime)) {
-		_, _, _, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(endTimeTemp, endTime, cloudbrains)
+		_, _, _, _, cloudBrainPeriodNum, cloudBrainComputeResource := getCloudbrainCount(endTimeTemp, endTime, cloudbrains)
 		dayCloudbrainInfo = append(dayCloudbrainInfo, DateCloudbrainInfo{
 			Date:                      endTimeTemp.Format("2006/01"),
 			CloudBrainPeriodNum:       cloudBrainPeriodNum,