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

update

Browse Source
master
wubin 5 years ago
parent e9cec91c21
commit 4c7655b045
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
dsBaseWeb/main.go
Unescape View File

@ -57,7 +57,7 @@ func main() {
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
//统一认证拦截器
//r.Use(Handler.SsoHandler())
r.Use(Handler.SsoHandler())
//EXCEL目录
//r.Static("/dsBaseWeb/static", "./Static")

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

@ -70,24 +70,35 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
var districtCodeTerm *elastic.TermQuery
var directlyUnderTypeTerms *elastic.TermsQuery
cityFlag := 0
if strings.HasSuffix(districtCode, "00") { //市
districtCodeTerm = elastic.NewTermQuery("city_code", districtCode)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
directlyUnderTypeTerms = elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
cityFlag = 1
} else { //区
districtCodeTerm = elastic.NewTermQuery("district_code", districtCode)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"1"})
directlyUnderTypeTerms = elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
}
orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
var boolQuery *elastic.BoolQuery
if xxbxlxm == "-1" {
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, directlyUnderTypeTerms, orgTypeTerm)
if cityFlag == 1 {
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"360", "811", "821"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.xxjbzm", interfaceArr...)
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm, directlyUnderTypeTerms)
} else {
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm)
}
} else {
xxbxlxmTerm := elastic.NewTermQuery("school_type", xxbxlxm)
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, directlyUnderTypeTerms, orgTypeTerm, xxbxlxmTerm)
if cityFlag == 1 {
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"360", "811", "821"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.xxjbzm", interfaceArr...)
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm, xxbxlxmTerm, directlyUnderTypeTerms)
} else {
boolQuery = elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, districtCodeTerm, orgTypeTerm, xxbxlxmTerm)
}
}
result, err := esClient.Search().
Index("org_school").
@ -158,11 +169,11 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
directlyUnderTypeTerm := elastic.NewTermQuery("data_content.directly_under_type", "1")
//directlyUnderTypeTerm := elastic.NewTermQuery("data_content.directly_under_type", "1")
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, cityCodeTerm, orgTypeTerm, directlyUnderTypeTerm)
boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, cityCodeTerm, orgTypeTerm)
districtCodeAggs := elastic.
NewTermsAggregation().
@ -278,7 +289,6 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc
resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte)
schoolCountAggsDistrictArr := make([]SchoolModel.SchoolCountAggsDistrict, 0)
resCount := gjson.Get(resStr, "district.buckets.#")
for i := 0; i < int(resCount.Num); i++ {
@ -364,13 +374,13 @@ func GetDirectlyUnderOrgTotalCount(areaCode string, orgType string) (int, error)
enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
delFlagTerm := elastic.NewTermQuery("del_flag", 0)
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
//interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
//directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
var boolQuery *elastic.BoolQuery
if orgType == "2" {
cityCodeTerm := elastic.NewTermQuery("city_code", areaCode)
boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, directlyUnderTypeTerms)
boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
} else {
districtCodeTerm := elastic.NewTermQuery("district_code", areaCode)
boolQuery = elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
@ -445,9 +455,9 @@ func GetDirectlyUnderOrgCurrentTermAddCount(areaCode string, orgType string) (in
var boolQuery *elastic.BoolQuery
if orgType == "2" {
cityCodeTerm := elastic.NewTermQuery("city_code", areaCode)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, directlyUnderTypeTerms, createTimeRang)
//interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
//directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, createTimeRang)
} else {
districtCodeTerm := elastic.NewTermQuery("district_code", areaCode)
boolQuery = elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, createTimeRang)
@ -692,8 +702,8 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) {
bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
districtCodeTerm := elastic.NewTermQuery("city_code", cityCode)
orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"360", "811", "821"})
directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.xxjbzm", interfaceArr...)
boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, directlyUnderTypeTerms)

BIN
dsBigData/build/dsBigData
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save