diff --git a/dsDataex/MyService/DataEX/DataexService/DataexService.go b/dsDataex/MyService/DataEX/DataexService/DataexService.go index 1826bcc9..44b1249a 100644 --- a/dsDataex/MyService/DataEX/DataexService/DataexService.go +++ b/dsDataex/MyService/DataEX/DataexService/DataexService.go @@ -9,7 +9,6 @@ import ( "dsDataex/Utils/CommonUtil" "dsDataex/Utils/ES7Util" "dsDataex/Utils/KafkaUtil" - "dsDataex/Utils/ValidationUtil" "encoding/json" "fmt" "strconv" @@ -387,11 +386,11 @@ func DataexSetBatch(systemID string, datas []MySwagger.Data,datasource *models.T //校验ESDataContent //add by wangshuai 2020-09-16 - _, _, successDatas, failureIDs := ValidationUtil.ValidESDataContent(esData.DatasourceId, datas) + //_, _, successDatas, failureIDs := ValidationUtil.ValidESDataContent(esData.DatasourceId, datas) //将校验通过数据赋值给datas - datas = successDatas + //datas = successDatas //将校验失败数据赋值给failIDs - dataContentFailIDs = failureIDs + //dataContentFailIDs = failureIDs //四、循环添加索引文档 for no:=0;no< len(datas) && no<1000 ;no++{ diff --git a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go index 86981f11..74bca4a4 100644 --- a/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go +++ b/dsSupport/MyModel/MetaData/MetadataService/MetadataService.go @@ -166,8 +166,8 @@ func RemoveMetadata(id string) (bool, string, error) { func CreateMetadataES(indexName string) (bool, string, error) { res, _, datasourceId, _ := DatasourceDAO.GetDatasourceIdByCode(indexName) if res == true { - if MetadataDAO.IsMetadataExistsByDatasourceCode(datasourceId.(string)) == true { - MetadataDAO.DeleteMetadataByDatasourceCode(datasourceId.(string)) + if MetadataDAO.IsMetadataExistsByDatasourceCode(indexName) == true { + MetadataDAO.DeleteMetadataByDatasourceCode(indexName) } fmt.Println("datasourceId: ", datasourceId) result := ES7Util.IndexDataContentMapping(indexName)