Browse Source

提交代码。解决Bug

Signed-off-by: zouap <zouap@pcl.ac.cn>
tags/v1.22.5.2^2
zouap 3 years ago
parent
commit
531a1c72f9
2 changed files with 2 additions and 16 deletions
  1. +1
    -14
      models/user_business_analysis.go
  2. +1
    -2
      routers/repo/user_data_analysis.go

+ 1
- 14
models/user_business_analysis.go View File

@@ -534,7 +534,7 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
break break
} }
} }
log.Info("query user define,count=" + fmt.Sprint((ResultList)))
log.Info("query user define,count=" + fmt.Sprint(len(ResultList)))
return ResultList, int64(len(ResultList)) return ResultList, int64(len(ResultList))
} }


@@ -1026,20 +1026,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
log.Info("has activity." + userRecord.Name) log.Info("has activity." + userRecord.Name)
addUserToMap(userNewAddActivity, userRecord.CreatedUnix, dateRecord.ID) addUserToMap(userNewAddActivity, userRecord.CreatedUnix, dateRecord.ID)
} }
if !userRecord.IsActive {
continue
}


var deleteDateRecord UserBusinessAnalysis
deleteDateRecord.ID = userRecord.ID
deleteDateRecord.CountDate = CountDate.Unix()
statictisSess.Delete(&deleteDateRecord)

_, err = statictisSess.Insert(&dateRecord)
if err != nil {
log.Info("insert daterecord failed." + err.Error())
return err
}
} }


indexTotal += PAGE_SIZE indexTotal += PAGE_SIZE


+ 1
- 2
routers/repo/user_data_analysis.go View File

@@ -542,14 +542,13 @@ func QueryUserStaticDataPage(ctx *context.Context) {
endTime = time.Now() endTime = time.Now()
} else { } else {
startTime, _ = time.ParseInLocation("2006-01-02", startDate, time.Local) startTime, _ = time.ParseInLocation("2006-01-02", startDate, time.Local)
startTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 12, 0, 0, 0, startTime.Location())
startTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), 0, 0, 0, 0, startTime.Location())
settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime) settingStartTime, _ := time.Parse("2006-01-02", setting.RadarMap.RecordBeginTime)
if startTime.Unix() < settingStartTime.Unix() { if startTime.Unix() < settingStartTime.Unix() {
startTime = settingStartTime startTime = settingStartTime
startDate = settingStartTime.Format("2006-01-02") startDate = settingStartTime.Format("2006-01-02")
} }
endTime, _ = time.ParseInLocation("2006-01-02", endDate, time.Local) endTime, _ = time.ParseInLocation("2006-01-02", endDate, time.Local)
//endTime = endTime.AddDate(0, 0, 1)
endTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 23, 59, 59, 0, startTime.Location()) endTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 23, 59, 59, 0, startTime.Location())


isAll = false isAll = false


Loading…
Cancel
Save