'commit'

dsDataexV1.1/MyService/DataEX/DataexService/BaseLuaProc.go

@@ -7,6 +7,7 @@ import (
 	"dsDataex/Utils/ConfigUtil"
 	"dsDataex/Utils/DbUtil"
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -19,9 +20,12 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
 	for no := 0; no < len(datas) && no < 1000; no++ {
 		var jsonData map[string]interface{}
 
-		json.Unmarshal([]byte(datas[no].Data), &jsonData)
+		err := json.Unmarshal([]byte(datas[no].Data), &jsonData)
+		if err != nil {
+			fmt.Println(err)
+		}
 
-		var id=strconv.FormatFloat(jsonData["ORG_ID"].(float64), 'f', -1, 64)
+		var id=strconv.FormatFloat(jsonData["org_id"].(float64), 'f', -1, 64)
 		//change by zhangjun 2020-07-23
 		//IDs =append(IDs,strings.ToLower(id))
 		IDs =append(IDs,id)
@@ -51,18 +55,21 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
 	for no:=0;no< len(datas) ;no++{
 
 		var jsonData map[string]interface{}
-		json.Unmarshal([]byte(datas[no].Data), &jsonData)
+		err := json.Unmarshal([]byte(datas[no].Data), &jsonData)
+		if err != nil {
+			fmt.Println(err)
+		}
 
 		var orgType string
 		var schoolType string
 		var parentID string
 
-		switch jsonData["ORG_TYPE"].(type) {
+		switch jsonData["org_type"].(type) {
 		case float64:
-			orgType =strconv.FormatFloat(jsonData["ORG_TYPE"].(float64), 'f', -1, 64)
+			orgType =strconv.FormatFloat(jsonData["org_type"].(float64), 'f', -1, 64)
 			break
 		case string:
-			orgType  = jsonData["ORG_TYPE"].(string)
+			orgType  = jsonData["org_type"].(string)
 			break
 		}
 
@@ -110,7 +117,7 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
 			}
 		}
 
-		if ConfigUtil.ROOT_ORGNAME == jsonData["ORG_NAME"].(string) {
+		if ConfigUtil.ROOT_ORGNAME == jsonData["org_name"].(string) {
 			parentID = "-1"
 		} else {
 			if orgType=="1" {
@@ -197,10 +204,10 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
 
 		if  Contains(updateIDs, IDs[no])>-1 {
 
-			sql = "update t_dataex_orgtree set org_name = '" + jsonData["ORG_NAME"].(string)+"',org_type="+ orgType +",school_type='"+schoolType+"',parent_id ='" + parentID + "',province_id='"+provinceId+"',city_id='"+cityId+"',area_id='"+areaId+"',change_time='"+time.Now().Format("2006-01-02 15:04:05")+"' where id='" + IDs[no] + "'"
+			sql = "update t_dataex_orgtree set org_name = '" + jsonData["org_name"].(string)+"',org_type="+ orgType +",school_type='"+schoolType+"',parent_id ='" + parentID + "',province_id='"+provinceId+"',city_id='"+cityId+"',area_id='"+areaId+"',change_time='"+time.Now().Format("2006-01-02 15:04:05")+"' where id='" + IDs[no] + "'"
 		}else {
 
-			sql = "insert into t_dataex_orgtree (id,org_name,org_type,school_type,parent_id,province_id,city_id,area_id,create_time,delete_flag,enable_flag) values ('"+ IDs[no] +"','"+jsonData["ORG_NAME"].(string)+"',"+orgType+",'"+schoolType+"','"+parentID+"','"+provinceId+"','"+cityId+"','"+areaId+"','"+time.Now().Format("2006-01-02 15:04:05")+"',-1,1)"
+			sql = "insert into t_dataex_orgtree (id,org_name,org_type,school_type,parent_id,province_id,city_id,area_id,create_time,delete_flag,enable_flag) values ('"+ IDs[no] +"','"+jsonData["org_name"].(string)+"',"+orgType+",'"+schoolType+"','"+parentID+"','"+provinceId+"','"+cityId+"','"+areaId+"','"+time.Now().Format("2006-01-02 15:04:05")+"',-1,1)"
 		}
 
 		sqls=append(sqls,sql)

dsDataexV1.1/MyService/DataEX/DataexService/DataexService.go

@@ -339,7 +339,7 @@ func DataexSetBatch(systemID string, datas []MySwagger.Data,datasource *models.T
 	if datasource.DatasourceCode=="org_school" && systemID=="BASE_GO"{
 		OrgtreeProcBatch(datas)
 	}
-	if datasource.DatasourceCode=="org_school_lua" && systemID=="BASE_LUA"{
+	if datasource.DatasourceCode=="org_school" && systemID=="YPT"{
 		LuaOrgtreeProcBatch(datas)
 	}
 	if datasource.DatasourceCode=="org_school_java" && systemID=="BASE_JAVA"{

dsDataexV1.1/main.go

@@ -55,7 +55,7 @@ func GinServerInit() {
 	//add by wangshuai 2020-07-14
 	r.Static("/docs", "./docs")
 	//add by wangshuai 2020-11-03
-	r.Static("/dsDataex", "./html")
+	r.Static("/dsDataex", "./Html")
 	//r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 
 	//主路由

dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go

@@ -135,7 +135,11 @@ func CreateDatasource(model models.TDataexDatasource) (bool, string, error) {
 	business.CollectFlag = model.CollectFlag
 	business.ProvideType = model.ProvideType
 	business.ProvideOrgid = html.EscapeString(model.ProvideOrgid)
-	business.DatastoreType = model.DatastoreType
+	if model.DatastoreType != 0 {
+		business.DatastoreType = model.DatastoreType
+	} else {
+		business.DatastoreType = 2
+	}
 	business.DicId = html.EscapeString(model.DicId)
 	business.CreateTime = time.Now()
 	business.DeleteFlag = -1