|
@@ -1112,7 +1112,7 @@ func setUserMetrics(userMetrics map[string]int, user *User, start_time int64, en |
|
|
//HasActivityUser int `xorm:"NOT NULL DEFAULT 0"` |
|
|
//HasActivityUser int `xorm:"NOT NULL DEFAULT 0"` |
|
|
//TotalActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` |
|
|
//TotalActivateRegistUser int `xorm:"NOT NULL DEFAULT 0"` |
|
|
//TotalHasActivityUser |
|
|
//TotalHasActivityUser |
|
|
regist_time := user.CreatedUnix.AsTime().Unix() |
|
|
|
|
|
|
|
|
regist_time := int64(user.CreatedUnix) |
|
|
if regist_time >= start_time && regist_time <= end_time { |
|
|
if regist_time >= start_time && regist_time <= end_time { |
|
|
if user.IsActive { |
|
|
if user.IsActive { |
|
|
userMetrics["ActivateRegistUser"] = getMapKeyStringValue("ActivateRegistUser", userMetrics) + 1 |
|
|
userMetrics["ActivateRegistUser"] = getMapKeyStringValue("ActivateRegistUser", userMetrics) + 1 |
|
@@ -2049,7 +2049,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s |
|
|
var indexTotal int64 |
|
|
var indexTotal int64 |
|
|
indexTotal = 0 |
|
|
indexTotal = 0 |
|
|
for { |
|
|
for { |
|
|
sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) |
|
|
|
|
|
|
|
|
sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) |
|
|
cloudTaskList := make([]*Cloudbrain, 0) |
|
|
cloudTaskList := make([]*Cloudbrain, 0) |
|
|
sess.Find(&cloudTaskList) |
|
|
sess.Find(&cloudTaskList) |
|
|
log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList))) |
|
|
log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList))) |
|
|