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

update

Browse Source
master
wubin 5 years ago
parent 972aa4d6bc
commit 67b25bdde3
4 changed files with 261 additions and 260 deletions
Show Stats Download Patch File Download Diff File

256
dsBaseWeb/docs/docs.go
Unescape View File

@ -2059,12 +2059,12 @@ var doc = `{
"version": "1.0"
},
"paths": {
"/base/business/UpdateBaseBusiness": {
"/base/business/AddBaseBusiness": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "修改业务系统信息",
"description": "增加业务系统信息",
"parameters": [
{
"description": "业务系统编码",
@ -2092,7 +2092,7 @@ var doc = `{
}
}
},
"summary": "修改业务系统信息",
"summary": "增加业务系统信息",
"tags": [
"业务系统维护"
],
@ -2102,7 +2102,7 @@ var doc = `{
],
"x-lengthlimit": [
{
"businessCode": "6,6"
"businessCode": "6:6"
},
{
"businessName": "1:50"
@ -2113,55 +2113,12 @@ var doc = `{
]
}
},
"/base/business/GetBaseBusiness": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取业务系统信息(单条)",
"parameters": [
{
"description": "业务系统编码",
"in": "query",
"name": "businessCode",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Model.Res"
}
}
},
"summary": "获取业务系统信息(单条)",
"tags": [
"业务系统维护"
],
"x-emptylimit": [
"businessCode"
],
"x-lengthlimit": [
{
"businessCode": "6,6"
}
],
"x-rolelimit": [
"1"
]
}
},
"/base/business/AddBaseBusiness": {
"/base/business/UpdateBaseBusiness": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "增加业务系统信息",
"description": "修改业务系统信息",
"parameters": [
{
"description": "业务系统编码",
@ -2189,7 +2146,7 @@ var doc = `{
}
}
},
"summary": "增加业务系统信息",
"summary": "修改业务系统信息",
"tags": [
"业务系统维护"
],
@ -2199,7 +2156,7 @@ var doc = `{
],
"x-lengthlimit": [
{
"businessCode": "6:6"
"businessCode": "6,6"
},
{
"businessName": "1:50"
@ -2303,6 +2260,49 @@ var doc = `{
]
}
},
"/base/business/GetBaseBusiness": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取业务系统信息(单条)",
"parameters": [
{
"description": "业务系统编码",
"in": "query",
"name": "businessCode",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Model.Res"
}
}
},
"summary": "获取业务系统信息(单条)",
"tags": [
"业务系统维护"
],
"x-emptylimit": [
"businessCode"
],
"x-lengthlimit": [
{
"businessCode": "6,6"
}
],
"x-rolelimit": [
"1"
]
}
},
"/base/global/PageGlobalInfo": {
"get": {
"consumes": [
@ -7652,12 +7652,12 @@ var doc = `{
]
}
},
"/base/organization/PageSchoolInfo": {
"/base/organization/PageMainSchoolInfo": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取学校列表",
"description": "获取主校列表",
"parameters": [
{
"description": "第几页",
@ -7681,16 +7681,9 @@ var doc = `{
"type": "string"
},
{
"description": "学校办学类型 -1：全部",
"in": "query",
"name": "xxbxlxm",
"required": true,
"type": "string"
},
{
"description": "学校名称",
"description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID",
"in": "query",
"name": "orgName",
"name": "orgId",
"type": "string"
}
],
@ -7701,11 +7694,11 @@ var doc = `{
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/base.organization.PageSchoolInfo"
"$ref": "#/definitions/base.organization.PageMainSchoolInfo"
}
}
},
"summary": "获取学校列表",
"summary": "获取主校列表",
"tags": [
"组织机构"
],
@ -7735,9 +7728,6 @@ var doc = `{
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"orgName": "1,30"
}
],
"x-removeswaggerfield": [
@ -7781,12 +7771,12 @@ var doc = `{
]
}
},
"/base/organization/PageMainSchoolInfo": {
"/base/organization/PageSchoolInfo": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取主校列表",
"description": "获取学校列表",
"parameters": [
{
"description": "第几页",
@ -7810,9 +7800,16 @@ var doc = `{
"type": "string"
},
{
"description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID",
"description": "学校办学类型 -1：全部",
"in": "query",
"name": "orgId",
"name": "xxbxlxm",
"required": true,
"type": "string"
},
{
"description": "学校名称",
"in": "query",
"name": "orgName",
"type": "string"
}
],
@ -7823,11 +7820,11 @@ var doc = `{
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/base.organization.PageMainSchoolInfo"
"$ref": "#/definitions/base.organization.PageSchoolInfo"
}
}
},
"summary": "获取主校列表",
"summary": "获取学校列表",
"tags": [
"组织机构"
],
@ -7857,6 +7854,9 @@ var doc = `{
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"orgName": "1,30"
}
],
"x-removeswaggerfield": [
@ -8919,12 +8919,12 @@ var doc = `{
]
}
},
"/base/area/DeleteGovArea": {
"/base/area/UpdateGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "删除行政区划信息",
"description": "修改行政区划信息",
"parameters": [
{
"description": "区域代码",
@ -8932,6 +8932,27 @@ var doc = `{
"name": "areaCode",
"required": true,
"type": "string"
},
{
"description": "区域名称",
"in": "formData",
"name": "areaName",
"required": true,
"type": "string"
},
{
"description": "上级代码",
"in": "formData",
"name": "masterCode",
"required": true,
"type": "string"
},
{
"description": "区域类型",
"in": "formData",
"name": "areaTypeId",
"required": true,
"type": "integer"
}
],
"produces": [
@ -8945,16 +8966,28 @@ var doc = `{
}
}
},
"summary": "删除行政区划信息",
"summary": "修改行政区划信息",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaCode"
"areaTypeId",
"areaCode",
"areaName",
"masterCode"
],
"x-intlimit": [
"areaTypeId"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"masterCode": "6,6"
},
{
"areaName": "3:50"
}
],
"x-rolelimit": [
@ -8968,40 +9001,19 @@ var doc = `{
]
}
},
"/base/area/AddGovArea": {
"post": {
"/base/area/GetGovArea": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "增加行政区划信息",
"description": "获取行政区划信息(单条)",
"parameters": [
{
"description": "区域代码",
"in": "formData",
"description": "行政区划码",
"in": "query",
"name": "areaCode",
"required": true,
"type": "string"
},
{
"description": "区域名称",
"in": "formData",
"name": "areaName",
"required": true,
"type": "string"
},
{
"description": "上级代码",
"in": "formData",
"name": "masterCode",
"required": true,
"type": "string"
},
{
"description": "区域类型",
"in": "formData",
"name": "areaTypeId",
"required": true,
"type": "integer"
}
],
"produces": [
@ -9015,28 +9027,19 @@ var doc = `{
}
}
},
"summary": "增加行政区划信息",
"summary": "获取行政区划信息(单条)",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaTypeId",
"areaCode",
"areaName",
"masterCode"
"areaCode"
],
"x-intlimit": [
"areaTypeId"
"areaCode"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"masterCode": "6,6"
},
{
"areaName": "3,50"
}
],
"x-rolelimit": [
@ -9123,16 +9126,16 @@ var doc = `{
]
}
},
"/base/area/GetGovArea": {
"get": {
"/base/area/DeleteGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取行政区划信息(单条)",
"description": "删除行政区划信息",
"parameters": [
{
"description": "行政区划码",
"in": "query",
"description": "区域代码",
"in": "formData",
"name": "areaCode",
"required": true,
"type": "string"
@ -9149,16 +9152,13 @@ var doc = `{
}
}
},
"summary": "获取行政区划信息(单条)",
"summary": "删除行政区划信息",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaCode"
],
"x-intlimit": [
"areaCode"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
@ -9175,12 +9175,12 @@ var doc = `{
]
}
},
"/base/area/UpdateGovArea": {
"/base/area/AddGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "修改行政区划信息",
"description": "增加行政区划信息",
"parameters": [
{
"description": "区域代码",
@ -9222,7 +9222,7 @@ var doc = `{
}
}
},
"summary": "修改行政区划信息",
"summary": "增加行政区划信息",
"tags": [
"行政区划"
],
@ -9243,7 +9243,7 @@ var doc = `{
"masterCode": "6,6"
},
{
"areaName": "3:50"
"areaName": "3,50"
}
],
"x-rolelimit": [

256
dsBaseWeb/docs/swagger.json
Unescape View File

@ -2044,12 +2044,12 @@
"version": "1.0"
},
"paths": {
"/base/business/UpdateBaseBusiness": {
"/base/business/AddBaseBusiness": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "修改业务系统信息",
"description": "增加业务系统信息",
"parameters": [
{
"description": "业务系统编码",
@ -2077,7 +2077,7 @@
}
}
},
"summary": "修改业务系统信息",
"summary": "增加业务系统信息",
"tags": [
"业务系统维护"
],
@ -2087,7 +2087,7 @@
],
"x-lengthlimit": [
{
"businessCode": "6,6"
"businessCode": "6:6"
},
{
"businessName": "1:50"
@ -2098,55 +2098,12 @@
]
}
},
"/base/business/GetBaseBusiness": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取业务系统信息(单条)",
"parameters": [
{
"description": "业务系统编码",
"in": "query",
"name": "businessCode",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Model.Res"
}
}
},
"summary": "获取业务系统信息(单条)",
"tags": [
"业务系统维护"
],
"x-emptylimit": [
"businessCode"
],
"x-lengthlimit": [
{
"businessCode": "6,6"
}
],
"x-rolelimit": [
"1"
]
}
},
"/base/business/AddBaseBusiness": {
"/base/business/UpdateBaseBusiness": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "增加业务系统信息",
"description": "修改业务系统信息",
"parameters": [
{
"description": "业务系统编码",
@ -2174,7 +2131,7 @@
}
}
},
"summary": "增加业务系统信息",
"summary": "修改业务系统信息",
"tags": [
"业务系统维护"
],
@ -2184,7 +2141,7 @@
],
"x-lengthlimit": [
{
"businessCode": "6:6"
"businessCode": "6,6"
},
{
"businessName": "1:50"
@ -2288,6 +2245,49 @@
]
}
},
"/base/business/GetBaseBusiness": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取业务系统信息(单条)",
"parameters": [
{
"description": "业务系统编码",
"in": "query",
"name": "businessCode",
"required": true,
"type": "string"
}
],
"produces": [
"application/json"
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/Model.Res"
}
}
},
"summary": "获取业务系统信息(单条)",
"tags": [
"业务系统维护"
],
"x-emptylimit": [
"businessCode"
],
"x-lengthlimit": [
{
"businessCode": "6,6"
}
],
"x-rolelimit": [
"1"
]
}
},
"/base/global/PageGlobalInfo": {
"get": {
"consumes": [
@ -7637,12 +7637,12 @@
]
}
},
"/base/organization/PageSchoolInfo": {
"/base/organization/PageMainSchoolInfo": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取学校列表",
"description": "获取主校列表",
"parameters": [
{
"description": "第几页",
@ -7666,16 +7666,9 @@
"type": "string"
},
{
"description": "学校办学类型 -1：全部",
"in": "query",
"name": "xxbxlxm",
"required": true,
"type": "string"
},
{
"description": "学校名称",
"description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID",
"in": "query",
"name": "orgName",
"name": "orgId",
"type": "string"
}
],
@ -7686,11 +7679,11 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/base.organization.PageSchoolInfo"
"$ref": "#/definitions/base.organization.PageMainSchoolInfo"
}
}
},
"summary": "获取学校列表",
"summary": "获取主校列表",
"tags": [
"组织机构"
],
@ -7720,9 +7713,6 @@
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"orgName": "1,30"
}
],
"x-removeswaggerfield": [
@ -7766,12 +7756,12 @@
]
}
},
"/base/organization/PageMainSchoolInfo": {
"/base/organization/PageSchoolInfo": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取主校列表",
"description": "获取学校列表",
"parameters": [
{
"description": "第几页",
@ -7795,9 +7785,16 @@
"type": "string"
},
{
"description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID",
"description": "学校办学类型 -1：全部",
"in": "query",
"name": "orgId",
"name": "xxbxlxm",
"required": true,
"type": "string"
},
{
"description": "学校名称",
"in": "query",
"name": "orgName",
"type": "string"
}
],
@ -7808,11 +7805,11 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/base.organization.PageMainSchoolInfo"
"$ref": "#/definitions/base.organization.PageSchoolInfo"
}
}
},
"summary": "获取主校列表",
"summary": "获取学校列表",
"tags": [
"组织机构"
],
@ -7842,6 +7839,9 @@
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"orgName": "1,30"
}
],
"x-removeswaggerfield": [
@ -8904,12 +8904,12 @@
]
}
},
"/base/area/DeleteGovArea": {
"/base/area/UpdateGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "删除行政区划信息",
"description": "修改行政区划信息",
"parameters": [
{
"description": "区域代码",
@ -8917,6 +8917,27 @@
"name": "areaCode",
"required": true,
"type": "string"
},
{
"description": "区域名称",
"in": "formData",
"name": "areaName",
"required": true,
"type": "string"
},
{
"description": "上级代码",
"in": "formData",
"name": "masterCode",
"required": true,
"type": "string"
},
{
"description": "区域类型",
"in": "formData",
"name": "areaTypeId",
"required": true,
"type": "integer"
}
],
"produces": [
@ -8930,16 +8951,28 @@
}
}
},
"summary": "删除行政区划信息",
"summary": "修改行政区划信息",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaCode"
"areaTypeId",
"areaCode",
"areaName",
"masterCode"
],
"x-intlimit": [
"areaTypeId"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"masterCode": "6,6"
},
{
"areaName": "3:50"
}
],
"x-rolelimit": [
@ -8953,40 +8986,19 @@
]
}
},
"/base/area/AddGovArea": {
"post": {
"/base/area/GetGovArea": {
"get": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "增加行政区划信息",
"description": "获取行政区划信息(单条)",
"parameters": [
{
"description": "区域代码",
"in": "formData",
"description": "行政区划码",
"in": "query",
"name": "areaCode",
"required": true,
"type": "string"
},
{
"description": "区域名称",
"in": "formData",
"name": "areaName",
"required": true,
"type": "string"
},
{
"description": "上级代码",
"in": "formData",
"name": "masterCode",
"required": true,
"type": "string"
},
{
"description": "区域类型",
"in": "formData",
"name": "areaTypeId",
"required": true,
"type": "integer"
}
],
"produces": [
@ -9000,28 +9012,19 @@
}
}
},
"summary": "增加行政区划信息",
"summary": "获取行政区划信息(单条)",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaTypeId",
"areaCode",
"areaName",
"masterCode"
"areaCode"
],
"x-intlimit": [
"areaTypeId"
"areaCode"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
},
{
"masterCode": "6,6"
},
{
"areaName": "3,50"
}
],
"x-rolelimit": [
@ -9108,16 +9111,16 @@
]
}
},
"/base/area/GetGovArea": {
"get": {
"/base/area/DeleteGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "获取行政区划信息(单条)",
"description": "删除行政区划信息",
"parameters": [
{
"description": "行政区划码",
"in": "query",
"description": "区域代码",
"in": "formData",
"name": "areaCode",
"required": true,
"type": "string"
@ -9134,16 +9137,13 @@
}
}
},
"summary": "获取行政区划信息(单条)",
"summary": "删除行政区划信息",
"tags": [
"行政区划"
],
"x-emptylimit": [
"areaCode"
],
"x-intlimit": [
"areaCode"
],
"x-lengthlimit": [
{
"areaCode": "6,6"
@ -9160,12 +9160,12 @@
]
}
},
"/base/area/UpdateGovArea": {
"/base/area/AddGovArea": {
"post": {
"consumes": [
"application/x-www-form-urlencoded"
],
"description": "修改行政区划信息",
"description": "增加行政区划信息",
"parameters": [
{
"description": "区域代码",
@ -9207,7 +9207,7 @@
}
}
},
"summary": "修改行政区划信息",
"summary": "增加行政区划信息",
"tags": [
"行政区划"
],
@ -9228,7 +9228,7 @@
"masterCode": "6,6"
},
{
"areaName": "3:50"
"areaName": "3,50"
}
],
"x-rolelimit": [

9
dsBigData/Business/Student/StudentDao/StudentDao.go
Unescape View File

@ -192,7 +192,7 @@ func GetStudentCountAggsOrgId(schoolIds []string) ([]StudentModel.StudentCountAg
}
func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.StudentCountRxnf, error) {
/*
endYear := time.Now().Year()
startYear := 0
month := CommonUtil.ConvertStringToInt32(time.Now().Format("1"))
@ -205,16 +205,17 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St
} else {
startYear = endYear - 2
}
*/
orgIdTerm := elastic.NewTermQuery("org_id", schoolId)
stageIdTerm := elastic.NewTermQuery("data_content.stage_id", stageId)
rxnfRang := elastic.NewRangeQuery("data_content.rxnf").Gte(startYear).Lte(endYear)
//rxnfRang := elastic.NewRangeQuery("data_content.rxnf").Gte(startYear).Lte(endYear)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
boolQuery := elastic.NewBoolQuery().Must(orgIdTerm, stageIdTerm, bUseTerm, rxnfRang, enableFlagTerm, delFlagTerm)
boolQuery := elastic.NewBoolQuery().Must(orgIdTerm, stageIdTerm, bUseTerm, enableFlagTerm, delFlagTerm)
//boolQuery := elastic.NewBoolQuery().Must(orgIdTerm, stageIdTerm, bUseTerm, rxnfRang, enableFlagTerm, delFlagTerm)
//rxnfHistogramAggregation := elastic.NewHistogramAggregation().Field("data_content.rxnf").MinDocCount(0).ExtendedBounds(float64(startYear), float64(endYear)).Interval(1)
rxnfAggs := elastic.

BIN
dsBigData/build/dsBigData
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save