diff --git a/dsBigData/Business/School/SchoolDao/SchoolDao.go b/dsBigData/Business/School/SchoolDao/SchoolDao.go index db1809e7..1fbeb14f 100644 --- a/dsBigData/Business/School/SchoolDao/SchoolDao.go +++ b/dsBigData/Business/School/SchoolDao/SchoolDao.go @@ -47,7 +47,8 @@ func PageEduAssistInfoByDistrictCode(districtCode string, directly string) ([]Sc if err != nil { return nil, err } - var eduAssistArr []SchoolModel.EduAssist + + eduAssistArr := make([]SchoolModel.EduAssist, 0) resStr := string(resByte) resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { @@ -100,7 +101,8 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School if err != nil { return nil, err } - var schoolArr []SchoolModel.School + + schoolArr := make([]SchoolModel.School, 0) resStr := string(resByte) resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { @@ -140,7 +142,7 @@ func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssis resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var eduAssistCountAggsDistrictArr []SchoolModel.EduAssistCountAggsDistrict + eduAssistCountAggsDistrictArr := make([]SchoolModel.EduAssistCountAggsDistrict, 0) resCount := gjson.Get(resStr, "district.buckets.#") for i := 0; i < int(resCount.Num); i++ { var eduAssistCountAggsDistrict SchoolModel.EduAssistCountAggsDistrict @@ -181,7 +183,7 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var schoolCountAggsDistrictArr []SchoolModel.SchoolCountAggsDistrict + schoolCountAggsDistrictArr := make([]SchoolModel.SchoolCountAggsDistrict, 0) resCount := gjson.Get(resStr, "district.buckets.#") for i := 0; i < int(resCount.Num); i++ { var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict @@ -220,7 +222,7 @@ func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var schoolCountAggsXxbxlxArr []SchoolModel.SchoolCountAggsXxbxlx + schoolCountAggsXxbxlxArr := make([]SchoolModel.SchoolCountAggsXxbxlx, 0) resCount := gjson.Get(resStr, "xxbxlx.buckets.#") for i := 0; i < int(resCount.Num); i++ { var schoolCountAggsXxbxlx SchoolModel.SchoolCountAggsXxbxlx @@ -276,7 +278,8 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var schoolCountAggsDistrictArr []SchoolModel.SchoolCountAggsDistrict + + schoolCountAggsDistrictArr := make([]SchoolModel.SchoolCountAggsDistrict, 0) resCount := gjson.Get(resStr, "district.buckets.#") for i := 0; i < int(resCount.Num); i++ { var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict @@ -327,7 +330,7 @@ func PageStageBySchoolId(schoolId string) ([]SchoolModel.Stage, error) { resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var stageArr []SchoolModel.Stage + stageArr := make([]SchoolModel.Stage, 0) resCount := gjson.Get(resStr, "stag.buckets.#") for i := 0; i < int(resCount.Num); i++ { var stage SchoolModel.Stage @@ -592,7 +595,7 @@ func GetBaseDirectlyUnderAccessTop(schoolIds []string, topNum string) ([]SchoolM resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var baseAccessTopAggsOrgIdArr []SchoolModel.BaseAccessTopAggsOrgId + baseAccessTopAggsOrgIdArr := make([]SchoolModel.BaseAccessTopAggsOrgId, 0) resCount := gjson.Get(resStr, "orgId.buckets.#") for i := 0; i < int(resCount.Num); i++ { var baseAccessTopAggsOrgId SchoolModel.BaseAccessTopAggsOrgId @@ -669,7 +672,7 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) { resByte, err := json.Marshal(result.Hits) resStr := string(resByte) - var orgArr []SchoolModel.Org + orgArr := make([]SchoolModel.Org, 0) resCount := gjson.Get(resStr, "total.value") for i := 0; i < int(resCount.Num); i++ { var org SchoolModel.Org diff --git a/dsBigData/Business/Student/StudentDao/StudentDao.go b/dsBigData/Business/Student/StudentDao/StudentDao.go index 14b568e6..94961dc5 100644 --- a/dsBigData/Business/Student/StudentDao/StudentDao.go +++ b/dsBigData/Business/Student/StudentDao/StudentDao.go @@ -45,7 +45,7 @@ func GetStudentCountAggsXb(schoolId string) ([]StudentModel.StudentCountXb, erro resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var studentCountXbArr []StudentModel.StudentCountXb + studentCountXbArr := make([]StudentModel.StudentCountXb, 0) resCount := gjson.Get(resStr, "xb.buckets.#") totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) @@ -133,7 +133,8 @@ func GetStudentCountAggsXxbxlx(districtCode []string, schoolIds []string, xxbxlx resStr := string(resByte) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) - var studentCountAggsXxbxlxArr []StudentModel.StudentCountAggsXxbxlx + + studentCountAggsXxbxlxArr := make([]StudentModel.StudentCountAggsXxbxlx, 0) resCount := gjson.Get(resStr, "xxbxlx.buckets.#") for i := 0; i < int(resCount.Num); i++ { var studentCountAggsXxbxlx StudentModel.StudentCountAggsXxbxlx @@ -178,7 +179,7 @@ func GetStudentCountAggsOrgId(schoolIds []string) ([]StudentModel.StudentCountAg resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var StudentCountAggsOrgArr []StudentModel.StudentCountAggsOrg + StudentCountAggsOrgArr := make([]StudentModel.StudentCountAggsOrg, 0) resCount := gjson.Get(resStr, "orgId.buckets.#") for i := 0; i < int(resCount.Num); i++ { var studentCountAggsOrg StudentModel.StudentCountAggsOrg @@ -234,7 +235,7 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var studentCountRxnfArr []StudentModel.StudentCountRxnf + studentCountRxnfArr := make([]StudentModel.StudentCountRxnf, 0) resCount := gjson.Get(resStr, "rxnf.buckets.#") for i := 0; i < int(resCount.Num); i++ { var studentCountRxnf StudentModel.StudentCountRxnf @@ -243,6 +244,7 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St studentCountRxnfArr = append(studentCountRxnfArr, studentCountRxnf) } + return studentCountRxnfArr, nil } diff --git a/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go b/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go index d177022d..f68428de 100644 --- a/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go +++ b/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go @@ -47,7 +47,8 @@ func GetTeacherCountAggsXb(schoolId string) ([]TeacherModel.TeacherCountXb, erro resStr := string(resByte) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) - var teacherCountXbArr []TeacherModel.TeacherCountXb + + teacherCountXbArr := make([]TeacherModel.TeacherCountXb, 0) resCount := gjson.Get(resStr, "xb.buckets.#") for i := 0; i < int(resCount.Num); i++ { var teacherCountXb TeacherModel.TeacherCountXb @@ -135,7 +136,8 @@ func GetTeacherCountAggsXxbxlxByCityOrDistrict(districtCode []string, schoolIds resStr := string(resByte) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) - var teacherCountAggsXxbxlxArr []TeacherModel.TeacherCountAggsXxbxlx + + teacherCountAggsXxbxlxArr := make([]TeacherModel.TeacherCountAggsXxbxlx, 0) resCount := gjson.Get(resStr, "xxbxlx.buckets.#") for i := 0; i < int(resCount.Num); i++ { var teacherCountAggsXxbxlx TeacherModel.TeacherCountAggsXxbxlx @@ -180,7 +182,7 @@ func GetTeacherCountAggsOrgId(schoolIds []string) ([]TeacherModel.TeacherCountAg resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var teacherCountAggsOrgArr []TeacherModel.TeacherCountAggsOrg + teacherCountAggsOrgArr := make([]TeacherModel.TeacherCountAggsOrg, 0) resCount := gjson.Get(resStr, "orgId.buckets.#") for i := 0; i < int(resCount.Num); i++ { var teacherCountAggsOrg TeacherModel.TeacherCountAggsOrg @@ -220,7 +222,7 @@ func GetTeacherCountAggsBzlb(schoolId string, bzlbs []string) ([]TeacherModel.Te resByte, err := json.Marshal(result.Aggregations) resStr := string(resByte) - var teacherCountAggsBzlbArr []TeacherModel.TeacherCountAggsBzlb + teacherCountAggsBzlbArr := make([]TeacherModel.TeacherCountAggsBzlb, 0) resCount := gjson.Get(resStr, "bzlb.buckets.#") for i := 0; i < int(resCount.Num); i++ { var teacherCountAggsBzlb TeacherModel.TeacherCountAggsBzlb diff --git a/dsBigData/build/dsBigData b/dsBigData/build/dsBigData index 41ea214b..82e37c66 100644 Binary files a/dsBigData/build/dsBigData and b/dsBigData/build/dsBigData differ