xiugai

customerdata/src/main.go

@@ -35,7 +35,7 @@ var (
 )
 var MgoSaveCache = make(chan map[string]interface{}, 1000)
 var SP = make(chan bool, 5)
-var projectIdMap *sync.Map
+var projectIdMap sync.Map
 
 func init() {
 	qu.ReadConfig(&Sysconfig)
@@ -105,7 +105,7 @@ func main() {
 	flag.Parse()
 	log.Println("customer", CustomerName)
 	if CustomerName != "" {
-		if CustomerName == "深信服医疗事业部" {
+		if CustomerName == "徐志恒的" {
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
 			InitProjectId()

customerdata/src/task.go

@@ -68,14 +68,14 @@ func GetCustomerData() {
 			}
 		}
 		//
-		if appId == "jyOh1XQgUJBQ5bTUlKCyZ1" {
+		if appId == qu.ObjToString(Sysconfig["project_appid"]) {
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
 			InitProjectId()
 			end := time.Now().Unix()
 			log.Println("加载projectId---结束,耗时", end-start, "秒")
 		} else {
-			projectIdMap = &sync.Map{}
+			projectIdMap = sync.Map{}
 		}
 		//
 		cus.GetTagRules()      //获取客户打标签规则
@@ -273,7 +273,7 @@ func (c *Customer) GetData(stype string) {
 								/*
 									到此已经匹配完数据
 								*/
-								//qu.Debug("---------------------", id, IsMatch, matchKey)
+								qu.Debug("---------------------", id, IsMatch, matchKey)
 								if IsMatch { //匹配成功，数据上新增规则id,matchKey,item并临时保存数据
 									tmpMatchKey := MapDataToArr(matchKey)
 									tmpMatchKeyType := MapDataToArr(matchKeyType)

customerdata/src/util.go

@@ -457,7 +457,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 		tmp["bidopentime"] = qu.Int64All(bidopentime)
 	}
 	//
-	if appid == "jyOh1XQgUJBQ5bTUlKCyZ1" {
+	if appid == qu.ObjToString(Sysconfig["project_appid"]) {
 		projectId := GetProjectId(id)
 		if projectId != "" {
 			tmp["projectId"] = projectId
@@ -780,8 +780,9 @@ func GetProjectId(id string) string {
 	querys := fmt.Sprintf(query, id)
 	projectId := ""
 	data := Es.Get("projectset", "projectset", querys)
-	if data != nil && *data != nil {
-		projectId = qu.ObjToString((*data)[0]["id"])
+	if data != nil && *data != nil && len(*data) > 0 {
+		projectId = qu.ObjToString((*data)[0]["_id"])
+		log.Println("查找到projectId", projectId)
 	}
 	return projectId
 }
@@ -794,7 +795,8 @@ func InitProjectId() {
 		log.Printf("本次共取到%d个projectId\n", count)
 	}()
 	save := Sysconfig["save"].(map[string]interface{})
-	query := map[string]interface{}{"appid": "jyOh1XQgUJBQ5bTUlKCyZ1"}
+	log.Println(Sysconfig["project_appid"])
+	query := map[string]interface{}{"appid": Sysconfig["project_appid"]}
 	field := map[string]interface{}{"projectId": 1}
 	iter := session.DB(qu.ObjToString(save["db"])).C(SaveColl).Find(query).Select(field).Sort("_id").Iter()
 	thisData := map[string]interface{}{}