feat: 增加文本搜索条件

Author: oldme-git

api/sentence/v1/sentence.go

@@ -48,8 +48,9 @@ type DelRes struct {
 type ListReq struct {
 	g.Meta `path:"sentence/list" method:"get" sm:"查询列表" tags:"句子"`
 	*model.Paging
-	BookId model.Id   `json:"book_id" dc:"和tag_ids二选一"`
-	TagIds []model.Id `json:"tag_ids" dc:"和book_id二选一"`
+	BookId model.Id   `json:"book_id" dc:"书籍id"`
+	TagIds []model.Id `json:"tag_ids" dc:"标签id"`
+	Search string     `json:"search"  dc:"搜索文本"`
 }
 
 type ListRes struct {

internal/controller/sentence/sentence_v1_list.go

@@ -23,9 +23,9 @@ func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListR
 		total uint
 	)
 	if len(req.TagIds) > 0 {
-		data, total, err = listByTagIds(ctx, req)
+		data, total, err = c.listByTagIds(ctx, req)
 	} else {
-		data, total, err = listByBookId(ctx, req)
+		data, total, err = c.listByBookId(ctx, req)
 	}
 
 	if err != nil {
@@ -46,7 +46,7 @@ func (c *ControllerV1) List(ctx context.Context, req *v1.ListReq) (res *v1.ListR
 	}, nil
 }
 
-func listByTagIds(ctx context.Context, req *v1.ListReq) (data []entity.Sentence, total uint, err error) {
+func (c *ControllerV1) listByTagIds(ctx context.Context, req *v1.ListReq) (data []entity.Sentence, total uint, err error) {
 	var ids []model.Id
 	ids, total, err = sentence.GetIdsByTagIds(ctx, req.TagIds, *req.Paging)
 	if err != nil {
@@ -65,7 +65,7 @@ func listByTagIds(ctx context.Context, req *v1.ListReq) (data []entity.Sentence,
 	return
 }
 
-func listByBookId(ctx context.Context, req *v1.ListReq) (data []entity.Sentence, total uint, err error) {
+func (c *ControllerV1) listByBookId(ctx context.Context, req *v1.ListReq) (data []entity.Sentence, total uint, err error) {
 	query := &model.SentenceQuery{
 		Paging: *req.Paging,
 		BookId: req.BookId,
@@ -74,3 +74,13 @@ func listByBookId(ctx context.Context, req *v1.ListReq) (data []entity.Sentence,
 	data, total, err = sentence.List(ctx, query)
 	return
 }
+
+func (c *ControllerV1) listBySearch(ctx context.Context, req *v1.ListReq) (data []entity.Sentence, total uint, err error) {
+	query := &model.SentenceQuery{
+		Paging: *req.Paging,
+		Search: req.Search,
+	}
+
+	data, total, err = sentence.List(ctx, query)
+	return
+}

internal/logic/sentence/sentence.go

@@ -120,6 +120,9 @@ func List(ctx context.Context, query *model.SentenceQuery) (list []entity.Senten
 	if len(query.Ids) > 0 {
 		db = db.WhereIn("id", query.Ids)
 	}
+	if query.Search != "" {
+		db = db.Where("sentence like ?", "%"+query.Search+"%")
+	}
 	data, totalInt, err := db.Page(query.Page, query.Size).AllAndCount(true)
 
 	if err != nil {

internal/model/sentence.go

@@ -4,7 +4,8 @@ type SentenceQuery struct {
 	Paging
 	BookId Id
 	// 根据指定id查询
-	Ids []Id
+	Ids    []Id
+	Search string
 }
 
 type SentenceInput struct {