master
wangshuai 5 years ago
parent 49564fa066
commit 658173587e

@ -7,6 +7,7 @@ import (
"dsDataex/Utils/ConfigUtil" "dsDataex/Utils/ConfigUtil"
"dsDataex/Utils/DbUtil" "dsDataex/Utils/DbUtil"
"encoding/json" "encoding/json"
"fmt"
"strconv" "strconv"
"time" "time"
) )
@ -19,9 +20,12 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
for no := 0; no < len(datas) && no < 1000; no++ { for no := 0; no < len(datas) && no < 1000; no++ {
var jsonData map[string]interface{} 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 //change by zhangjun 2020-07-23
//IDs =append(IDs,strings.ToLower(id)) //IDs =append(IDs,strings.ToLower(id))
IDs =append(IDs,id) IDs =append(IDs,id)
@ -51,18 +55,21 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
for no:=0;no< len(datas) ;no++{ for no:=0;no< len(datas) ;no++{
var jsonData map[string]interface{} 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 orgType string
var schoolType string var schoolType string
var parentID string var parentID string
switch jsonData["ORG_TYPE"].(type) { switch jsonData["org_type"].(type) {
case float64: case float64:
orgType =strconv.FormatFloat(jsonData["ORG_TYPE"].(float64), 'f', -1, 64) orgType =strconv.FormatFloat(jsonData["org_type"].(float64), 'f', -1, 64)
break break
case string: case string:
orgType = jsonData["ORG_TYPE"].(string) orgType = jsonData["org_type"].(string)
break 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" parentID = "-1"
} else { } else {
if orgType=="1" { if orgType=="1" {
@ -197,10 +204,10 @@ func LuaOrgtreeProcBatch(datas []MySwagger.Data) {
if Contains(updateIDs, IDs[no])>-1 { 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 { }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) sqls=append(sqls,sql)

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

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

@ -135,7 +135,11 @@ func CreateDatasource(model models.TDataexDatasource) (bool, string, error) {
business.CollectFlag = model.CollectFlag business.CollectFlag = model.CollectFlag
business.ProvideType = model.ProvideType business.ProvideType = model.ProvideType
business.ProvideOrgid = html.EscapeString(model.ProvideOrgid) 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.DicId = html.EscapeString(model.DicId)
business.CreateTime = time.Now() business.CreateTime = time.Now()
business.DeleteFlag = -1 business.DeleteFlag = -1

Loading…
Cancel
Save