fix: edit agent_base/list

desc/wechat/agent.api

@@ -219,7 +219,7 @@ type (
 
 	// Get collection list request params | Collection列表请求参数
 	DataListReq {
-		PageNum   *int    `json:"page" validate:"required,number,gt=0"`
+		Page   *int    `json:"page" validate:"required,number,gt=0"`
 
 		PageSize  *int    `json:"pageSize" validate:"required,number,lt=100000"`
 
@@ -231,13 +231,14 @@ type (
 		BaseDataInfo
 
 		// Agent information | Agent数据
-		Data []DataSimpleInfo `json:"data"`
+		Data BatchSimpleInfo `json:"data"`
+	}
 
-		PageNum   *int    `json:"pageNum" validate:"required,number,gt=0"`
+	BatchSimpleInfo {
+		BaseListInfo
 
-		PageSize  *int    `json:"pageSize" validate:"required,number,lt=100000"`
-
-		Total     *int    `json:"total"`
+		// The API list data | BatchMsg列表数据
+		Data  []DataSimpleInfo  `json:"data"`
 	}
 
 	// Data create request | 信息请求体

internal/logic/agent/get_agent_data_list_logic.go

@@ -26,24 +26,21 @@ func NewGetAgentDataListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 
 func (l *GetAgentDataListLogic) GetAgentDataList(req *types.DataListReq) (*types.DataListResp, error) {
 	dataResp := types.DataListResp{}
-	dataResp.PageNum = req.PageNum
-	dataResp.PageSize = req.PageSize
-	var total int
 
 	var params fastgpt.GetDataListReq
 	params.CollectionId = *req.CollectionId
 	params.PageSize = *req.PageSize
-	params.PageNum = *req.PageNum
+	params.PageNum = *req.Page
 	resp, err := fastgpt.GetDataList(&params)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get data list failed " + err.Error())
 	}
 
-	dataResp.Data = make([]types.DataSimpleInfo, 0, 1)
-	dataResp.Total = &total
+	dataResp.Data = types.BatchSimpleInfo{}
+	dataResp.Data.Total = uint64(resp.Data.Total)
 	if resp.Code == 200 && resp.Data.Total > 0 {
 		for _, val := range resp.Data.Data {
-			dataResp.Data = append(dataResp.Data, types.DataSimpleInfo{
+			dataResp.Data.Data = append(dataResp.Data.Data, types.DataSimpleInfo{
 				ID:           &val.ID,
 				Q:            &val.Q,
 				A:            &val.A,
@@ -52,7 +49,6 @@ func (l *GetAgentDataListLogic) GetAgentDataList(req *types.DataListReq) (*types
 				CollectionId: &val.CollectionID,
 			})
 		}
-		dataResp.Total = &resp.Data.Total
 	}
 
 	return &dataResp, nil

internal/logic/agent_base/get_agent_base_list_logic.go

@@ -26,24 +26,21 @@ func NewGetAgentBaseListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 
 func (l *GetAgentBaseListLogic) GetAgentBaseList(req *types.DataListReq) (*types.DataListResp, error) {
 	dataResp := types.DataListResp{}
-	dataResp.PageNum = req.PageNum
-	dataResp.PageSize = req.PageSize
-	var total int
 
 	var params fastgpt.GetDataListReq
 	params.CollectionId = *req.CollectionId
 	params.PageSize = *req.PageSize
-	params.PageNum = *req.PageNum
+	params.PageNum = *req.Page
 	resp, err := fastgpt.GetDataList(&params)
 	if err != nil {
 		return nil, errorx.NewInvalidArgumentError("fastgpt get data list failed " + err.Error())
 	}
 
-	dataResp.Data = make([]types.DataSimpleInfo, 0, 1)
-	dataResp.Total = &total
+	dataResp.Data = types.BatchSimpleInfo{}
+	dataResp.Data.Total = uint64(resp.Data.Total)
 	if resp.Code == 200 && resp.Data.Total > 0 {
 		for _, val := range resp.Data.Data {
-			dataResp.Data = append(dataResp.Data, types.DataSimpleInfo{
+			dataResp.Data.Data = append(dataResp.Data.Data, types.DataSimpleInfo{
 				ID:           &val.ID,
 				Q:            &val.Q,
 				A:            &val.A,
@@ -52,7 +49,6 @@ func (l *GetAgentBaseListLogic) GetAgentBaseList(req *types.DataListReq) (*types
 				CollectionId: &val.CollectionID,
 			})
 		}
-		dataResp.Total = &resp.Data.Total
 	}
 
 	return &dataResp, nil

internal/types/types.go

@@ -647,7 +647,7 @@ type CollectionListResp struct {
 type DataListReq struct {
 	// required : true
 	// min : 0
-	PageNum *int `json:"page" validate:"required,number,gt=0"`
+	Page *int `json:"page" validate:"required,number,gt=0"`
 	// required : true
 	// max : 100000
 	PageSize *int `json:"pageSize" validate:"required,number,lt=100000"`
@@ -660,14 +660,14 @@ type DataListReq struct {
 type DataListResp struct {
 	BaseDataInfo
 	// Agent information | Agent数据
+	Data BatchSimpleInfo `json:"data"`
+}
+
+// swagger:model BatchSimpleInfo
+type BatchSimpleInfo struct {
+	BaseListInfo
+	// The API list data | BatchMsg列表数据
 	Data []DataSimpleInfo `json:"data"`
-	// required : true
-	// min : 0
-	PageNum *int `json:"pageNum" validate:"required,number,gt=0"`
-	// required : true
-	// max : 100000
-	PageSize *int `json:"pageSize" validate:"required,number,lt=100000"`
-	Total    *int `json:"total"`
 }
 
 // Data create request | 信息请求体