Merge branch 'master' of 10.10.14.250:huanghai/dsMin

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++{

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)

dsSupport/Shell/start.sh

@@ -7,3 +7,4 @@ sleep 3
 chmod +x dsSupport
 # 运行为后台进程
 nohup /usr/local/dsMin/dsSupport/dsSupport  >> /usr/local/dsMin/dsSupport/dsSupport.log 2>&1 &
+

dsSupport/docs/docs.go

@@ -2775,7 +2775,37 @@ var doc = `{
                 }
             }
         }
-    }
+    },
+    "tags": [
+        {
+            "description": "数据订阅",
+            "name": "dataaccess"
+        },
+        {
+            "description": "数据异常",
+            "name": "dataerror"
+        },
+        {
+            "description": "数据源",
+            "name": "datasource"
+        },
+        {
+            "description": "数据统计",
+            "name": "datastatistic"
+        },
+        {
+            "description": "字典",
+            "name": "jyt2012"
+        },
+        {
+            "description": "元数据",
+            "name": "metadata"
+        },
+        {
+            "description": "机构目录",
+            "name": "orgtree"
+        }
+    ]
 }`
 
 type swaggerInfo struct {

dsSupport/docs/swagger.json

@@ -2759,5 +2759,35 @@
                 }
             }
         }
-    }
+    },
+    "tags": [
+        {
+            "description": "数据订阅",
+            "name": "dataaccess"
+        },
+        {
+            "description": "数据异常",
+            "name": "dataerror"
+        },
+        {
+            "description": "数据源",
+            "name": "datasource"
+        },
+        {
+            "description": "数据统计",
+            "name": "datastatistic"
+        },
+        {
+            "description": "字典",
+            "name": "jyt2012"
+        },
+        {
+            "description": "元数据",
+            "name": "metadata"
+        },
+        {
+            "description": "机构目录",
+            "name": "orgtree"
+        }
+    ]
 }

dsSupport/docs/swagger.yaml

@@ -2068,3 +2068,18 @@ paths:
       tags:
       - orgtree
 swagger: "2.0"
+tags:
+- description: 数据订阅
+  name: dataaccess
+- description: 数据异常
+  name: dataerror
+- description: 数据源
+  name: datasource
+- description: 数据统计
+  name: datastatistic
+- description: 字典
+  name: jyt2012
+- description: 元数据
+  name: metadata
+- description: 机构目录
+  name: orgtree

dsSupport/main.go

@@ -27,6 +27,20 @@ import (
 // @contact.email support@swagger.io
 // @license.name Apache 2.0
 // @license.url http://www.apache.org/licenses/LICENSE-2.0.html
+// @tag.name dataaccess
+// @tag.description 数据订阅
+// @tag.name dataerror
+// @tag.description 数据异常
+// @tag.name datasource
+// @tag.description 数据源
+// @tag.name datastatistic
+// @tag.description 数据统计
+// @tag.name jyt2012
+// @tag.description 字典
+// @tag.name metadata
+// @tag.description 元数据
+// @tag.name orgtree
+// @tag.description 机构目录
 // @host 127.0.0.1:8005
 func main() {
 	// 发布模式