3.1收藏

common/component/es/es.go

@@ -443,11 +443,6 @@ func (req *ESQueryRequest) parseJsonQuery() (queryMap map[string]interface{}) {
 			"post_filter": map[string]interface{}{
 				"bool": map[string]interface{}{
 					"must": []map[string]interface{}{
-						{
-							"term": map[string]interface{}{
-								req.Condition: req.ConditionValue,
-							},
-						},
 						{
 							"terms": map[string]interface{}{
 								"_id": req.DocIds,

common/exception/exc_enums.go

@@ -170,6 +170,7 @@ const (
 const (
 	BookMarkErrCode int = iota + 120000 // iota 自动递增，从 1 开始
 	IllegalSourceType
+	IllegalSearchKeyword
 	IllegalSourceId
 	BookMarkFailed
 	BookMarkListFailed
@@ -291,10 +292,11 @@ var ErrorMap = map[int]string{
 	RefundDealFail:           "处理退款应答失败",
 
 	//收藏
-	IllegalSourceType:  "非法的资源类型",
-	IllegalSourceId:    "非法的资源ID",
-	BookMarkFailed:     "收藏失败",
-	BookMarkListFailed: "获取收藏列表失败",
+	IllegalSourceType:    "非法的资源类型",
+	IllegalSourceId:      "非法的资源ID",
+	BookMarkFailed:       "收藏失败",
+	BookMarkListFailed:   "获取收藏列表失败",
+	IllegalSearchKeyword: "搜索关键字不能为空",
 }
 
 func Equals(code int, message string) bool {

controllers/user/bookmark_controller.go

@@ -238,6 +238,11 @@ func (bk *BookMarkController) SearchBookMark(sourceType string, key string) {
 			bk.FailedResult("分页搜索收藏列表失败", result)
 			return
 		}
+		if key == "" {
+			err = exception.New(exception.IllegalSearchKeyword)
+			bk.FailedResult("分页搜索收藏列表失败", result)
+			return
+		}
 		userInfo := bk.Data["user"].(user.User)
 		var sourceIds []int
 		pageRes.Total, sourceIds, err = user.GetTotalBookMarkPageBySourceType(userInfo.Id, sourceType)

domian/media/chart_service.go

@@ -10,6 +10,7 @@ import (
 const (
 	ChartESColumn      = "chartName"
 	ChartESRangeColumn = "chartInfoId"
+	ChartEsColumn      = "chartName"
 )
 
 //	func SearchMediaList(_ string, key string, mediaIds []int, from int, size int, max int64) (medias []MediaDTO, err error) {
@@ -54,7 +55,7 @@ func AddChartToEs(esChart EsChartInfo) bool {
 }
 func matchRangeWithDocIdsNoLimit(key string, from int, to int, sorts []string, docIds []string) (request *es.ESQueryRequest) {
 	req := new(es.ESQueryRequest)
-	return req.CreateESQueryRequest(htConfig.GetReportIndex(), ESColumn, key, from, to, sorts, es.RangeByConditionWithDocIds).ByCondition("status", "PUBLISH").WithDocs(docIds)
+	return req.CreateESQueryRequest(htConfig.GetChartIndex(), ChartEsColumn, key, from, to, sorts, es.RangeByConditionWithDocIdsNoLimit).WithDocs(docIds)
 }
 func SearchChartList(key string, ids []int, from int, size int) (charts []EsChartInfo, err error) {
 	//同步es

routers/commentsRouter.go

@@ -462,6 +462,18 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:BookMarkController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:BookMarkController"],
+        beego.ControllerComments{
+            Method: "SearchBookMark",
+            Router: `/searchBookMark`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(
+				param.New("sourceType"),
+				param.New("key"),
+			),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:BookMarkController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:BookMarkController"],
         beego.ControllerComments{
             Method: "UnBookMark",