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

update

Browse Source
master
wubin 5 years ago
parent 96d5d9484f
commit 23e5cc6464
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File

45
dsBigData/Business/School/SchoolDao/SchoolDao.go
Unescape View File

@ -18,7 +18,7 @@ func PageEduAssistInfoByDistrictCode(districtCode string) ([]SchoolModel.EduAssi
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
districtCodeTerm := elastic.NewTermQuery("district_code", districtCode) districtCodeTerm := elastic.NewTermQuery("district_code", districtCode)
orgTypeTerm := elastic.NewTermQuery("org_type", "3") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm, bUseTerm) boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm, bUseTerm)
@ -42,10 +42,8 @@ func PageEduAssistInfoByDistrictCode(districtCode string) ([]SchoolModel.EduAssi
resCount := gjson.Get(resStr, "total.value") resCount := gjson.Get(resStr, "total.value")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var eduAssist SchoolModel.EduAssist var eduAssist SchoolModel.EduAssist
//eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str
//eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str
eduAssist.EduAssistId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str
eduAssist.EduAssistName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str
eduAssistArr = append(eduAssistArr, eduAssist) eduAssistArr = append(eduAssistArr, eduAssist)
} }
return eduAssistArr, nil return eduAssistArr, nil
@ -61,7 +59,7 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
districtCodeTerm := elastic.NewTermQuery("district_code", districtCode) districtCodeTerm := elastic.NewTermQuery("district_code", districtCode)
orgTypeTerm := elastic.NewTermQuery("org_type", "2") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
var boolQuery *elastic.BoolQuery var boolQuery *elastic.BoolQuery
if xxbxlxm == "-1" { if xxbxlxm == "-1" {
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm) boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm)
@ -86,10 +84,8 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School
resCount := gjson.Get(resStr, "total.value") resCount := gjson.Get(resStr, "total.value")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var school SchoolModel.School var school SchoolModel.School
//school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str
//school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str
school.SchoolId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str
school.SchoolName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str
schoolArr = append(schoolArr, school) schoolArr = append(schoolArr, school)
} }
return schoolArr, nil return schoolArr, nil
@ -98,7 +94,7 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School
func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssistCountAggsDistrict, error) { func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssistCountAggsDistrict, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
orgTypeTerm := elastic.NewTermQuery("org_type", "3") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
cityCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...) cityCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...)
@ -138,7 +134,7 @@ func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssis
func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.SchoolCountAggsDistrict, error) { func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.SchoolCountAggsDistrict, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
orgTypeTerm := elastic.NewTermQuery("org_type", "2") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...) cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...)
@ -178,14 +174,14 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School
func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel.SchoolCountAggsXxbxlx, error) { func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel.SchoolCountAggsXxbxlx, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
orgTypeTerm := elastic.NewTermQuery("org_type", "2") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
districtCodeTerm := elastic.NewTermQuery("district_code", districtCode) districtCodeTerm := elastic.NewTermQuery("district_code", districtCode)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, orgTypeTerm, districtCodeTerm) boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, orgTypeTerm, districtCodeTerm)
xxbxlxAggs := elastic. xxbxlxAggs := elastic.
NewTermsAggregation(). NewTermsAggregation().
Field("school_type"). Field("data_content.xxbxlxm").
Size(50) Size(50)
result, err := esClient.Search(). result, err := esClient.Search().
@ -224,7 +220,7 @@ aggsXxbxlx：是否需要办学类型的子聚合 true：需要 false：不需
func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]SchoolModel.SchoolCountAggsDistrict, error) { func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]SchoolModel.SchoolCountAggsDistrict, error) {
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
orgTypeTerm := elastic.NewTermQuery("org_type", "2") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...) cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...)
@ -283,7 +279,7 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc
} }
func PageStageBySchoolId(schoolId string) ([]SchoolModel.Stage, error) { func PageStageBySchoolId(schoolId string) ([]SchoolModel.Stage, error) {
orgIdTerm := elastic.NewTermQuery("org_id", schoolId) orgIdTerm := elastic.NewTermQuery("data_content.bureau_id", schoolId)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
@ -417,7 +413,7 @@ func GetOrgCurrentTermAddCount(areaCode string, orgType string) (int, error) {
功能：根据学校ID获取班级总数 功能：根据学校ID获取班级总数
*/ */
func GetClassTotalCount(schoolId string) (int, error) { func GetClassTotalCount(schoolId string) (int, error) {
orgIdTerm := elastic.NewTermQuery("org_id", schoolId) orgIdTerm := elastic.NewTermQuery("data_content.bureau_id", schoolId)
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
@ -450,7 +446,7 @@ func GetClassCurrentTermAddCount(schoolId string) (int, error) {
createTime := endYearStr + "/" + monthStr + "/01 00:00:01" createTime := endYearStr + "/" + monthStr + "/01 00:00:01"
orgIdTerm := elastic.NewTermQuery("org_id", schoolId) orgIdTerm := elastic.NewTermQuery("data_content.bureau_id", schoolId)
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
@ -519,7 +515,7 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(orgIds) interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(orgIds)
orgIdTerms := elastic.NewTermsQuery("org_id", interfaceArr...) orgIdTerms := elastic.NewTermsQuery("data_content.org_id", interfaceArr...)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, bUseTerm, orgIdTerms) boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, bUseTerm, orgIdTerms)
@ -540,11 +536,8 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
resCount := gjson.Get(resStr, "total.value") resCount := gjson.Get(resStr, "total.value")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var org SchoolModel.Org var org SchoolModel.Org
//org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_id").Str
//org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_content.org_name").Str
org.OrgId = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.data_id").Str
org.OrgName = gjson.Get(resStr, "hits."+CommonUtil.ConvertIntToString(i)+"._source.org_name").Str
orgArr = append(orgArr, org) orgArr = append(orgArr, org)
} }
return orgArr, nil return orgArr, nil
@ -558,7 +551,7 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) {
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
districtCodeTerm := elastic.NewTermQuery("district_code", cityCode) districtCodeTerm := elastic.NewTermQuery("district_code", cityCode)
orgTypeTerm := elastic.NewTermQuery("org_type", "2") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm) boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
@ -583,7 +576,7 @@ func GetCityDirectlyEduAssistCount(cityCode string) (int, error) {
delFlagTerm := elastic.NewTermQuery("del_flag", 0) delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
districtCodeTerm := elastic.NewTermQuery("district_code", cityCode) districtCodeTerm := elastic.NewTermQuery("district_code", cityCode)
orgTypeTerm := elastic.NewTermQuery("org_type", "3") orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm) boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)

BIN
dsBigData/build/dsBigData
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save