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

update

Browse Source
master
wubin 5 years ago
parent 5f6ec678bb
commit 1263b753d4
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -47,7 +47,8 @@ func PageEduAssistInfoByDistrictCode(districtCode string, directly string) ([]Sc
if err != nil { if err != nil {
return nil, err return nil, err
} }
var eduAssistArr []SchoolModel.EduAssist
eduAssistArr := make([]SchoolModel.EduAssist, 0)
resStr := string(resByte) resStr := string(resByte)
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++ {
@ -100,7 +101,8 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string) ([]School
if err != nil { if err != nil {
return nil, err return nil, err
} }
var schoolArr []SchoolModel.School
schoolArr := make([]SchoolModel.School, 0)
resStr := string(resByte) resStr := string(resByte)
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++ {
@ -140,7 +142,7 @@ func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssis
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var eduAssistCountAggsDistrictArr []SchoolModel.EduAssistCountAggsDistrict eduAssistCountAggsDistrictArr := make([]SchoolModel.EduAssistCountAggsDistrict, 0)
resCount := gjson.Get(resStr, "district.buckets.#") resCount := gjson.Get(resStr, "district.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var eduAssistCountAggsDistrict SchoolModel.EduAssistCountAggsDistrict var eduAssistCountAggsDistrict SchoolModel.EduAssistCountAggsDistrict
@ -181,7 +183,7 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var schoolCountAggsDistrictArr []SchoolModel.SchoolCountAggsDistrict schoolCountAggsDistrictArr := make([]SchoolModel.SchoolCountAggsDistrict, 0)
resCount := gjson.Get(resStr, "district.buckets.#") resCount := gjson.Get(resStr, "district.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict
@ -220,7 +222,7 @@ func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var schoolCountAggsXxbxlxArr []SchoolModel.SchoolCountAggsXxbxlx schoolCountAggsXxbxlxArr := make([]SchoolModel.SchoolCountAggsXxbxlx, 0)
resCount := gjson.Get(resStr, "xxbxlx.buckets.#") resCount := gjson.Get(resStr, "xxbxlx.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var schoolCountAggsXxbxlx SchoolModel.SchoolCountAggsXxbxlx var schoolCountAggsXxbxlx SchoolModel.SchoolCountAggsXxbxlx
@ -276,7 +278,8 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var schoolCountAggsDistrictArr []SchoolModel.SchoolCountAggsDistrict
schoolCountAggsDistrictArr := make([]SchoolModel.SchoolCountAggsDistrict, 0)
resCount := gjson.Get(resStr, "district.buckets.#") resCount := gjson.Get(resStr, "district.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict var schoolCountAggsDistrict SchoolModel.SchoolCountAggsDistrict
@ -327,7 +330,7 @@ func PageStageBySchoolId(schoolId string) ([]SchoolModel.Stage, error) {
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var stageArr []SchoolModel.Stage stageArr := make([]SchoolModel.Stage, 0)
resCount := gjson.Get(resStr, "stag.buckets.#") resCount := gjson.Get(resStr, "stag.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var stage SchoolModel.Stage var stage SchoolModel.Stage
@ -592,7 +595,7 @@ func GetBaseDirectlyUnderAccessTop(schoolIds []string, topNum string) ([]SchoolM
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var baseAccessTopAggsOrgIdArr []SchoolModel.BaseAccessTopAggsOrgId baseAccessTopAggsOrgIdArr := make([]SchoolModel.BaseAccessTopAggsOrgId, 0)
resCount := gjson.Get(resStr, "orgId.buckets.#") resCount := gjson.Get(resStr, "orgId.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var baseAccessTopAggsOrgId SchoolModel.BaseAccessTopAggsOrgId var baseAccessTopAggsOrgId SchoolModel.BaseAccessTopAggsOrgId
@ -669,7 +672,7 @@ func GetOrgInfoByOrgIds(orgIds []string) ([]SchoolModel.Org, error) {
resByte, err := json.Marshal(result.Hits) resByte, err := json.Marshal(result.Hits)
resStr := string(resByte) resStr := string(resByte)
var orgArr []SchoolModel.Org orgArr := make([]SchoolModel.Org, 0)
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

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

@ -45,7 +45,7 @@ func GetStudentCountAggsXb(schoolId string) ([]StudentModel.StudentCountXb, erro
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var studentCountXbArr []StudentModel.StudentCountXb studentCountXbArr := make([]StudentModel.StudentCountXb, 0)
resCount := gjson.Get(resStr, "xb.buckets.#") resCount := gjson.Get(resStr, "xb.buckets.#")
totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits())
totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64)
@ -133,7 +133,8 @@ func GetStudentCountAggsXxbxlx(districtCode []string, schoolIds []string, xxbxlx
resStr := string(resByte) resStr := string(resByte)
totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits())
totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64)
var studentCountAggsXxbxlxArr []StudentModel.StudentCountAggsXxbxlx
studentCountAggsXxbxlxArr := make([]StudentModel.StudentCountAggsXxbxlx, 0)
resCount := gjson.Get(resStr, "xxbxlx.buckets.#") resCount := gjson.Get(resStr, "xxbxlx.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var studentCountAggsXxbxlx StudentModel.StudentCountAggsXxbxlx var studentCountAggsXxbxlx StudentModel.StudentCountAggsXxbxlx
@ -178,7 +179,7 @@ func GetStudentCountAggsOrgId(schoolIds []string) ([]StudentModel.StudentCountAg
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var StudentCountAggsOrgArr []StudentModel.StudentCountAggsOrg StudentCountAggsOrgArr := make([]StudentModel.StudentCountAggsOrg, 0)
resCount := gjson.Get(resStr, "orgId.buckets.#") resCount := gjson.Get(resStr, "orgId.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var studentCountAggsOrg StudentModel.StudentCountAggsOrg var studentCountAggsOrg StudentModel.StudentCountAggsOrg
@ -234,7 +235,7 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var studentCountRxnfArr []StudentModel.StudentCountRxnf studentCountRxnfArr := make([]StudentModel.StudentCountRxnf, 0)
resCount := gjson.Get(resStr, "rxnf.buckets.#") resCount := gjson.Get(resStr, "rxnf.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var studentCountRxnf StudentModel.StudentCountRxnf var studentCountRxnf StudentModel.StudentCountRxnf
@ -243,6 +244,7 @@ func GetStudentCountAggsRxnf(schoolId string, stageId string) ([]StudentModel.St
studentCountRxnfArr = append(studentCountRxnfArr, studentCountRxnf) studentCountRxnfArr = append(studentCountRxnfArr, studentCountRxnf)
} }
return studentCountRxnfArr, nil return studentCountRxnfArr, nil
} }

10
dsBigData/Business/Teacher/TeacherDao/TeacherDao.go
Unescape View File

@ -47,7 +47,8 @@ func GetTeacherCountAggsXb(schoolId string) ([]TeacherModel.TeacherCountXb, erro
resStr := string(resByte) resStr := string(resByte)
totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits())
totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64)
var teacherCountXbArr []TeacherModel.TeacherCountXb
teacherCountXbArr := make([]TeacherModel.TeacherCountXb, 0)
resCount := gjson.Get(resStr, "xb.buckets.#") resCount := gjson.Get(resStr, "xb.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var teacherCountXb TeacherModel.TeacherCountXb var teacherCountXb TeacherModel.TeacherCountXb
@ -135,7 +136,8 @@ func GetTeacherCountAggsXxbxlxByCityOrDistrict(districtCode []string, schoolIds
resStr := string(resByte) resStr := string(resByte)
totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits()) totalCount := CommonUtil.ConvertInt64ToString(result.TotalHits())
totalCountFloat, _ := strconv.ParseFloat(totalCount, 64) totalCountFloat, _ := strconv.ParseFloat(totalCount, 64)
var teacherCountAggsXxbxlxArr []TeacherModel.TeacherCountAggsXxbxlx
teacherCountAggsXxbxlxArr := make([]TeacherModel.TeacherCountAggsXxbxlx, 0)
resCount := gjson.Get(resStr, "xxbxlx.buckets.#") resCount := gjson.Get(resStr, "xxbxlx.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var teacherCountAggsXxbxlx TeacherModel.TeacherCountAggsXxbxlx var teacherCountAggsXxbxlx TeacherModel.TeacherCountAggsXxbxlx
@ -180,7 +182,7 @@ func GetTeacherCountAggsOrgId(schoolIds []string) ([]TeacherModel.TeacherCountAg
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var teacherCountAggsOrgArr []TeacherModel.TeacherCountAggsOrg teacherCountAggsOrgArr := make([]TeacherModel.TeacherCountAggsOrg, 0)
resCount := gjson.Get(resStr, "orgId.buckets.#") resCount := gjson.Get(resStr, "orgId.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var teacherCountAggsOrg TeacherModel.TeacherCountAggsOrg var teacherCountAggsOrg TeacherModel.TeacherCountAggsOrg
@ -220,7 +222,7 @@ func GetTeacherCountAggsBzlb(schoolId string, bzlbs []string) ([]TeacherModel.Te
resByte, err := json.Marshal(result.Aggregations) resByte, err := json.Marshal(result.Aggregations)
resStr := string(resByte) resStr := string(resByte)
var teacherCountAggsBzlbArr []TeacherModel.TeacherCountAggsBzlb teacherCountAggsBzlbArr := make([]TeacherModel.TeacherCountAggsBzlb, 0)
resCount := gjson.Get(resStr, "bzlb.buckets.#") resCount := gjson.Get(resStr, "bzlb.buckets.#")
for i := 0; i < int(resCount.Num); i++ { for i := 0; i < int(resCount.Num); i++ {
var teacherCountAggsBzlb TeacherModel.TeacherCountAggsBzlb var teacherCountAggsBzlb TeacherModel.TeacherCountAggsBzlb

BIN
dsBigData/build/dsBigData
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save