bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://10.10.14.250:3000/huanghai/dsMin

Browse Source
master
黄海 5 years ago
parent ed8ec84c03 4c35dd5222
commit 47148a3c88
7 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File

46
BigDataSql/学校规模情况.txt
Unescape View File

@ -0,0 +1,46 @@
select a as stage,sum(c1) as studentno,sum(c2) as schoolno from (
SELECT '小学' as a,sum(j+k+l+m+n+o) as c1,0 as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J312 as j on j.instanceid =it.instanceid and j.did in (1,37,38,39,40,41,42,43,44,45,46,47)
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211','218','219','312','345') and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
group by sbr.cityCountryGroup
union all
SELECT '初中' as a,sum(i+j+k+l) as c1,0 as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J313 as j on j.instanceid =it.instanceid and j.did in (1,36,37,38,39,40,41,42,43,44)
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','319','321','341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
group by sbr.cityCountryGroup
union all
SELECT '高中' as a,sum(i+j+k) as c1,0 as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J314 as j on j.instanceid =it.instanceid and did in (1,11,12,13,14,15,16,17,18,19)
inner join v_areainfo va on va.region_name =sbr.gatherregionc
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('341','342','345','349') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
group by sbr.cityCountryGroup
union all
SELECT '小学' as a,0 as c1,count(*) as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J412 as j on j.instanceid =it.instanceid and j.did =1
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('211') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
union all
SELECT '初中' as a,0 as c1,count(*) as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J412 as j on j.instanceid =it.instanceid and j.did =1
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('311','312','341','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
union all
SELECT '高中' as a,0 as c1,count(*) as c2
from schoolBusinessRelation sbr
inner join instanceTable it on sbr.organizationNo =it.organizationNo and sbr.businesstypeno =it.businesstypeno
inner join J412 as j on j.instanceid =it.instanceid and j.did =1
where sbr.gatherRegionB ='长春市' and sbr.businessTypeNo in('341','342','345') and sbr.isLastYearCancel =0 and sbr.recordyear =2019 and it.recordyear =2019 and j.recordyear =2019
) t
group by a;

BIN
Report/045特殊教育学校基本情况.rpx
View File

Binary file not shown.

25
dsDataexV1.1/MyService/DataEX/DataexService/BaseLuaProc.go
Unescape View File

@ -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)

2
dsDataexV1.1/MyService/DataEX/DataexService/DataexService.go
Unescape View File

@ -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"{

2
dsDataexV1.1/main.go
Unescape View File

@ -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))
//主路由

BIN
dsSso/接入示例/统一认证服务接入系统集成开发手册V3.0.doc
View File

Binary file not shown.

6
dsSupport/MyModel/DataSource/DatasourceService/DatasourceService.go
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save