Browse Source

历史数据modifyinfo判断

maxiaoshan 5 years ago
parent
commit
73bfc5b830
2 changed files with 11 additions and 11 deletions
  1. 9 3
      udpcreateindex/src/biddingall.go
  2. 2 8
      udpcreateindex/src/config.json

+ 9 - 3
udpcreateindex/src/biddingall.go

@@ -100,15 +100,21 @@ func biddingAllTask(data []byte, mapInfo map[string]interface{}) {
 				tid := qutil.BsonIdToSId(tmp["_id"])
 				if cid == tid {
 					bnil = false
-					//更新bidding表,生成索引
+					//更新bidding表,生成索引;bidding表中modifyinfo中的字段不更新
+					modifyinfo := make(map[string]bool)
+					if tmpmodifyinfo, ok := tmp["modifyinfo"].(map[string]interface{}); ok && tmpmodifyinfo != nil {
+						for k, v := range tmpmodifyinfo {
+							modifyinfo[k] = v.(bool)
+						}
+					}
 					for _, k := range fields { //fields更新到mongo的字段
 						v1 := compare[k] //extract
 						v2 := tmp[k]     //bidding
 						if v2 == nil && v1 != nil {
 							update[k] = v1
-						} else if v2 != nil && v1 != nil {
+						} else if v2 != nil && v1 != nil && !modifyinfo[k] {
 							update[k] = v1
-						} else if v2 != nil && v1 == nil { //
+						} else if v2 != nil && v1 == nil && !modifyinfo[k] { //
 							if k == "s_subscopeclass" && del["subscopeclass"] == nil {
 								continue
 							} else if k == "s_topscopeclass" && del["topscopeclass"] == nil {

+ 2 - 8
udpcreateindex/src/config.json

@@ -30,8 +30,8 @@
     },
     "bidding": {
         "db": "mxs",
-        "collect": "test",
-        "index": "bidding_v2",
+        "collect": "test1",
+        "index": "bidding_v1",
         "type": "bidding",
         "extractdb": "mxs",
         "extractcollect": "extract",
@@ -95,11 +95,5 @@
     "elastic": {
         "addr": "http://192.168.3.128:9800",
         "pool": 12
-    },
-    "elastic_other": {
-        "addr": "http://127.0.0.1:9800",
-        "pool": 12,
-        "index": "bidding_v2",
-        "type": "bidding"
     }
 }