Merge branch 'feature/v1.0.2' of https://jygit.jydev.jianyu360.cn/SocialPlatform/aiChat into feature/v1.0.2

api/aiSearch/v1/aiSearchApi.go

@@ -7,9 +7,9 @@ type CreateNewSessionReq struct {
 }
 
 type CreateNewSessionRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
 }
 
 type LikeAnswerReq struct {
@@ -23,15 +23,20 @@ type LikeAnswerRes struct {
 	ErrorMsg  string      `dc:"错误信息"`
 	Data      interface{} `dc:"返回数据"`
 }
+type LikeSessionRes struct {
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
+}
 
 type HistorySsListReq struct {
 	g.Meta `path:"/session/history/list" tags:"AiSearch" method:"get" summary:"历史会话列表"`
 }
 
 type HistorySsListRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
 }
 
 type SessionDetailReq struct {
@@ -40,9 +45,9 @@ type SessionDetailReq struct {
 }
 
 type SessionDetailRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
 }
 
 type ProblemConfigurationReq struct {
@@ -50,14 +55,15 @@ type ProblemConfigurationReq struct {
 }
 
 type ProblemConfigurationRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
 }
 
 type ChatReq struct {
 	g.Meta   `path:"/chat" tags:"AiSearch" method:"post" summary:"聊天"`
 	SId      string `json:"sId" v:"required" dc:"当前会话id"`
+	Content  string `json:"content" v:"required" dc:"用户发送内容"`
 	Question string `json:"question" v:"required" dc:"用户发送内容"`
 	Item     int    `json:"item" v:"required" dc:"分类"`
 }
@@ -73,9 +79,9 @@ type BiddingListReq struct {
 	ChatId string `json:"chatId" dc:"聊天Id"`
 }
 type BiddingListRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
+	ErrorCode int         `json:"errorCode"     dc:"状态码"`
+	ErrorMsg  string      `json:"errorMsg"    dc:"错误信息"`
+	Data      interface{} `json:"data" dc:"返回数据"`
 }
 type ResBidding struct {
 	InfoId      string `json:"infoId" dc:"标讯id"`

internal/controller/aiSearch/aiSearch_v1_bidding_list.go

@@ -3,6 +3,7 @@ package aiSearch
 import (
 	"aiChat/api/aiSearch/v1"
 	"aiChat/internal/model"
+	"aiChat/utility"
 	"context"
 	"fmt"
 
@@ -27,10 +28,13 @@ func (c *ControllerV1) BiddingList(ctx context.Context, req *v1.BiddingListReq)
 	}
 	err = g.Model("ai_search_bidding").Where("chat_id = ? and  position_id=?", chatId, session.PositionId).OrderDesc("create_time").Scan(&hTmp)
 	if hTmp != nil && len(hTmp) > 0 {
+		collection := utility.GetMyBidCollect(ctx, session.PositionId)
 		for i := len(hTmp) - 1; i >= 0; i-- {
 			data := hTmp[i]
 			data.InfoId = encrypt.EncodeArticleId2ByCheck(data.InfoId)
-			hTmp[i] = data
+			if collection[data.InfoId] {
+				data.Collect = 1
+			}
 		}
 	}
 	return &v1.BiddingListRes{