wip:数据判重加日志

common/src/qfw/util/dataexport/entdataexport.go

@@ -31,20 +31,27 @@ type Filters struct {
 }
 
 func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress, _id string, entId, entUserId int, isFirst bool, url string, maxCount int) (count, newCount int, data *[]map[string]interface{}) {
-	defer util.Catch()
+	log.Println(fmt.Sprintf("GetEntDataExportCount entId:%v,entUserId:%v", entId, entUserId))
+	start := time.Now()
+	defer func() {
+		util.Catch()
+		log.Printf("GetEntDataExportCount entId:%v,entUserId:%v 总耗时：%v\n", entId, entUserId, time.Since(start))
+	}()
 	var (
 		searchsWaitGroup = &sync.WaitGroup{}
 	)
 	count = GetDataExportSearchCountByScdId(sim, bid, bidMgoDBName, elasticAddress, _id)
+	log.Printf("耗时： GetEntDataExportCount-GetDataExportSearchCountByScdId entId:%v,entUserId:%v,Since:%v \n", entId, entUserId, time.Since(start))
 	if count > maxCount || count == -1 {
 		count = maxCount
 	}
-	log.Println("count", count)
+	log.Println("GetEntDataExportCount-count", entId, entUserId, count)
 	dataType := "2"
 	//数据导出数据查询
 	res, err := GetDataExportSearchResultByScdId(sim, bid, bidMgoDBName, elasticAddress, _id, dataType, count)
+	log.Printf("耗时： GetEntDataExportCount-GetDataExportSearchResultByScdId entId:%v,entUserId:%v,Since:%v \n", entId, entUserId, time.Since(start))
 	if err != nil {
-		log.Println("企业数据导出错误 ", err)
+		log.Println("企业数据导出错误 ", entId, entUserId, err)
 		return 0, 0, nil
 	}
 	//  20210716 由原来的redis判重改为调用判重中台接口进行判重
@@ -54,6 +61,7 @@ func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress,
 	if !isFirst {
 		insertFlag = "true"
 	}
+	postStart := time.Now()
 	for _, v := range *res {
 		if util.IntAll(v["signendtime"]) != 0 {
 			date := v["signendtime"]
@@ -79,13 +87,9 @@ func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress,
 				"isInsert": insertFlag,
 				"isEnt":    "true",
 			})
-			log.Println("响应结果：", rs)
+			log.Println("响应结果：", entId, entUserId, rs)
 			if err5 != nil || util.IntAll(rs["code"]) != 0 {
-				log.Println("企业订阅数据导出接口判重失败", err5)
-				log.Println("企业订阅数据导出接口判重失败rs:", rs)
-				log.Println("企业订阅数据导出接口判重失败rs[code]:", rs["code"])
-				log.Println("企业订阅数据导出接口判重失败code是否为0", util.IntAll(rs["code"]) != 0)
-				log.Println("企业订阅数据导出接口判重失败", err5, "rs:", rs, " rs[code]:", rs["code"], " ", util.IntAll(rs["code"]), "code是否为0", util.IntAll(rs["code"]) != 0)
+				log.Println("企业订阅数据导出接口判重失败", entId, entUserId, err5, "rs:", rs, " rs[code]:", rs["code"], " ", util.IntAll(rs["code"]), "code是否为0", util.IntAll(rs["code"]) != 0)
 			} else {
 				log.Println("企业订阅数据导出")
 				// 置空
@@ -117,11 +121,7 @@ func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress,
 		})
 		log.Println(rs)
 		if err5 != nil || util.IntAll(rs["code"]) != 0 {
-			log.Println("企业订阅数据导出接口判重失败", err5)
-			log.Println("企业订阅数据导出接口判重失败rs:", rs)
-			log.Println("企业订阅数据导出接口判重失败rs[code]:", rs["code"])
-			log.Println("企业订阅数据导出接口判重失败code是否为0", util.IntAll(rs["code"]) != 0)
-			log.Println("企业订阅数据导出接口判重失败", err5, "rs:", rs, " rs[code]:", rs["code"], " ", util.IntAll(rs["code"]), "code是否为0", util.IntAll(rs["code"]) != 0)
+			log.Println("企业订阅数据导出接口判重失败", entId, entUserId, err5, "rs:", rs, " rs[code]:", rs["code"], " ", util.IntAll(rs["code"]), "code是否为0", util.IntAll(rs["code"]) != 0)
 		} else {
 			log.Println("企业订阅数据导出")
 			// 置空
@@ -130,15 +130,12 @@ func GetEntDataExportCount(sim, bid mg.MongodbSim, bidMgoDBName, elasticAddress,
 			returnData := rs["data"].(map[string]interface{})
 			log.Println(newCount, "加之前")
 			newCount += util.IntAll(returnData["newCount"])
-			//newCount += int(returnData["newCount"].(float64))
 			log.Println(newCount, "加之后")
 
 		}
 	}
 	searchsWaitGroup.Wait()
-	log.Println("企业数据导出--数据遍历完成")
-	//newCount = len(newCountPool)
-	log.Println("new", newCount)
+	log.Printf("企业数据导出--数据遍历完成：entId:%v,entUserId:%v,newCount:%v,Since:%v \n", entId, entUserId, newCount, time.Since(postStart))
 	data = res
 	return
 }