wcc 1 жил өмнө
parent
commit
9deb98f2b9

+ 6 - 6
highMark/config.json

@@ -1,6 +1,6 @@
 {
   "bidding": {
-    "addr": "127.0.0.1:27082",
+    "addr": "172.17.4.86:27080",
     "db": "jyqykhfw",
     "coll": "f_task",
     "size": 10,
@@ -8,13 +8,13 @@
     "password": ""
   },
   "bidding_high": {
-    "addr": "192.168.3.166:27082",
+    "addr": "172.17.189.140:27080",
     "db": "qfw_high",
-    "coll": "wcc_high_bidding",
+    "coll": "bidding",
     "size": 10,
-    "username": "",
-    "password": ""
+    "username": "SJZY_RWbid_ES",
+    "password": "SJZY@B4i4D5e6S"
   },
-  "spec": "0 00 01 * * *",
+  "spec": "0 00 01 * * *" ,
   "no_fields": "matchkey,matchkey,field_source,purchasinglist_alltag,info,jytest_href,matchkey"
 }

BIN
highMark/highMark


+ 7 - 3
highMark/main.go

@@ -100,7 +100,7 @@ func highMark() {
 	util.Debug("本次处理任务总数:", len(*tasks))
 
 	for _, task := range *tasks {
-		util.Debug("开始处理任务数据:", task["s_groupname"], task["s_entname"])
+		util.Debug("开始处理任务数据:", task["s_groupname"], task["s_entname"], task["s_sourceinfo"])
 		taskID := mongodb.BsonIdToSId(task["_id"])
 		//任务对应的数据表
 		s_sourceinfo := util.ObjToString(task["s_sourceinfo"])
@@ -112,6 +112,7 @@ func highMark() {
 
 		query := sess.DB(bidddingConf["db"].(string)).C(s_sourceinfo).Find(&q).Select(nil).Iter()
 		count := 0
+		taskFinish := false
 		for tmp := make(map[string]interface{}); query.Next(tmp); count++ {
 			infoID := mongodb.BsonIdToSId(tmp["_id"])
 			if count%1000 == 0 {
@@ -129,6 +130,7 @@ func highMark() {
 			res := calculateFlag(taginfo, *fields) //返回标注的十进制数字
 
 			if data, ok := markedData["v_baseinfo"].(map[string]interface{}); ok {
+				delete(data, "_id")
 				where := make(map[string]interface{})
 				if _, ok := data["id"]; ok {
 					bidd, _ := MgoB.FindById("bidding", util.ObjToString(data["id"]), nil)
@@ -158,8 +160,10 @@ func highMark() {
 				update["$set"] = data
 
 				if !MgoH.Update(util.ObjToString(biddingHConf["coll"]), where, update, true, false) {
-					util.Debug("任务 ", task["s_groupname"], infoID, "入库错误,请检查")
+					taskFinish = false
+					util.Debug("任务 ", task["s_groupname"], task["s_sourceinfo"], infoID, "入库错误,请检查")
 				} else {
+					taskFinish = true
 					//1、更新数据源信息
 					setResult := map[string]interface{}{ //更新字段集
 						"is_return_highdata":  1,
@@ -175,7 +179,7 @@ func highMark() {
 		}
 		util.Debug("任务: ", task["s_entname"], "数据表: ", s_sourceinfo, " 处理总数为: ", count, "分配的数据总量为: ", task["i_givenum"])
 
-		if count > 0 {
+		if count > 0 && taskFinish {
 			//当前任务结束
 			//3.更新任务表,
 			taskSetResult := map[string]interface{}{ //更新字段集

+ 1 - 0
src/github.com/josharian/intern

@@ -0,0 +1 @@
+Subproject commit 42b52b674af5a7cef9ce7e197bc21c78394ae65d

+ 1 - 0
src/github.com/mailru/easyjson

@@ -0,0 +1 @@
+Subproject commit a209843d8ea9db383ce1a1976e43c8e95f831c61