浏览代码

搜索全文 标题还是列表

zhangxinlei1996 5 年之前
父节点
当前提交
ac0b0755e1
共有 2 个文件被更改,包括 15 次插入2 次删除
  1. 5 1
      src/jfw/front/swordfish.go
  2. 10 1
      src/jfw/modules/app/src/app/front/swordfish.go

+ 5 - 1
src/jfw/front/swordfish.go

@@ -494,7 +494,11 @@ func (m *Front) PcAjaxReq() {
 				}
 				if len([]rune(s_word)) > 3 && int(count) < pc_pageSize && start == 0 {
 					secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
-					findfields := `"title"`
+					// 移动端数据导出改
+					//findfields := `"title"`
+					findfields := `"`
+					findfields += m.GetString("selectType")
+					findfields += `"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(area, publishtime, subtype))
 					secondLimit := 2*pc_pageSize - int(count)
 					secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, secondLimit, 0, false)

+ 10 - 1
src/jfw/modules/app/src/app/front/swordfish.go

@@ -459,6 +459,7 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
+						log.Println("11111")
 						list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
 					}
 				} else {
@@ -470,7 +471,11 @@ func (m *Front) WxsearchlistPaging() {
 				}
 				if len([]rune(s_word)) > 3 && listSize < wx_pageSize && pageNum == 1 {
 					secondKWS = jy.HttpEs(searchvalue, "ik_smart", config.Sysconfig["elasticsearch"].(string))
-					findfields := `"title"`
+					// 移动端数据导出改
+					//findfields := `"title"`
+					findfields := `"`
+					findfields += m.GetString("selectType")
+					findfields += `"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 					secondLimit := 2*wx_pageSize - listSize
 					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, secondLimit, 0, false)
@@ -549,6 +554,7 @@ func (m *Front) WxsearchlistPaging() {
 				m.T["msgset"] = keys
 			}
 		}
+		log.Println("list:", list)
 		m.ServeJson(map[string]interface{}{
 			"limitFlag":     limitFlag,
 			"status":        isLimit,
@@ -581,9 +587,12 @@ func getWxsearchlistData_new(keywords, scope, publishtime, subtype, industry, mi
 	}
 	qstr := getSearchQuery(s_word, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 	if selectType == "all" { //全文搜索
+		log.Println("全文")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, true)
 	} else { //标题搜索
+		log.Println("标题")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, false)
+		log.Println("end")
 	}
 
 	if list != nil {