update

models/cloudbrain_static.go

@@ -250,7 +250,6 @@ func GetCreateHourPeriodCount(dateBeginTime string, dateEndTime string) (map[str
 }
 
 func GetRunHourPeriodCount(dateBeginTime string, dateEndTime string) (map[string]interface{}, error) {
-	//0 to 23 for each hour,
 	dateHourMap := make(map[string]interface{})
 	var slice = []int64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23}
 	for key, value := range slice {

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -134,13 +134,6 @@ func GetAllCloudbrainsOverview(ctx *context.Context) {
 }
 
 func GetAllCloudbrainsTrend(ctx *context.Context) {
-	recordCloudbrain, err := models.GetRecordBeginTime()
-	if err != nil {
-		log.Error("Can not get recordCloudbrain", err)
-		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
-		return
-	}
-	brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
 
 	queryType := ctx.QueryTrim("type")
 	now := time.Now()
@@ -150,8 +143,16 @@ func GetAllCloudbrainsTrend(ctx *context.Context) {
 	var beginTime time.Time
 	var endTime time.Time
 	dateCloudbrainNum := make([]DateCloudbrainNum, 0)
+	var err error
 	if queryType != "" {
 		if queryType == "all" {
+			recordCloudbrain, err := models.GetRecordBeginTime()
+			if err != nil {
+				log.Error("Can not get recordCloudbrain", err)
+				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
+				return
+			}
+			brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
 			beginTime = brainRecordBeginTime
 			endTime = now
 			dateCloudbrainNum, err = getMonthCloudbrainNum(beginTime, endTime)
@@ -184,7 +185,6 @@ func GetAllCloudbrainsTrend(ctx *context.Context) {
 			beginTime = now.AddDate(0, 0, -6)
 			beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location())
 			endTime = now
-
 			dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTime)
 			if err != nil {
 				log.Error("Can not query getDayCloudbrainNum.", err)
@@ -236,6 +236,13 @@ func GetAllCloudbrainsTrend(ctx *context.Context) {
 	} else {
 		if beginTimeStr == "" || endTimeStr == "" {
 			//如果查询类型和开始时间结束时间都未设置，按queryType=all处理
+			recordCloudbrain, err := models.GetRecordBeginTime()
+			if err != nil {
+				log.Error("Can not get recordCloudbrain", err)
+				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
+				return
+			}
+			brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
 			beginTime = brainRecordBeginTime
 			endTime = now
 			dateCloudbrainNum, err = getMonthCloudbrainNum(beginTime, endTime)
@@ -275,14 +282,6 @@ func GetAllCloudbrainsTrend(ctx *context.Context) {
 
 }
 func GetAllCloudbrainsTrendDetail(ctx *context.Context) {
-	recordCloudbrain, err := models.GetRecordBeginTime()
-	if err != nil {
-		log.Error("Can not get recordCloudbrain", err)
-		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
-		return
-	}
-	brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
-
 	queryType := ctx.QueryTrim("type")
 	now := time.Now()
 
@@ -292,9 +291,17 @@ func GetAllCloudbrainsTrendDetail(ctx *context.Context) {
 	var endTime time.Time
 	var endTimeTemp time.Time
 	dayCloudbrainInfo := make([]DateCloudbrainInfo, 0)
+	var err error
 	var count int
 	if queryType != "" {
 		if queryType == "all" {
+			recordCloudbrain, err := models.GetRecordBeginTime()
+			if err != nil {
+				log.Error("Can not get recordCloudbrain", err)
+				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
+				return
+			}
+			brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
 			beginTime = brainRecordBeginTime
 			endTime = now
 			dayCloudbrainInfo, count, err = getMonthCloudbrainInfo(beginTime, endTime)
@@ -383,6 +390,13 @@ func GetAllCloudbrainsTrendDetail(ctx *context.Context) {
 	} else {
 		if beginTimeStr == "" || endTimeStr == "" {
 			//如果查询类型和开始时间结束时间都未设置，按queryType=all处理
+			recordCloudbrain, err := models.GetRecordBeginTime()
+			if err != nil {
+				log.Error("Can not get recordCloudbrain", err)
+				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
+				return
+			}
+			brainRecordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix.AsTime()
 			beginTime = brainRecordBeginTime
 			endTime = now
 			dayCloudbrainInfo, count, err = getMonthCloudbrainInfo(beginTime, endTime)
@@ -459,8 +473,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
 		return
 	}
-	recordTime := time.Unix(int64(recordCloudbrain[0].Cloudbrain.CreatedUnix), 0).Format("2006-01-02 15:04:05")
-	recordBeginTime, _ := time.Parse("2006-01-02 15:04:05", recordTime)
+	recordBeginTime := time.Unix(int64(recordCloudbrain[0].Cloudbrain.CreatedUnix), 0)
 	beginTime, endTime, err := getCloudbrainTimePeroid(ctx, recordBeginTime)
 	if err != nil {
 		log.Error("Parameter is wrong", err)
@@ -480,6 +493,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) {
 	page := 1
 	pagesize := 1000
 	count := pagesize
+	//Each time a maximum of 1000 pieces of data are detected to the memory, batch processing
 	for count == pagesize && count != 0 {
 		cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
 			ListOptions: models.ListOptions{
@@ -636,7 +650,14 @@ func GetCloudbrainsStatusAnalysis(ctx *context.Context) {
 }
 
 func GetCloudbrainsDetailData(ctx *context.Context) {
-
+	recordCloudbrain, err := models.GetRecordBeginTime()
+	if err != nil {
+		log.Error("Can not get recordCloudbrain", err)
+		ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
+		return
+	}
+	recordBeginTime := recordCloudbrain[0].Cloudbrain.CreatedUnix
+	endTime := time.Now()
 	listType := ctx.Query("listType")
 	jobType := ctx.Query("jobType")
 	jobStatus := ctx.Query("jobStatus")
@@ -684,6 +705,8 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 		JobStatus:       jobStatuses,
 		JobTypes:        jobTypes,
 		NeedRepoInfo:    true,
+		BeginTimeUnix:   int64(recordBeginTime),
+		EndTimeUnix:     endTime.Unix(),
 	})
 	if err != nil {
 		ctx.ServerError("Get job failed:", err)
@@ -759,7 +782,6 @@ func GetCloudbrainsDetailData(ctx *context.Context) {
 }
 
 func GetCloudbrainsCreateHoursData(ctx *context.Context) {
-	createHourPeriodCount := make(map[string]interface{})
 	recordCloudbrain, err := models.GetRecordBeginTime()
 	if err != nil {
 		log.Error("Can not get record begin time", err)
@@ -774,6 +796,7 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) {
 	endTimeStr := ctx.QueryTrim("endTime")
 	var beginTime time.Time
 	var endTime time.Time
+	createHourPeriodCount := make(map[string]interface{})
 	if queryType != "" {
 		if queryType == "all" {
 			beginTime = recordBeginTime
@@ -831,12 +854,8 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) {
 			}
 		}
 	}
-	log.Info("begintimehour:", beginTime)
-	log.Info("endTimehour:", endTime)
 	dateBeginTime := beginTime.Format("2006-01-02")
 	dateEndTime := endTime.Format("2006-01-02")
-	log.Info("dateBeginTime:", dateBeginTime)
-	log.Info("dateBeginTime:", dateEndTime)
 	createHourPeriodCount, err = models.GetCreateHourPeriodCount(dateBeginTime, dateEndTime)
 	if err != nil {
 		log.Error("Can not query hourPeriodCount.", err)
@@ -987,7 +1006,9 @@ func getDayCloudbrainNum(beginTime time.Time, endTime time.Time) ([]DateCloudbra
 	var endTimeTemp time.Time
 	endTimeTemp = beginTime.AddDate(0, 0, 1)
 	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
-		Type: models.TypeCloudBrainAll,
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: beginTime.Unix(),
+		EndTimeUnix:   endTime.Unix(),
 	})
 	if err != nil {
 		log.Error("Get cloudbrains failed:", err)
@@ -1021,7 +1042,9 @@ func getMonthCloudbrainNum(beginTime time.Time, endTime time.Time) ([]DateCloudb
 	endTimeTemp = time.Date(endTimeTemp.Year(), endTimeTemp.Month(), 1, 0, 0, 0, 0, now.Location())
 	monthCloudbrainNum := make([]DateCloudbrainNum, 0)
 	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
-		Type: models.TypeCloudBrainAll,
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: beginTime.Unix(),
+		EndTimeUnix:   endTime.Unix(),
 	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)
@@ -1055,7 +1078,9 @@ func getDayCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloudbr
 		endTimeTemp = endTimeTemp.AddDate(0, 0, -1)
 	}
 	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
-		Type: models.TypeCloudBrainAll,
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: beginTime.Unix(),
+		EndTimeUnix:   endTime.Unix(),
 	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)
@@ -1084,7 +1109,9 @@ func getMonthCloudbrainInfo(beginTime time.Time, endTime time.Time) ([]DateCloud
 		endTimeTemp = endTimeTemp.AddDate(0, -1, 0)
 	}
 	cloudbrains, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{
-		Type: models.TypeCloudBrainAll,
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: beginTime.Unix(),
+		EndTimeUnix:   endTime.Unix(),
 	})
 	if err != nil {
 		log.Error("Getcloudbrains failed:%v", err)