Jianghan преди 1 година
родител
ревизия
05b6e30b10
променени са 2 файла, в които са добавени 28 реда и са изтрити 2 реда
  1. 2 2
      CMPlatform/service/data_ent.go
  2. 26 0
      CMPlatform/util/util.go

+ 2 - 2
CMPlatform/service/data_ent.go

@@ -49,7 +49,7 @@ func (e *EntData) ImportData() {
 		}
 		importDataNum, pici, msg := ImportDataByExcel(mf, eid, entid)
 		if importDataNum == 0 {
-			e.ServeJson(map[string]interface{}{"success": false, "msg": msg})
+			e.ServeJson(map[string]interface{}{"success": false, "msg": "文档导入失败"})
 			return
 		}
 		userName := ""
@@ -386,5 +386,5 @@ func esSaveFuc(tmp map[string]interface{}, detail string) {
 			saveEs[f] = tmp[f]
 		}
 	}
-	util.EsCus.Save("bidding_customer", "", saveEs)
+	util.Save("bidding_customer", saveEs, util.EsCus.(*elastic.EsV7))
 }

+ 26 - 0
CMPlatform/util/util.go

@@ -110,6 +110,32 @@ func BulkSave(index string, obj *[]map[string]interface{}, isDelBefore bool, e *
 	}
 }
 
+func Save(index string, obj map[string]interface{}, e *elastic.EsV7) bool {
+	client := e.GetEsConn()
+	defer e.DestoryEsConn(client)
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+	_id := fmt.Sprint(obj["id"])
+	_, err := client.Index().Index(index).Id(_id).BodyJson(obj).Do(context.TODO())
+	if err != nil {
+		log.Println("保存到ES出错", err.Error(), obj)
+		return false
+	} else {
+		return true
+	}
+
+}
+
 func DelBy(index string, query interface{}, e *elastic.EsV7) bool {
 	client := e.GetEsConn()
 	defer e.DestoryEsConn(client)