master
wangshuai 5 years ago
parent b9d794b347
commit 84f878a5cd

@ -9,7 +9,6 @@ import (
"dsDataex/Utils/CommonUtil" "dsDataex/Utils/CommonUtil"
"dsDataex/Utils/ES7Util" "dsDataex/Utils/ES7Util"
"dsDataex/Utils/KafkaUtil" "dsDataex/Utils/KafkaUtil"
"dsDataex/Utils/ValidationUtil"
"encoding/json" "encoding/json"
"fmt" "fmt"
"strconv" "strconv"
@ -387,11 +386,11 @@ func DataexSetBatch(systemID string, datas []MySwagger.Data,datasource *models.T
//校验ESDataContent //校验ESDataContent
//add by wangshuai 2020-09-16 //add by wangshuai 2020-09-16
_, _, successDatas, failureIDs := ValidationUtil.ValidESDataContent(esData.DatasourceId, datas) //_, _, successDatas, failureIDs := ValidationUtil.ValidESDataContent(esData.DatasourceId, datas)
//将校验通过数据赋值给datas //将校验通过数据赋值给datas
datas = successDatas //datas = successDatas
//将校验失败数据赋值给failIDs //将校验失败数据赋值给failIDs
dataContentFailIDs = failureIDs //dataContentFailIDs = failureIDs
//四、循环添加索引文档 //四、循环添加索引文档
for no:=0;no< len(datas) && no<1000 ;no++{ for no:=0;no< len(datas) && no<1000 ;no++{

@ -166,8 +166,8 @@ func RemoveMetadata(id string) (bool, string, error) {
func CreateMetadataES(indexName string) (bool, string, error) { func CreateMetadataES(indexName string) (bool, string, error) {
res, _, datasourceId, _ := DatasourceDAO.GetDatasourceIdByCode(indexName) res, _, datasourceId, _ := DatasourceDAO.GetDatasourceIdByCode(indexName)
if res == true { if res == true {
if MetadataDAO.IsMetadataExistsByDatasourceCode(datasourceId.(string)) == true { if MetadataDAO.IsMetadataExistsByDatasourceCode(indexName) == true {
MetadataDAO.DeleteMetadataByDatasourceCode(datasourceId.(string)) MetadataDAO.DeleteMetadataByDatasourceCode(indexName)
} }
fmt.Println("datasourceId: ", datasourceId) fmt.Println("datasourceId: ", datasourceId)
result := ES7Util.IndexDataContentMapping(indexName) result := ES7Util.IndexDataContentMapping(indexName)

Loading…
Cancel
Save