Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/Sql/t_base_student.sql

@@ -31,7 +31,7 @@ SELECT
 	`t_base_organization`.`xxbxlxm` AS `xxbxlxm`,
 	`t_base_organization`.`szdcxlxm` AS `szdcxlxm`,
 	`t_base_class`.`stage_id` AS `stage_id`,
-	cast( `t_base_class`.`rxnf` AS CHAR ( 4 ) charset utf8 ) AS `rxnf` ,
+	`t_base_class`.`rxnf` AS `rxnf`,
 	case t1.`b_use` when -1 then 1 else 0 end AS `del_flag`
 FROM
 	((

dsBaseWeb/Handler/CheckHandler/LimitRoleId.go

@@ -146,6 +146,7 @@ func roleIdLimitIsLegal(c *gin.Context, interName string, n int) (bool, ResultSt
 		c.SetCookie("person_id", "", -1, "/", "", false, true)
 		c.SetCookie("identity_id", "", -1, "/", "", false, true)
 		c.SetCookie("token", "", -1, "/", "", false, true)
+		c.SetCookie("ds_access_token", "", -1, "/", "", false, true)
 
 		return false, resultStruct
 	}

dsBaseWeb/main.go

@@ -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")

dsBigData/Business/School/SchoolDao/SchoolDao.go

@@ -42,8 +42,10 @@ 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_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
 		eduAssistArr = append(eduAssistArr, eduAssist)
 	}
 	return eduAssistArr, nil
@@ -84,8 +86,10 @@ 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_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
 		schoolArr = append(schoolArr, school)
 	}
 	return schoolArr, nil
@@ -536,8 +540,10 @@ 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_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
 
 		orgArr = append(orgArr, org)
 	}

dsBigData/Business/Student/StudentController/StudentController.go

@@ -40,6 +40,14 @@ func GetStudentCountAggsXbBySchoolId(c *gin.Context) {
 		return
 	}
 
+	for i := range resArr {
+		if resArr[i].XbName == "1" {
+			resArr[i].XbName = "男"
+		} else {
+			resArr[i].XbName = "女"
+		}
+	}
+
 	c.JSON(http.StatusOK, Model.Res{
 		Success: true,
 		List:    resArr,

dsBigData/Business/Student/StudentDao/StudentDao.go

@@ -21,7 +21,7 @@ func GetStudentCountAggsXb(schoolId string) ([]StudentModel.StudentCountXb, erro
 	bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
 	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
-	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"男", "女"})
+	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"1", "2"})
 	xbTerms := elastic.NewTermsQuery("data_content.xbm", interfaceArr...)
 
 	boolQuery := elastic.NewBoolQuery().Must(orgIdTerm, bUseTerm, enableFlagTerm, delFlagTerm, xbTerms)