wangchuanjin 5 ماه پیش
والد
کامیت
6d5cf40fb2
2فایلهای تغییر یافته به همراه23 افزوده شده و 25 حذف شده
  1. 14 16
      api/aiSearch/v1/aiSearchApi.go
  2. 9 9
      internal/controller/aiSearch/aiSearch_v1_chat.go

+ 14 - 16
api/aiSearch/v1/aiSearchApi.go

@@ -63,7 +63,7 @@ type ChatReq struct {
 }
 
 type ChatRes struct {
-	Status int           `json:"status" dc:"状态;0:服务器繁忙 1:成功"`
+	Status int           `json:"status" dc:"状态;0:服务器繁忙 1:成功"`
 	Count  int           `json:"count" dc:"列表长度"`
 	List   []*ResBidding `json:"list" dc:"答案列表"`
 }
@@ -78,19 +78,17 @@ type BiddingListRes struct {
 	Data      interface{} `dc:"返回数据"`
 }
 type ResBidding struct {
-	InfoId        string `json:"infoId" dc:"内容"`
-	Id            string `json:"id" dc:""`
-	Title         string `json:"title" dc:"标题"`
-	Area          string `json:"area" dc:"地区"`
-	City          string `json:"city" dc:"地区"`
-	District      string `json:"district" dc:"地区"`
-	Subtype       string `json:"subtype" dc:"信息类型"`
-	Industry      string `json:"industry" dc:"信息行业"`
-	Annex         int    `json:"annex" dc:"是否有附件;0:否 1:是"`
-	Subscopeclass string `json:"subscopeclass" dc:"信息行业"`
-	Buyerclass    string `json:"buyerclass" dc:"采购单位行业"`
-	Budget        int64  `json:"budget" dc:"预算"`
-	Bidamount     int64  `json:"bidamount" dc:"中标金额"`
-	Publishtime   int64  `json:"publishtime" dc:"发布时间"`
-	Collect       int    `json:"collect" dc:"是否收藏;0:否 1:是"`
+	InfoId      string `json:"infoId" dc:"标讯id"`
+	Title       string `json:"title" dc:"标题"`
+	Area        string `json:"area" dc:"省份"`
+	City        string `json:"city" dc:"城市"`
+	District    string `json:"district" dc:"区县"`
+	Subtype     string `json:"subtype" dc:"信息类型"`
+	Industry    string `json:"industry" dc:"信息行业"`
+	Annex       int    `json:"annex" dc:"是否有附件;0:否 1:是"`
+	Buyerclass  string `json:"buyerclass" dc:"采购单位行业"`
+	Budget      int64  `json:"budget" dc:"预算"`
+	Bidamount   int64  `json:"bidamount" dc:"中标金额"`
+	Publishtime int64  `json:"publishtime" dc:"发布时间"`
+	Collect     int    `json:"collect" dc:"是否收藏;0:否 1:是"`
 }

+ 9 - 9
internal/controller/aiSearch/aiSearch_v1_chat.go

@@ -32,9 +32,9 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 		return
 	}
 	startTime := gtime.Now().Format("Y-m-d h:m:s.u")
-	success := 0
+	answerStatus := 0
 	prompt := fmt.Sprintf(g.Cfg("ai_search.yaml").MustGet(ctx, "doubaoPrompt").String(), gtime.Now().Format("Ymd"), req.Question)
-	large_model := "doubao"
+	largeModel := "doubao"
 	callLogs := g.List{}
 	content, largeModelReply, err, isLimit := c.doubao(ctx, prompt)
 	if !isLimit {
@@ -46,7 +46,7 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 		}
 		callLogs = append(callLogs, g.Map{
 			"position_id":           sess.PositionId,
-			"large_model":           large_model,
+			"large_model":           largeModel,
 			"large_model_reply":     largeModelReply,
 			"large_model_starttime": startTime,
 			"large_model_endtime":   gtime.Now().Format("Y-m-d h:m:s.u"),
@@ -57,7 +57,7 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 	if isLimit || err != nil {
 		prompt = fmt.Sprintf(g.Cfg("ai_search.yaml").MustGet(ctx, "zhipuPrompt").String(), gtime.Now().Format("Ymd"), req.Question)
 		content, largeModelReply, err, _ = c.zhipu(ctx, prompt)
-		large_model = "zhipu"
+		largeModel = "zhipu"
 		large_model_success := 1
 		error_msg := ""
 		if err != nil {
@@ -66,7 +66,7 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 		}
 		callLogs = append(callLogs, g.Map{
 			"position_id":           sess.PositionId,
-			"large_model":           large_model,
+			"large_model":           largeModel,
 			"large_model_reply":     largeModelReply,
 			"large_model_starttime": startTime,
 			"large_model_endtime":   gtime.Now().Format("Y-m-d h:m:s.u"),
@@ -76,9 +76,9 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 	}
 	large_model_endtime := gtime.Now().Format("Y-m-d h:m:s.u")
 	if err == nil {
-		success = 1
+		answerStatus = 1
 	} else {
-		large_model = ""
+		largeModel = ""
 	}
 	bs, bsErr := bidSearch.NewBidSearch(ctx, sess.PersonId, content)
 	if bsErr != nil {
@@ -113,12 +113,12 @@ func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatR
 			"starttime":           startTime,
 			"large_model_endtime": large_model_endtime,
 			"endtime":             gtime.Now().Format("Y-m-d h:m:s.u"),
-			"success":             success,
 			"es_query":            query,
 			"list_count":          len(list),
 			"session_id":          sid,
 			"status":              1,
-			"large_model":         large_model,
+			"large_model":         largeModel,
+			"answer_status":       answerStatus,
 			"create_time":         gtime.Datetime(),
 		})
 		if chatErr != nil {