<feat>(practice):总人数答题情况;<fix>(practice,test):点赞，最热最新，top重复问题

Author: luohuixi

circle/api.md

@@ -1012,8 +1012,9 @@ POST
 
 Body：JSON
 
-| circle | 圈子（有两个推荐，一个要circle,如果不用则不需要这个数据） |
-| ------ | --------------------------------------------------------- |
+| circle    | 圈子（有两个推荐，一个要circle,如果不用则不需要这个数据） |
+| --------- | --------------------------------------------------------- |
+| page(int) | 请求次数                                                  |
 
 Response：JSON
 
@@ -1043,8 +1044,9 @@ POST
 
 Body：JSON
 
-| circle | 圈子（有两个推荐，一个要circle,如果不用则不需要这个数据） |
-| ------ | --------------------------------------------------------- |
+| circle    | 圈子（有两个推荐，一个要circle,如果不用则不需要这个数据） |
+| --------- | --------------------------------------------------------- |
+| page(int) | 请求次数                                                  |
 
 Response：JSON
 
@@ -1370,4 +1372,28 @@ Response：JSON
 }
 ```
 
-# 七牛云token：0bNiwJGpdwmvvuVAzLDjM6gnxj9MiwmSagVpIW81:85DTubmQkSKtCyWaL5KoaucrQKU=:eyJkZWFkbGluZSI6MTczODU3NjI0MCwic2NvcGUiOiJtdXhpLW1pbmlwcm9qZWN0In0=
+
+
+## 新增
+
+###  /practice/getpracticesituation
+
+POST   
+
+Body：JSON
+
+| practiceid | 练习id |
+| ---------- | ------ |
+
+Response：JSON
+
+```json
+{
+    "message": {
+        "Practiceid": 1,
+        "Peoplenum": 4,
+        "Correctnum": 2
+    }
+}
+```
+

circle/controllers/practice_contorllers.go

@@ -143,4 +143,13 @@ func (uc *PracticeControllers) Showlovepractice(c *gin.Context) {
 	n,_:=name.(string)
 	message:=uc.us.Showlovepractice(n,get)
 	c.JSON(200, gin.H{"message":message})
+}
+func (uc *PracticeControllers) GetPracticeSituation(c *gin.Context) {
+	var get request.GetPractice
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(400, gin.H{"error": "无效的参数"})
+		return
+	}
+	message:=uc.us.GetPracticeSituation(get)
+	c.JSON(200, gin.H{"message":message})
 }

circle/dao/practice_dao.go

@@ -139,3 +139,27 @@ func (ud *PracticeDao) GetIdByUser(name string) (int, error) {
 	err := database.DB.Model(&models.User{}).Where("name = ?", name).Select("id").First(&id).Error
 	return id, err
 }
+func (ud *PracticeDao) CreatePracticeSituation(practiceid int) error {
+	practicesituation:= models.PracticeSituation{
+		Practiceid: practiceid,
+		Peoplenum: 0,
+		Correctnum: 0,
+	}
+	err := database.DB.Create(&practicesituation).Error
+	if err != nil {
+		return fmt.Errorf("创建失败: %w", err)
+	}
+	return nil
+}
+func (ud *PracticeDao) GetPracticeSituation(practiceid int) (models.PracticeSituation) {
+	var practicesituation models.PracticeSituation
+	_ = database.DB.Where("practiceid = ?", practiceid).First(&practicesituation)
+	return practicesituation
+}
+func (ud *PracticeDao) UpdatePracticeSituation(practicesituation *models.PracticeSituation,practiceid int) error {
+	err := database.DB.Where("practiceid = ?" ,practiceid).Save(practicesituation).Error
+	if err != nil {
+		return fmt.Errorf("更新练习记录失败: %w", err)
+	}
+	return nil
+}

circle/dao/search_dao.go

@@ -21,11 +21,15 @@ func (ud *SearchDao) SearchTest(testkey string) ([]models.Test) {
 	return test
 }
 func (ud *SearchDao) SearchHistory(searchkey string,userid int)  {
-	searchhistory:=models.SearchHistory{
-		SearchKey:searchkey,
-		Userid:userid,
+	var originalhistory models.SearchHistory
+	err:=database.DB.Where("search_key = ?", searchkey).Where("userid = ?", userid).First(&originalhistory).Error
+	if err == gorm.ErrRecordNotFound {
+	    searchhistory:=models.SearchHistory{
+		    SearchKey:searchkey,
+		    Userid:userid,
+	    }
+		database.DB.Create(&searchhistory)
 	}
-	database.DB.Create(&searchhistory)
 }
 func (ud *SearchDao) ShowSearchHistory(userid int) ([]models.SearchHistory){
 	var searchhistory []models.SearchHistory

circle/dao/test_dao.go

@@ -70,9 +70,22 @@ func (ud *TestDao) GetTestOptionsByPracticeID(practiceid int) ([]models.TestOpti
 	return options, nil
 }
 func (ud *TestDao) SaveTopRecord(top models.Top) error {
-	err := database.DB.Create(&top).Error
-	if err != nil {
-		return fmt.Errorf("保存成绩记录失败: %w", err)
+	var origintop models.Top
+	err:= database.DB.Where("testid = ? and userid = ?", top.Testid, top.Userid).First(&origintop).Error
+	if err == gorm.ErrRecordNotFound {
+	    err := database.DB.Create(&top).Error
+	    if err != nil {
+		    return fmt.Errorf("保存成绩记录失败: %w", err)
+	    }
+		return nil
+	}else if err != nil {
+		return fmt.Errorf("获取成绩记录失败: %w", err)
+	}
+	if err==nil&&origintop.Correctnum < top.Correctnum {
+		err := database.DB.Model(&origintop).Updates(models.Top{Correctnum: top.Correctnum, Time: top.Time}).Error
+		if err != nil {
+			return fmt.Errorf("更新成绩记录失败: %w", err)
+		}
 	}
 	return nil
 }
@@ -114,21 +127,23 @@ func (ud *TestDao) RecommentTest(circle string) ([]models.Test){
 	}
 	return test
 }
-func (ud *TestDao) HotTest(circle string) ([]models.Test){
+func (ud *TestDao) HotTest(circle string,page int) ([]models.Test){
 	var test []models.Test
+	offset := (page-1)*6
 	if circle=="" {
-		_= database.DB.Order("good desc").Limit(6).Find(&test).Error
+		_= database.DB.Order("good desc").Offset(offset).Limit(6).Find(&test).Error
 	}else{
-		_= database.DB.Where("circle = ?", circle).Order("good desc").Limit(6).Find(&test).Error
+		_= database.DB.Where("circle = ?", circle).Order("good desc").Offset(offset).Limit(6).Find(&test).Error
 	}
 	return test
 }
-func (ud *TestDao) NewTest(circle string) ([]models.Test){
+func (ud *TestDao) NewTest(circle string,page int) ([]models.Test){
 	var test []models.Test
+	offset := (page-1)*6
 	if circle=="" {
-		_= database.DB.Order("createtime desc").Limit(6).Find(&test).Error
+		_= database.DB.Order("createtime desc").Offset(offset).Limit(6).Find(&test).Error
 	}else{
-		_= database.DB.Where("circle = ?", circle).Order("createtime desc").Limit(6).Find(&test).Error
+		_= database.DB.Where("circle = ?", circle).Order("createtime desc").Offset(offset).Limit(6).Find(&test).Error
 	}
 	return test
 }
@@ -138,7 +153,7 @@ func (ud *TestDao) FollowCircleTest(userid int) ([]models.Test){
 	var circlename []string
 	_= database.DB.Model(&models.FollowCircle{}).Where("userid = ?", userid).Pluck("circleid", &circleid).Error //pluck表示查询单个数据
 	_= database.DB.Model(&models.Circle{}).Where("id in (?)", circleid).Pluck("name", &circlename).Error
-	_= database.DB.Where("circle in (?)", circlename).Order("RAND()").Limit(10).Find(&test).Error  //in表示查询多个数据
+	_= database.DB.Where("circle in (?)", circlename).Order("RAND()").Limit(6).Find(&test).Error  //in表示查询多个数据
 	return test
 }
 func (ud *TestDao) GetIdByUser(name string) (int, error) {

circle/database/database.go

@@ -80,6 +80,7 @@ func InitDB() {
 		&models.Circle{},
 		&models.FollowCircle{},
 		&models.SearchHistory{},
+		&models.PracticeSituation{},
 	); err != nil {
 		log.Fatalf("自动迁移失败: %v", err)
 	}

circle/models/practice_models.go

@@ -39,3 +39,8 @@ type UserPractice struct {
 	Alltime int
 	Circle string
 }
+type PracticeSituation struct {
+	Practiceid int `gorm:"index:idx_practiceid"`
+	Peoplenum int
+	Correctnum int
+}

circle/request/test_request.go

@@ -30,4 +30,5 @@ type Commenttest struct{
 }
 type GetCircle struct{
 	Circle string `json:"circle"`
+	Page int `json:"page"`
 }

circle/routes/practice_routes.go

@@ -24,5 +24,6 @@ func RunPractice(db *gorm.DB,r *gin.Engine){
 		practice.POST("/lovepractice", uc.Lovepractice)
 		practice.POST("/unlovepractice", uc.Unlovepractice)
 		practice.POST("/showlovepractice", uc.Showlovepractice)
+		practice.POST("/getpracticesituation", uc.GetPracticeSituation)
 	}
 }

circle/service/practice_service.go

@@ -33,6 +33,7 @@ func (us *PracticeServices) Createpractice(name string,practice request.Practice
 	if err != nil {
 		return -1
 	}
+	_=us.ud.CreatePracticeSituation(practices.Practiceid)
 	return practices.Practiceid
 }
 func (us *PracticeServices) Createoption(option request.Option) string {
@@ -82,15 +83,22 @@ func (us *PracticeServices) CheckAnswer(name string,get request.CheckAnswer) str
 	if err != nil {
 		return "用户不存在"
 	}
+	practicesituation:=us.ud.GetPracticeSituation(get.Practiceid)
+	practicesituation.Peoplenum++
 	userpractice, err := us.ud.GetUserPracticeByUserID(user.Id, get.Circle)
 	if err != nil {
 		return "用户练习记录不存在"
 	}
 	userpractice.Alltime += get.Time
 	userpractice.Practicenum++
 	if get.Answer == "true" {
+		practicesituation.Correctnum++
 		userpractice.Correctnum++
 	}
+	err = us.ud.UpdatePracticeSituation(&practicesituation, get.Practiceid)
+	if err != nil {
+		return err.Error()
+	}
 	err = us.ud.UpdateUserPractice(userpractice)
 	if err != nil {
 		return "更新练习记录失败"
@@ -143,12 +151,16 @@ func (us *PracticeServices) Unlovepractice(name string,get request.GetPractice)
 func (us *PracticeServices) Showlovepractice(name string,get request.GetPractice) string {
 	userID, _:=us.ud.GetIdByUser(name)
 	practiceid:=fmt.Sprintf("%d", get.Practiceid)
-	count,err := database.Rdb.SAdd("practicelikes:"+practiceid, userID).Result()
+	count,err := database.Rdb.SIsMember("practicelikes:"+practiceid, userID).Result()
 	if err != nil {
 		return "查看是否点赞失败"
 	}
-	if count == 0 {
+	if count  {
 		return "已经点过赞"
 	}
 	return "没有点过赞"
-}
+}
+func (us *PracticeServices) GetPracticeSituation(get request.GetPractice) models.PracticeSituation {
+	practicesituation:= us.ud.GetPracticeSituation(get.Practiceid)
+	return practicesituation
+}