Merge branch 'dev_v1.0.2_wh' of SocialPlatform/aiChat into feature/v1.0.2

api/aiSearch/aiSearch.go

@@ -15,8 +15,7 @@ type IAiSearchV1 interface {
 	LikeSession(ctx context.Context, req *v1.LikeSessionReq) (res *v1.LikeSessionRes, err error)
 	HistorySsList(ctx context.Context, req *v1.HistorySsListReq) (res *v1.HistorySsListRes, err error)
 	SessionDetail(ctx context.Context, req *v1.SessionDetailReq) (res *v1.SessionDetailRes, err error)
-	ProblemDelete(ctx context.Context, req *v1.ProblemDeleteReq) (res *v1.ProblemDeleteRes, err error)
-	ProblemList(ctx context.Context, req *v1.ProblemListReq) (res *v1.ProblemListRes, err error)
 	ProblemConfiguration(ctx context.Context, req *v1.ProblemConfigurationReq) (res *v1.ProblemConfigurationRes, err error)
 	Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatRes, err error)
+	BiddingList(ctx context.Context, req *v1.BiddingListReq) (res *v1.BiddingListRes, err error)
 }

api/aiSearch/v1/aiSearchApi.go

@@ -43,24 +43,7 @@ type SessionDetailRes struct {
 	ErrorMsg  string      `dc:"错误信息"`
 	Data      interface{} `dc:"返回数据"`
 }
-type ProblemDeleteReq struct {
-	g.Meta `path:"/problem/delete" tags:"AiSearch" method:"post" summary:"问题删除"`
-}
 
-type ProblemDeleteRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
-}
-type ProblemListReq struct {
-	g.Meta `path:"/problem/list" tags:"AiSearch" method:"post" summary:"问题列表"`
-}
-
-type ProblemListRes struct {
-	ErrorCode int         `dc:"状态码"`
-	ErrorMsg  string      `dc:"错误信息"`
-	Data      interface{} `dc:"返回数据"`
-}
 type ProblemConfigurationReq struct {
 	g.Meta `path:"/problem/configuration" tags:"AiSearch" method:"post" summary:"问题配置"`
 }
@@ -70,6 +53,7 @@ type ProblemConfigurationRes struct {
 	ErrorMsg  string      `dc:"错误信息"`
 	Data      interface{} `dc:"返回数据"`
 }
+
 type ChatReq struct {
 	g.Meta  `path:"/chat" tags:"AiSearch" method:"post" summary:"聊天"`
 	SId     int    `json:"sId" v:"required" dc:"当前会话id"`
@@ -81,3 +65,13 @@ type ChatRes struct {
 	ErrorMsg  string      `dc:"错误信息"`
 	Data      interface{} `dc:"返回数据"`
 }
+
+type BiddingListReq struct {
+	g.Meta `path:"/bidding/List" tags:"AiSearch" method:"post" summary:"报讯列表"`
+	ChatId int64 `json:"chatId" dc:"聊天Id"`
+}
+type BiddingListRes struct {
+	ErrorCode int         `dc:"状态码"`
+	ErrorMsg  string      `dc:"错误信息"`
+	Data      interface{} `dc:"返回数据"`
+}

internal/controller/aiSearch/aiSearch_v1_bidding_list.go

@@ -0,0 +1,46 @@
+package aiSearch
+
+import (
+	"aiChat/api/aiSearch/v1"
+	"aiChat/internal/model"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+func (c *ControllerV1) BiddingList(ctx context.Context, req *v1.BiddingListReq) (res *v1.BiddingListRes, err error) {
+	var hTmp []ResBidding
+	session := model.SessionCtx.Get(ctx).JSession
+	if session.PositionId <= 0 {
+		return nil, fmt.Errorf("请登录")
+	}
+	err = g.Model("ai_search_bidding").Where("chat_id = ? and  position_id=?", req.ChatId, session.PositionId).OrderDesc("create_time").Scan(&hTmp)
+	if hTmp != nil && len(hTmp) > 0 {
+		for i := len(hTmp) - 1; i >= 0; i-- {
+			data := hTmp[i]
+			data.InfoId = encrypt.EncodeArticleId2ByCheck(data.InfoId)
+			hTmp[i] = data
+		}
+	}
+	return &v1.BiddingListRes{
+		ErrorCode: 0,
+		ErrorMsg:  "",
+		Data:      hTmp,
+	}, nil
+}
+
+type ResBidding struct {
+	InfoId        string  `json:"infoId" dc:"内容"`
+	Id            string  `json:"id" dc:"信息加密id"`
+	Title         string  `json:"title" dc:"内容"`
+	Area          string  `json:"area" dc:"内容"`
+	Subtype       string  `json:"subtype" dc:"内容"`
+	Annex         string  `json:"annex" dc:"内容"`
+	Subscopeclass string  `json:"subscopeclass" dc:"内容"`
+	Buyerclass    string  `json:"buyerclass" dc:"内容"`
+	Budget        float64 `json:"budget" dc:"内容"`
+	Bidanount     float64 `json:"bidanount" dc:"内容"`
+	Publishtime   string  `json:"publishtime" dc:"内容"`
+	Create_time   string  `json:"create_time" dc:"内容"`
+}

internal/controller/aiSearch/aiSearch_v1_problem_configuration.go

@@ -2,13 +2,14 @@ package aiSearch
 
 import (
 	"context"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"aiChat/api/aiSearch/v1"
 )
 
 func (c *ControllerV1) ProblemConfiguration(ctx context.Context, req *v1.ProblemConfigurationReq) (res *v1.ProblemConfigurationRes, err error) {
-	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+	return &v1.ProblemConfigurationRes{
+		Data: gconv.Maps(g.Cfg("./manifest/config/ai_search.yaml").MustGet(ctx, "initConifg")),
+	}, nil
 }

internal/controller/aiSearch/aiSearch_v1_problem_delete.go

@@ -1,14 +0,0 @@
-package aiSearch
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-
-	"aiChat/api/aiSearch/v1"
-)
-
-func (c *ControllerV1) ProblemDelete(ctx context.Context, req *v1.ProblemDeleteReq) (res *v1.ProblemDeleteRes, err error) {
-	return nil, gerror.NewCode(gcode.CodeNotImplemented)
-}

internal/controller/aiSearch/aiSearch_v1_problem_list.go

@@ -1,14 +0,0 @@
-package aiSearch
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-
-	"aiChat/api/aiSearch/v1"
-)
-
-func (c *ControllerV1) ProblemList(ctx context.Context, req *v1.ProblemListReq) (res *v1.ProblemListRes, err error) {
-	return nil, gerror.NewCode(gcode.CodeNotImplemented)
-}

main.go

@@ -5,10 +5,9 @@ import (
 	_ "aiChat/utility"
 	"aiChat/utility/fsw"
 
-	"github.com/gogf/gf/v2/os/gctx"
-
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	_ "github.com/gogf/gf/contrib/nosql/redis/v2"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {

manifest/config/ai_search.yaml

@@ -1,3 +1,16 @@
+initConifg:
+  - goodsName: 看标讯
+    goodsType: 1
+    isUsed: true
+  - goodsName: 看项目
+    goodsType: 2
+    isUsed: false
+  - goodsName: 看企业
+    goodsType: 3
+    isUsed: false
+  - goodsName: 看市场
+    goodsType: 4
+    isUsed: false
 aaa: 111
 timeout: 30000
 doubaoCallMax: 100