数据导出生产环境问题修改

src/jfw/front/dataExport.go

@@ -517,7 +517,7 @@ func (d *DataExport) PreviewData(source, _id string) error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错", res)
 		return d.Render("/pc/dataExport_noDataErr.html", &d.T)

src/jfw/front/ws_dataExport.go

@@ -203,7 +203,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)

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

@@ -66,7 +66,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)

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

@@ -392,15 +392,15 @@ func isNullSearch(scd *SieveCondition) (isNull bool) {
  * count 返回数量 (-1:预览数据查询)
  */
 
-func GetDataExportSearchResultByScdId(sim, bid mg.MongodbSim, elasticAddress, id, dataType string, checkCount int) (*[]map[string]interface{}, error) {
+func GetDataExportSearchResultByScdId(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress, id, dataType string, checkCount int) (*[]map[string]interface{}, error) {
 	scd := GetSqlObjFromId(sim, id)
-	return GetDataExportSearchResult(bid, elasticAddress, scd, dataType, checkCount)
+	return GetDataExportSearchResult(bid, bidMgoDBName, elasticAddress, scd, dataType, checkCount)
 }
 
 //收藏导出
 var contentfilterReg = regexp.MustCompile("<[^>]+>")
 
-func GetDataExportSelectResult(bidding mg.MongodbSim, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
+func GetDataExportSelectResult(bidding mg.MongodbSim, biddingName string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
 	sess := bidding.GetMgoConn()
 	defer bidding.DestoryMongoConn(sess)
 	if checkCount == -1 {
@@ -422,7 +422,7 @@ func GetDataExportSelectResult(bidding mg.MongodbSim, scd *SieveCondition, dataT
 		}
 	}
 	returnLsit := make([]map[string]interface{}, 0, len(queryIds))
-	iter := sess.DB("qfw_data").C("bidding").Select(selectMap).Find(map[string]interface{}{"_id": map[string]interface{}{
+	iter := sess.DB(biddingName).C("bidding").Select(selectMap).Find(map[string]interface{}{"_id": map[string]interface{}{
 		"$in": queryIds,
 	}}).Iter()
 	for m := make(map[string]interface{}); iter.Next(&m); {
@@ -437,7 +437,7 @@ func GetDataExportSelectResult(bidding mg.MongodbSim, scd *SieveCondition, dataT
 	if len(returnLsit) == checkCount {
 		return &returnLsit, nil
 	}
-	iter_back := sess.DB("qfw_data").C("bidding_back").Select(selectMap).Find(map[string]interface{}{"_id": map[string]interface{}{
+	iter_back := sess.DB(biddingName).C("bidding_back").Select(selectMap).Find(map[string]interface{}{"_id": map[string]interface{}{
 		"$in": queryIds,
 	}}).Iter()
 	for m := make(map[string]interface{}); iter_back.Next(&m); {
@@ -458,13 +458,13 @@ func GetDataExportSelectResult(bidding mg.MongodbSim, scd *SieveCondition, dataT
 //GetDataExportSearchResult 获取数据导出内容
 //entmg 高级字段包查询企业电话邮箱等字段
 //checkCount -1 预览500条
-func GetDataExportSearchResult(bid mg.MongodbSim, elasticAddress string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
+func GetDataExportSearchResult(bid mg.MongodbSim, bidMgoDBName, elasticAddress string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
 	defer qutil.Catch()
 	if scd == nil {
 		return nil, errors.New("GetDataExportSearchResult-获取查询条件")
 	}
 	if scd.SelectIds != nil {
-		return GetDataExportSelectResult(bid, scd, dataType, checkCount)
+		return GetDataExportSelectResult(bid, bidMgoDBName, scd, dataType, checkCount)
 	}
 	//获取查询语句
 	qstr := getDataExportSql(scd)

src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -158,7 +158,7 @@ func (p *DataExportPay) CreateOrder() {
 		ordercode := pay.GetOrderCode(openId)
 		download_url := util.GetExcelFilePath(ordercode)
 		go func() {
-			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, util.Mgo_bidding, config.Config.Elasticsearch, id, qutil.If(data_spec == "高级字段包", "2", "1").(string), data_count)
+			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, util.Mgo_bidding, config.Config.Mongobidding.DbName, config.Config.Elasticsearch, id, qutil.If(data_spec == "高级字段包", "2", "1").(string), data_count)
 			if err == nil && list != nil && len(*list) > 0 {
 				list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, qutil.If(data_spec == "高级字段包", "2", "1").(string))
 				err = util.CreateDataExportExcelFile(list, data_spec == "高级字段包", config.ExConf.ExcelReadyPath+download_url)
@@ -264,7 +264,7 @@ func (this *DataExportPay) VipDailyDataExport() {
 		}
 		//生成excel文件&存储导出记录
 		go func() {
-			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, util.Mgo_bidding, config.Config.Elasticsearch, selectId, "2", selectCount)
+			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, util.Mgo_bidding, config.Config.Mongobidding.DbName, config.Config.Elasticsearch, selectId, "2", selectCount)
 			url := util.GetExcelFilePath(pay.GetOrderCode(selectId))
 			if err == nil && list != nil && len(*list) > 0 {
 				list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, "2")

src/jfw/public/entdataexport.go

@@ -30,7 +30,7 @@ func GetEntDataExportCount(_id string, entId, entUserId, limitNum, current int,
 	dataType := "2"
 	//数据导出数据查询
 
-	res, err := dataexport.GetDataExportSearchResultByScdId(MQFW, Mgo_Bidding, DbConf.Elasticsearch.Main.Address, _id, dataType, count)
+	res, err := dataexport.GetDataExportSearchResultByScdId(MQFW, Mgo_Bidding, DbConf.Mongodb.Bidding.DbName, DbConf.Elasticsearch.Main.Address, _id, dataType, count)
 	if err != nil {
 		log.Println("企业数据导出错误 ", err)
 		return 0, 0, nil