xuzhiheng 1 vuosi sitten
vanhempi
commit
265816ed6a
1 muutettua tiedostoa jossa 54 lisäystä ja 19 poistoa
  1. 54 19
      service/clue.go

+ 54 - 19
service/clue.go

@@ -50,11 +50,7 @@ func ClueImportTtSync(this *biservice.ClueImportReq) (string, int) {
 				details := ""
 				id := common.ObjToString(v["id"])
 				href := common.ObjToString(v["href"])
-				biddingData, ok := Bidding.FindOne("bidding", map[string]interface{}{"_id": mongodb.StringTOBsonId(id)})
-				if ok && biddingData != nil && len(*biddingData) > 0 {
-					details = common.ObjToString((*biddingData)["detail"])
-					v["details"] = details
-				}
+
 				for _, vv := range strings.Split(competitors, ",") {
 					if strings.Contains(href, vv) {
 						v["isCompetitors"] = "是"
@@ -68,23 +64,62 @@ func ClueImportTtSync(this *biservice.ClueImportReq) (string, int) {
 				delete(v, "import_pc")
 				dataId := BiService.Insert("customer_data_ttzl", v)
 				if dataId > 0 {
+					//
+					biddingData, ok := Bidding.FindOne("bidding", map[string]interface{}{"_id": mongodb.StringTOBsonId(id)})
+					if ok && biddingData != nil && len(*biddingData) > 0 {
+						details = common.ObjToString((*biddingData)["detail"])
+					}
+					//
 					BiService.Insert("customer_data_ttzl_gl", map[string]interface{}{"msg_id": dataId, "info_id": id, "details": details, "isHistory": "否"})
 					delete(v, "isCompetitors")
+					delete(v, "msg_id")
+					v["_id"] = v["id"]
+					delete(v, "id")
 					v["details"] = cleanHTML(details)
-					publishtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["publishtime"]), time.Local)
-					docstarttime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["docstarttime"]), time.Local)
-					docendtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["docendtime"]), time.Local)
-					bidstarttime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidstarttime"]), time.Local)
-					bidendtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidendtime"]), time.Local)
-					bidopentime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidopentime"]), time.Local)
-					v["publishtime"] = publishtime.Unix()
-					v["docstarttime"] = docstarttime.Unix()
-					v["docendtime"] = docendtime.Unix()
-					v["bidstarttime"] = bidstarttime.Unix()
-					v["bidendtime"] = bidendtime.Unix()
-					v["bidopentime"] = bidopentime.Unix()
-					ok := Es.Save("ttbid", "ttbid", v)
-					if ok {
+					if common.ObjToString(v["publishtime"]) != "" {
+						v["publishtime2"] = common.ObjToString(v["publishtime"])
+						publishtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["publishtime"]), time.Local)
+						v["publishtime"] = publishtime.Unix()
+					} else {
+						delete(v, "publishtime")
+					}
+					// if common.ObjToString(v["docstarttime"]) != "" {
+					// 	docstarttime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["docstarttime"]), time.Local)
+					// 	v["docstarttime"] = docstarttime.Unix()
+					// } else {
+					// 	delete(v, "docstarttime")
+					// }
+					// if common.ObjToString(v["docendtime"]) != "" {
+					// 	docendtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["docendtime"]), time.Local)
+					// 	v["docendtime"] = docendtime.Unix()
+					// } else {
+					// 	delete(v, "docendtime")
+					// }
+					// if common.ObjToString(v["bidstarttime"]) != "" {
+					// 	bidstarttime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidstarttime"]), time.Local)
+					// 	v["bidstarttime"] = bidstarttime.Unix()
+					// } else {
+					// 	delete(v, "bidstarttime")
+					// }
+					// if common.ObjToString(v["bidendtime"]) != "" {
+					// 	bidendtime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidendtime"]), time.Local)
+					// 	v["bidendtime"] = bidendtime.Unix()
+					// } else {
+					// 	delete(v, "bidendtime")
+					// }
+					// if common.ObjToString(v["bidopentime"]) != "" {
+					// 	bidopentime, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(v["bidopentime"]), time.Local)
+					// 	v["bidopentime"] = bidopentime.Unix()
+					// } else {
+					// 	delete(v, "bidopentime")
+					// }
+					for k, vv := range v {
+						if vv == nil {
+							delete(v, k)
+						}
+					}
+					oks := Es.Save("ttbid", "ttbid", v)
+					if oks {
 						counts++
 						log.Println("es存入成功", id)
 					} else {