diff --git a/dsBigData/Business/School/SchoolDao/SchoolDao.go b/dsBigData/Business/School/SchoolDao/SchoolDao.go index 0d09d06d..e4ab87ff 100644 --- a/dsBigData/Business/School/SchoolDao/SchoolDao.go +++ b/dsBigData/Business/School/SchoolDao/SchoolDao.go @@ -18,7 +18,7 @@ func PageEduAssistInfoByDistrictCode(districtCode string) ([]SchoolModel.EduAssi enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) 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) 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") for i := 0; i < int(resCount.Num); i++ { var eduAssist SchoolModel.EduAssist - //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.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 + 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 eduAssistArr = append(eduAssistArr, eduAssist) } return eduAssistArr, nil @@ -61,7 +59,7 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) districtCodeTerm := elastic.NewTermQuery("district_code", districtCode) - orgTypeTerm := elastic.NewTermQuery("org_type", "2") + orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2") var boolQuery *elastic.BoolQuery if xxbxlxm == "-1" { 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") for i := 0; i < int(resCount.Num); i++ { var school SchoolModel.School - //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.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 + 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 schoolArr = append(schoolArr, school) } return schoolArr, nil @@ -98,7 +94,7 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssistCountAggsDistrict, error) { enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) - orgTypeTerm := elastic.NewTermQuery("org_type", "3") + orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7") interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) cityCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...) @@ -138,7 +134,7 @@ func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssis func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.SchoolCountAggsDistrict, error) { enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) - orgTypeTerm := elastic.NewTermQuery("org_type", "2") + orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2") interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...) @@ -178,14 +174,14 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel.SchoolCountAggsXxbxlx, error) { enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) 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) boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, orgTypeTerm, districtCodeTerm) xxbxlxAggs := elastic. NewTermsAggregation(). - Field("school_type"). + Field("data_content.xxbxlxm"). Size(50) result, err := esClient.Search(). @@ -224,7 +220,7 @@ aggsXxbxlx：是否需要办学类型的子聚合 true：需要 false：不需 func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]SchoolModel.SchoolCountAggsDistrict, error) { enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) - orgTypeTerm := elastic.NewTermQuery("org_type", "2") + orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2") interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr) cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...) @@ -283,7 +279,7 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc } 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) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) @@ -417,7 +413,7 @@ func GetOrgCurrentTermAddCount(areaCode string, orgType string) (int, error) { 功能：根据学校ID获取班级总数 */ 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) delFlagTerm := elastic.NewTermQuery("del_flag", 0) 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" - orgIdTerm := elastic.NewTermQuery("org_id", schoolId) + orgIdTerm := elastic.NewTermQuery("data_content.bureau_id", schoolId) enableFlagTerm := elastic.NewTermQuery("enable_flag", 1) delFlagTerm := elastic.NewTermQuery("del_flag", 0) 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) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) 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) @@ -540,11 +536,8 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) { resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { var org SchoolModel.Org - //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.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 - + 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 orgArr = append(orgArr, org) } return orgArr, nil @@ -558,7 +551,7 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) { delFlagTerm := elastic.NewTermQuery("del_flag", 0) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) 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) @@ -583,7 +576,7 @@ func GetCityDirectlyEduAssistCount(cityCode string) (int, error) { delFlagTerm := elastic.NewTermQuery("del_flag", 0) bUseTerm := elastic.NewTermQuery("data_content.b_use", 1) 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) diff --git a/dsBigData/build/dsBigData b/dsBigData/build/dsBigData index 6ade2dbe..a110d3ca 100644 Binary files a/dsBigData/build/dsBigData and b/dsBigData/build/dsBigData differ