Browse Source

fix:log日志

duxin 1 year ago
parent
commit
27f944f587

+ 9 - 0
common/src/qfw/util/dataexport/dataexport.go

@@ -775,10 +775,16 @@ func GetDataExportSelectResultFromMongoDb(bidding mg.MongodbSim, biddingName str
 	var lock sync.Mutex
 	returnLsit := make([]map[string]interface{}, 0, len(scd.SelectIds))
 	idArr := SplitArray(scd.SelectIds, 200)
+	log.Println("GetDataExportSelectResultFromMongoDbidArr===", idArr)
 	for i := 0; i < len(idArr); i++ {
 		pool <- true
 		wait.Add(1)
 		go func(arr []string) error {
+			var strId []string
+			for _, s := range arr {
+				strId = append(strId, fmt.Sprintf(`"%s"`, s))
+			}
+			log.Println("GetDataExportSelectResultFromMongoDb===", strings.Join(strId, ","))
 			defer func() {
 				wait.Done()
 				<-pool
@@ -828,6 +834,9 @@ func GetDataExportSelectResultFromMongoDb(bidding mg.MongodbSim, biddingName str
 
 // SplitArray 分割数组
 func SplitArray(arr []string, num int64) [][]string {
+	if len(arr) == 0 {
+		return nil
+	}
 	max := int64(len(arr))
 	//判断数组大小是否小于等于指定分割大小的值,是则把原数组放入二维数组返回
 	if max <= num {

+ 6 - 0
common/src/qfw/util/dataexport/entdataexport.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -148,6 +149,11 @@ func FormatExportDatas(Mgo_Ent mongodb.MongodbSim, data *[]map[string]interface{
 		entexportPool      = make(chan bool, 20)
 		entexportWaitGroup = &sync.WaitGroup{}
 	)
+	sort.Slice(*data, func(i, j int) bool {
+		time1 := util.Int64All((*data)[i]["publishtime"])
+		time2 := util.Int64All((*data)[j]["publishtime"])
+		return time1 > time2
+	})
 	log.Println("补充信息开始")
 	for _, v := range *data {
 		entexportWaitGroup.Add(1)