撤回

src/history/datamodel.go

@@ -96,7 +96,7 @@ type Customer struct {
 	IsSearchEnps bool                              //是否查询第三方企业信息
 	TagRules     []*TagRule                        //打标签规则集合
 	SaveDataMap  map[string]map[string]interface{} //最终入库数据(全局模式)
-	SaveDataArr  map[string]map[string]interface{} //最终入库数据(规则模式)
+	SaveDataArr  []map[string]interface{} //最终入库数据(规则模式)
 	IdRange      bson.M                            //由当前时间生成是id查询区间
 }
 

src/history/task.go

@@ -392,15 +392,7 @@ func (c *Customer) RemoveRepeatData() {
 							//dm.SaveDataMap[dataId] = dm_history
 						}
 					} else if c.PushModel == 4 { //规则模式不去重
-						// c.SaveDataArr = append(c.SaveDataArr, tmp)
-						if dm.SaveDataArr[dataId] == nil {
-							tmp["itemdist"] = map[string]interface{}{qu.ObjToString(tmp["item"]): qu.ObjToString(tmp["matchkey"])}
-							dm.SaveDataArr[dataId] = tmp
-						} else { //数据重复
-							dm_history := dm.SaveDataArr[dataId]
-							MergeDatas(dm_history, tmp, c.IsTagRule, false) //合并字段
-							//dm.SaveDataMap[dataId] = dm_history
-						}
+						c.SaveDataArr = append(c.SaveDataArr, tmp)
 					}
 				}
 			}

src/history/util_history.go

@@ -406,11 +406,6 @@ func MergeData(history, tmp map[string]interface{}, isTagRule, isDepartRmvRep bo
 	rulename2 := qu.ObjToString(tmp["rulename"])
 	history["rulename"] = MergeField(rulename1, rulename2)
 
-	item1 := qu.ObjToString(history["item"])
-	item2 := qu.ObjToString(tmp["item"])
-	history["item"] = MergeField(item1, item2)
-	history["itemdist"].(map[string]interface{})[item2] = matchkey2
-
 	if isTagRule { //标签模式 tagname、tagid合并
 		tagname1 := qu.ObjToString(history["tagname"])
 		tagname2 := qu.ObjToString(tmp["tagname"])
@@ -637,7 +632,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 		if dataTable == 0 { //存到usermail_history
 			MgoSaveCache <- tmp
 		} else if dataTable == 1 { //存到usermail
-			redis.Put("datag", appid+"_"+id, 1, -1)
+			//redis.Put("datag", appid+"_"+id, 1, -1)
 			MgoSaveUsermailCache <- tmp
 		} else if dataTable == 2 {
 			//存入mysql,并存到redis