提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/models.go

@@ -157,7 +157,7 @@ func init() {
 		new(UserBusinessAnalysisCurrentMonth),
 		new(UserBusinessAnalysisCurrentWeek),
 		new(UserBusinessAnalysisYesterday),
-		//new(UserBusinessAnalysisLastWeek),
+		new(UserBusinessAnalysisLastWeek),
 		new(UserLoginLog),
 		new(UserMetrics),
 		new(UserAnalysisPara),

models/repo_activity_custom.go

@@ -211,7 +211,7 @@ func setKeyContributerDict(contributorDistinctDict map[string]int, email string,
 	}
 }
 
-func GetAllUserKPIStats() (map[string]*git.UserKPIStats, error) {
+func GetAllUserKPIStats(startTime time.Time, endTime time.Time) (map[string]*git.UserKPIStats, error) {
 	authors := make(map[string]*git.UserKPIStats)
 	repositorys, err := GetAllRepositoriesByFilterCols("owner_name", "name")
 	if err != nil {
@@ -219,7 +219,7 @@ func GetAllUserKPIStats() (map[string]*git.UserKPIStats, error) {
 	}
 
 	for _, repository := range repositorys {
-		authorsOneRepo, err1 := git.GetUserKPIStats(repository.RepoPath())
+		authorsOneRepo, err1 := git.GetUserKPIStats(repository.RepoPath(), startTime, endTime)
 		if err1 != nil {
 			log.Warn("get user kpi status err:"+repository.RepoPath(), err1.Error())
 			continue

models/user_business_analysis.go

@@ -429,7 +429,9 @@ func QueryUserStaticDataForUserDefine(opts *UserBusinessAnalysisQueryOptions, wi
 	StarRepoCountMap := queryStar(start_unix, end_unix)
 	WatchedCountMap, WatchOtherMap := queryFollow(start_unix, end_unix)
 
-	CommitCodeSizeMap, err := GetAllUserKPIStats()
+	StartTime := time.Unix(start_unix, 0)
+	EndTime := time.Unix(end_unix, 0)
+	CommitCodeSizeMap, err := GetAllUserKPIStats(StartTime, EndTime)
 	if err != nil {
 		log.Info("query commit code errr.")
 	} else {
@@ -679,7 +681,15 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	FocusRepoCountMap := queryWatch(start_unix, end_unix)
 	StarRepoCountMap := queryStar(start_unix, end_unix)
 	WatchedCountMap, WatchOtherMap := queryFollow(start_unix, end_unix)
-	CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix())
+	CommitCodeSizeMap, err := GetAllUserKPIStats(StartTimeNextDay, EndTimeNextDay)
+	if err != nil {
+		log.Info("query commit code errr.")
+	} else {
+		log.Info("query commit code size, len=" + fmt.Sprint(len(CommitCodeSizeMap)))
+		CommitCodeSizeMapJson, _ := json.Marshal(CommitCodeSizeMap)
+		log.Info("CommitCodeSizeMapJson=" + string(CommitCodeSizeMapJson))
+	}
+	//CommitCodeSizeMap := queryCommitCodeSize(StartTimeNextDay.Unix(), EndTimeNextDay.Unix())
 	CommitDatasetSizeMap, CommitDatasetNumMap := queryDatasetSize(start_unix, end_unix)
 	SolveIssueCountMap := querySolveIssue(start_unix, end_unix)
 	CreateRepoCountMap := queryUserCreateRepo(start_unix, end_unix)
@@ -733,7 +743,12 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 			dateRecordAll.FocusOtherUser = getMapValue(dateRecordAll.ID, WatchOtherMap)
 			dateRecordAll.StarRepoCount = getMapValue(dateRecordAll.ID, StarRepoCountMap)
 			dateRecordAll.WatchedCount = getMapValue(dateRecordAll.ID, WatchedCountMap)
-			dateRecordAll.CommitCodeSize = getMapValue(dateRecordAll.ID, CommitCodeSizeMap)
+			if _, ok := CommitCodeSizeMap[dateRecordAll.Email]; !ok {
+				dateRecordAll.CommitCodeSize = 0
+			} else {
+				dateRecordAll.CommitCodeSize = int(CommitCodeSizeMap[dateRecordAll.Email].CommitLines)
+			}
+			//dateRecordAll.CommitCodeSize = getMapValue(dateRecordAll.ID, CommitCodeSizeMap)
 			dateRecordAll.CommitDatasetSize = getMapValue(dateRecordAll.ID, CommitDatasetSizeMap)
 			dateRecordAll.CommitDatasetNum = getMapValue(dateRecordAll.ID, CommitDatasetNumMap)
 			dateRecordAll.SolveIssueCount = getMapValue(dateRecordAll.ID, SolveIssueCountMap)
@@ -907,7 +922,7 @@ func CounDataByDateAndReCount(wikiCountMap map[string]int, startTime time.Time,
 	StarRepoCountMap := queryStar(start_unix, end_unix)
 	WatchedCountMap, WatchOtherMap := queryFollow(start_unix, end_unix)
 
-	CommitCodeSizeMap, err := GetAllUserKPIStats()
+	CommitCodeSizeMap, err := GetAllUserKPIStats(startTime, endTime)
 	if err != nil {
 		log.Info("query commit code errr.")
 	} else {

modules/git/repo_stats_custom.go

@@ -58,12 +58,11 @@ func SetDevelopAge(repoPath string, stats *RepoKPIStats, fromTime time.Time) err
 	return nil
 }
 
-//获取一天内的用户贡献指标
-func GetUserKPIStats(repoPath string) (map[string]*UserKPIStats, error) {
-	timeUntil := time.Now()
-	oneDayAgo := timeUntil.AddDate(0, 0, -1)
-	since := oneDayAgo.Format(time.RFC3339)
-	args := []string{"log", "--numstat", "--no-merges", "--branches=*", "--pretty=format:---%n%h%n%an%n%ae%n", "--date=iso", fmt.Sprintf("--since='%s'", since)}
+func GetUserKPIStats(repoPath string, startTime time.Time, endTime time.Time) (map[string]*UserKPIStats, error) {
+
+	after := startTime.Format(time.RFC3339)
+	until := endTime.Format(time.RFC3339)
+	args := []string{"log", "--numstat", "--no-merges", "--branches=*", "--pretty=format:---%n%h%n%an%n%ae%n", "--date=iso", fmt.Sprintf("--after='%s'", after), fmt.Sprintf("--until=='%s'", until)}
 	stdout, err := NewCommand(args...).RunInDirBytes(repoPath)
 	if err != nil {
 		return nil, err
@@ -124,6 +123,14 @@ func GetUserKPIStats(repoPath string) (map[string]*UserKPIStats, error) {
 
 }
 
+//获取一天内的用户贡献指标
+func getUserKPIStats(repoPath string) (map[string]*UserKPIStats, error) {
+	timeUntil := time.Now()
+	oneDayAgo := timeUntil.AddDate(0, 0, -1)
+
+	return GetUserKPIStats(repoPath, oneDayAgo, oneDayAgo)
+}
+
 func SetRepoKPIStats(repoPath string, fromTime time.Time, stats *RepoKPIStats, newContributers map[string]struct{}) error {
 	since := fromTime.Format(time.RFC3339)
 	args := []string{"log", "--numstat", "--no-merges", "HEAD", "--pretty=format:---%n%h%n%an%n%ae%n", "--date=iso", fmt.Sprintf("--since='%s'", since)}