feat:数据导出 搜索开关

src/config.json

@@ -320,6 +320,6 @@
     "seoBeforeTimeHour":12160,
     "canReadNotice": 3,
     "smsServiceRpc":"127.0.0.1:932",
-    "searchTypeSwitch": false,
-    "fileSignBool":false
+    "searchTypeSwitch": true,
+    "fileSignBool":true
 }

src/jfw/front/dataExport.go

@@ -413,6 +413,8 @@ func (d *DataExport) SuperSearchExport() error {
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"
+	//是否开启 正文 标题同时搜索只搜正文的开关
+	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
 
 	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 	if region != "" && reqData.City != "" {
@@ -420,9 +422,10 @@ func (d *DataExport) SuperSearchExport() error {
 	} else {
 		region = reqData.City
 	}
-	saveData["region"] = strings.Split(region, ",")
+	saveData["region"] = util.If(region != "", strings.Split(region, ","), []string{}).([]string)
 	//存入数据库
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
+	log.Println(_id, "saveData:", saveData)
 	return d.Redirect("/front/dataExport/toCreateOrderPage/" + util.SE.Encode2Hex(_id))
 }
 func (d *DataExport) ToCreateOrderPage(_id string) error {

src/jfw/front/ws_dataExport.go

@@ -382,6 +382,8 @@ func (wd *WsDataExport) SearchExport() error {
 		region = reqData.City
 	}
 	saveData["region"] = strings.Split(region, ",")
+	//是否开启 正文 标题同时搜索只搜正文的开关
+	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
 	//存入数据库
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -366,7 +366,8 @@ func (wd *WsDataExport) SearchExport() error {
 		region = reqData.City
 	}
 	saveData["region"] = strings.Split(region, ",")
-
+	//是否开启 正文 标题同时搜索只搜正文的开关
+	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
 	//存入数据库
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 

src/jfw/modules/common/src/qfw/util/dataexport/dataexport.go

@@ -28,27 +28,28 @@ type KeyWord struct {
 
 /*筛选条件*/
 type SieveCondition struct {
-	Id           string    `json:"id"`
-	PublishTime  string    `json:"publishtime"`  //发布时间
-	Area         []string  `json:"area"`         //地区-省份
-	City         []string  `json:"city"`         //地区-城市
-	Region       []string  `json:"region"`       //地区-省份+城市
-	Industry     []string  `json:"industry"`     //行业
-	Keyword      []KeyWord `json:"keywords"`     //关键词
-	Buyer        []string  `json:"buyer"`        //招标单位(采购单位)
-	Buyerclass   []string  `json:"buyerclass"`   //采购单位类型
-	HasBuyerTel  string    `json:"hasBuyertel"`  //是否有采购单位电话
-	Winner       []string  `json:"winner"`       //中标单位
-	HasWinnerTel string    `json:"hasWinnertel"` //是否有中标单位电话
-	ComeInTime   int64     `json:"comeintime"`   //入库时间(秒)
-	OpenId       string    `json:"openid"`       //用户openid
-	MinPrice     string    `json:"minprice"`     //金额——最少
-	MaxPrice     string    `json:"maxprice"`     //金额——最多
-	SelectType   string    `json:"selectType"`   //筛选（正文 or 标题）
-	Subtype      string    `json:"subtype"`      //信息类型
-	SelectIds    []string  `json:"selectId"`     //选择信息导出
-	Comeinfrom   string    `json:"comeinfrom"`   //查询来源
-	FileExists   string    `json:"fileExists"`   //是否有附件
+	Id               string    `json:"id"`
+	PublishTime      string    `json:"publishtime"`      //发布时间
+	Area             []string  `json:"area"`             //地区-省份
+	City             []string  `json:"city"`             //地区-城市
+	Region           []string  `json:"region"`           //地区-省份+城市
+	Industry         []string  `json:"industry"`         //行业
+	Keyword          []KeyWord `json:"keywords"`         //关键词
+	Buyer            []string  `json:"buyer"`            //招标单位(采购单位)
+	Buyerclass       []string  `json:"buyerclass"`       //采购单位类型
+	HasBuyerTel      string    `json:"hasBuyertel"`      //是否有采购单位电话
+	Winner           []string  `json:"winner"`           //中标单位
+	HasWinnerTel     string    `json:"hasWinnertel"`     //是否有中标单位电话
+	ComeInTime       int64     `json:"comeintime"`       //入库时间(秒)
+	OpenId           string    `json:"openid"`           //用户openid
+	MinPrice         string    `json:"minprice"`         //金额——最少
+	MaxPrice         string    `json:"maxprice"`         //金额——最多
+	SelectType       string    `json:"selectType"`       //筛选（正文 or 标题）
+	Subtype          string    `json:"subtype"`          //信息类型
+	SelectIds        []string  `json:"selectId"`         //选择信息导出
+	Comeinfrom       string    `json:"comeinfrom"`       //查询来源
+	FileExists       string    `json:"fileExists"`       //是否有附件
+	SearchTypeSwitch bool      `json:"searchTypeSwitch"` //是否开启 正文 标题同时搜索只搜正文的开关
 }
 
 const (
@@ -77,6 +78,11 @@ func DetailFileORTitle(findfields string) bool {
 	return (strings.Contains(findfields, "detail") || strings.Contains(findfields, "filetext")) && !strings.Contains(findfields, "title")
 }
 
+//包含正文包含标题
+func DetailANDTitle(findfields string) bool {
+	return strings.Contains(findfields, "detail") && strings.Contains(findfields, "title")
+}
+
 //获取数据导出查询语句
 func getDataExportSql(scd *SieveCondition) string {
 	if len(scd.SelectIds) > 0 {
@@ -240,6 +246,14 @@ func getDataExportSql(scd *SieveCondition) string {
 		} else if scd.SelectType == "all" {
 			queryItem = "detail\", \"title"
 		} else {
+			if scd.SearchTypeSwitch && DetailANDTitle(scd.SelectType) {
+				if strings.Contains(scd.SelectType, "title,") {
+					scd.SelectType = strings.Replace(scd.SelectType, "title,", "", -1)
+				} else if strings.Contains(scd.SelectType, ",title") {
+					scd.SelectType = strings.Replace(scd.SelectType, ",title", "", -1)
+				}
+
+			}
 			queryItem = strings.ReplaceAll(scd.SelectType, ",", "\",\"")
 		}
 		multi_match_new := fmt.Sprintf(multi_match, "%s", "\""+queryItem+"\"")
@@ -364,26 +378,28 @@ func GetSqlObjFromId(mongo mg.MongodbSim, _id string) *SieveCondition {
 	if query, ok = mongo.FindById(ExportTable, _id, nil); !ok {
 		return nil
 	}
+	searchTypeSwitch, _ := (*query)["searchTypeSwitch"].(bool)
 	return &SieveCondition{
-		Id:           _id,
-		Keyword:      getKeyWordArrFromDbResult((*query)["keywords"]),
-		Industry:     getStringArrFromDbResult((*query)["industry"]),
-		MinPrice:     qutil.ObjToString((*query)["minprice"]),
-		MaxPrice:     qutil.ObjToString((*query)["maxprice"]),
-		Subtype:      qutil.ObjToString((*query)["subtype"]),
-		Area:         getStringArrFromDbResult((*query)["area"]),
-		City:         getStringArrFromDbResult((*query)["city"]),
-		SelectType:   qutil.ObjToString((*query)["selectType"]),
-		PublishTime:  qutil.ObjToString((*query)["publishtime"]),
-		Buyer:        getStringArrFromDbResult((*query)["buyer"]),
-		Buyerclass:   getStringArrFromDbResult((*query)["buyerclass"]),
-		HasBuyerTel:  qutil.ObjToString((*query)["hasBuyertel"]),
-		Winner:       getStringArrFromDbResult((*query)["winner"]),
-		HasWinnerTel: qutil.ObjToString((*query)["hasWinnertel"]),
-		ComeInTime:   qutil.Int64All((*query)["comeintime"]),
-		Comeinfrom:   qutil.ObjToString((*query)["comeinfrom"]),
-		SelectIds:    getStringArrFromDbResult((*query)["selectIds"]),
-		FileExists:   qutil.ObjToString((*query)["fileExists"]),
+		Id:               _id,
+		Keyword:          getKeyWordArrFromDbResult((*query)["keywords"]),
+		Industry:         getStringArrFromDbResult((*query)["industry"]),
+		MinPrice:         qutil.ObjToString((*query)["minprice"]),
+		MaxPrice:         qutil.ObjToString((*query)["maxprice"]),
+		Subtype:          qutil.ObjToString((*query)["subtype"]),
+		Area:             getStringArrFromDbResult((*query)["area"]),
+		City:             getStringArrFromDbResult((*query)["city"]),
+		SelectType:       qutil.ObjToString((*query)["selectType"]),
+		PublishTime:      qutil.ObjToString((*query)["publishtime"]),
+		Buyer:            getStringArrFromDbResult((*query)["buyer"]),
+		Buyerclass:       getStringArrFromDbResult((*query)["buyerclass"]),
+		HasBuyerTel:      qutil.ObjToString((*query)["hasBuyertel"]),
+		Winner:           getStringArrFromDbResult((*query)["winner"]),
+		HasWinnerTel:     qutil.ObjToString((*query)["hasWinnertel"]),
+		ComeInTime:       qutil.Int64All((*query)["comeintime"]),
+		Comeinfrom:       qutil.ObjToString((*query)["comeinfrom"]),
+		SelectIds:        getStringArrFromDbResult((*query)["selectIds"]),
+		FileExists:       qutil.ObjToString((*query)["fileExists"]),
+		SearchTypeSwitch: searchTypeSwitch,
 	}
 }
 

src/jfw/public/dataexport.go

@@ -2,7 +2,6 @@ package public
 
 import (
 	"fmt"
-	"jfw/config"
 	"jfw/modules/common/src/qfw/util/jy"
 	"log"
 	"qfw/util"
@@ -144,7 +143,7 @@ func (this *BidSearchExport) PassBidSearchExport() (returnData map[string]interf
 		_, _, keywords := jy.InterceptSearchKW(this.Keywords, isIntercept, len(this.Industry) == 0)
 		keywords = strings.Replace(keywords, "+", " ", -1)
 		excludes := []string{}
-		if len(strings.Split(this.Notkey, " ")) > 0 {
+		if this.Notkey != "" && len(strings.Split(this.Notkey, " ")) > 0 {
 			excludes = strings.Split(this.Notkey, " ")
 		}
 		KeyWordSave = append(KeyWordSave, dataexport.KeyWord{Keyword: keywords, Exclude: excludes})
@@ -171,16 +170,6 @@ func (this *BidSearchExport) PassBidSearchExport() (returnData map[string]interf
 		endtime := fmt.Sprint(now.Unix())
 		publishtimeSave = fmt.Sprintf("%s_%s", starttime, endtime)
 	}
-	//
-	searchTypeSwitch, _ := config.Sysconfig["searchTypeSwitch"].(bool)
-	//标题+全文搜索 搜索类型开关打开 默认搜索全文；（全文包含标题）(单字排除)
-	if searchTypeSwitch && strings.Contains(this.SelectType, "content") && strings.Contains(this.SelectType, "title") {
-		if strings.Contains(this.SelectType, "title,") {
-			this.SelectType = strings.Replace(this.SelectType, "title,", "", -1)
-		} else if strings.Contains(this.SelectType, ",title") {
-			this.SelectType = strings.Replace(this.SelectType, ",title", "", -1)
-		}
-	}
 	returnData = map[string]interface{}{
 		"keywords":     KeyWordSave,
 		"publishtime":  publishtimeSave,