Merge branch 'cygx_10.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/es_comprehensive.go

@@ -217,7 +217,6 @@ func AddComprehensiveActivity() {
 		fmt.Println(err)
 		return
 	}
-	indexName := utils.IndexNameComprehensive
 	IndustrialManagementRespMap, _ := GetIndustrialManagementRespMap()
 	IndustrialSubjectMap, _ := GetCygxIndustrialSubjectMap()
 	var condition1 string
@@ -265,7 +264,7 @@ func AddComprehensiveActivity() {
 		//item.Abstract, _ = GetReportContentTextSubNew(v.Abstract)
 
 		//EsAddOrEditComprehensiveData(indexName, item)
-		EsDeleteComprehensiveData(indexName, item)
+		EsAddOrEditComprehensiveData(item)
 		fmt.Println(item)
 	}
 }
@@ -600,13 +599,14 @@ func EsAddOrEditComprehensiveData(item *ElasticComprehensiveDetail) (err error)
 }
 
 // 删除数据
-func EsDeleteComprehensiveData(indexName string, item *ElasticComprehensiveDetail) (err error) {
+func EsDeleteComprehensiveData(item *ElasticComprehensiveDetail) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
 			go utils.SendAlarmMsg("删除数据综合页面数据Es失败"+err.Error()+fmt.Sprint(item), 2)
 		}
 	}()
+	indexName := utils.IndexNameComprehensive
 	client := utils.Client
 	//拼接需要删除的前置条件
 	bool_query := elastic.NewBoolQuery()