xg

CMPlatform/config.json

@@ -72,6 +72,14 @@
     "userName": "es_all",
     "password": "TopJkO2E_d1x"
   },
+  "es_customer": {
+    "addr": "http://192.168.3.241:9205",
+    "index": "bidding",
+    "pool": 15,
+    "version": "v7",
+    "userName": "jybid",
+    "password": "Top2023_JEB01i@31"
+  },
   "mail": [
     {
       "addr": "smtp.exmail.qq.com",

CMPlatform/service/data_ent.go

@@ -53,7 +53,7 @@ func (e *EntData) ImportData() {
 		if user, ok := e.GetSession("user").(map[string]interface{}); ok {
 			userName = common.ObjToString(user["name"])
 		}
-		util.MgoSave.Save("customer_import_record", map[string]interface{}{
+		util.Mgo.Save("customer_import_record", map[string]interface{}{
 			"userName":   userName,
 			"importSize": importDataNum,
 			"eid":        eid,
@@ -186,7 +186,7 @@ func ImportDataByExcel(mf multipart.File, eid int64, entid string) (int, int64,
 			id := (*info)["id"]
 			infoid := (*info)["infoid"]
 			tmp["id"] = id
-			//util.Es.DelById("bidding_customer", "", fmt.Sprint(id))
+			//util.EsCus.DelById("bidding_customer", "", fmt.Sprint(id))
 			binfo := util.EntMysql.FindOne("customer_data_yys_gl", bson.M{"info_id": infoid}, "", "")
 			if binfo != nil && len(*binfo) > 0 {
 				esSaveFuc(tmp, common.ObjToString((*binfo)["detail"]), &saveEsArr)
@@ -202,7 +202,7 @@ func ImportDataByExcel(mf multipart.File, eid int64, entid string) (int, int64,
 		}
 	}
 	if len(saveEsArr) > 0 {
-		util.BulkSave("bidding_customer", &saveEsArr, false, util.Es.(*elastic.EsV7))
+		util.BulkSave("bidding_customer", &saveEsArr, false, util.EsCus.(*elastic.EsV7))
 	}
 	log.Debug("Load Excel Count：", importDataNum)
 	return importDataNum, now.Unix(), "文档导入成功"
@@ -270,7 +270,7 @@ func (e *EntData) RecordRevoke() {
 		b := util.EntMysql.Update("customer_data", query, bson.M{"status": -1, "projectId": nil})
 		qEs := es.NewBoolQuery().Must(es.NewTermQuery("pici", pici)).Must(es.NewTermQuery("ent_id", eid))
 		log.Debug(pici, eid)
-		util.DelBy("bidding_customer", qEs, util.Es.(*elastic.EsV7))
+		util.DelBy("bidding_customer", qEs, util.EsCus.(*elastic.EsV7))
 		if b {
 			util.Mgo.UpdateById("customer_import_record", _id, bson.M{"$set": bson.M{"del": true, "revokeTime": time.Now().Unix(), "revokeUser": userName}})
 			e.ServeJson(map[string]interface{}{"rep": true})
@@ -288,7 +288,7 @@ func (e *EntData) DelData() {
 		// todo rpc
 		DelFuc(id, eid)
 		b := util.EntMysql.Update("customer_data", bson.M{"id": id}, bson.M{"status": -2})
-		util.Es.DelById("bidding_customer", "", fmt.Sprint(id))
+		util.EsCus.DelById("bidding_customer", "", fmt.Sprint(id))
 		if b {
 			e.ServeJson(map[string]interface{}{"rep": true})
 		} else {
@@ -355,7 +355,7 @@ func esSaveFuc(tmp map[string]interface{}, detail string, saveEsArr *[]map[strin
 	}
 	*saveEsArr = append(*saveEsArr, saveEs)
 	if len(*saveEsArr) > 50 {
-		util.BulkSave("bidding_customer", saveEsArr, false, util.Es.(*elastic.EsV7))
+		util.BulkSave("bidding_customer", saveEsArr, false, util.EsCus.(*elastic.EsV7))
 		saveEsArr = &[]map[string]interface{}{}
 	}
 }

CMPlatform/util/config.go

@@ -39,9 +39,10 @@ var (
 	HospColl        string
 	BuyerEntColl    string
 	EnpsColl        string
-	Es              elastic.Es //es
+	Es, EsCus       elastic.Es //es
 	Index           string
 	Itype           string
+	IndexCus        string
 	TaskTime        int64 //定时任务时间
 	//历史数据
 	SId             string
@@ -262,6 +263,10 @@ func initEs() {
 	Es = elastic.NewEs(common.ObjToString(es["version"]), common.ObjToString(es["addr"]), common.IntAllDef(es["pool"], 15), common.ObjToString(es["userName"]), common.ObjToString(es["password"]))
 	Index = common.ObjToString(es["index"])
 	Itype = common.ObjToString(es["itype"])
+	esCm := Sysconfig["es_customer"].(map[string]interface{})
+	EsCus = elastic.NewEs(common.ObjToString(esCm["version"]), common.ObjToString(esCm["addr"]), common.IntAllDef(esCm["pool"], 15), common.ObjToString(esCm["userName"]), common.ObjToString(esCm["password"]))
+	IndexCus = common.ObjToString(esCm["index"])
+
 }
 
 func initTagField() {