zhouwentao
/
golang-yitisheng-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2026-01-01 22:52:16 +08:00
parent 94a0578f7b
commit 9b72804e7b
6 changed files with 138 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
server/docs/docs.go
View File

@ -282,38 +282,6 @@ const docTemplate = `{
} }
} }
}, },
"/user//major/list": {
"get": {
"tags": [
"用户专业"
],
"summary": "获取当前用户可检索列表",
"parameters": [
{
"type": "integer",
"default": 1,
"description": "页码",
"name": "page",
"in": "query"
},
{
"type": "integer",
"default": 10,
"description": "每页数量",
"name": "size",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/common.Response"
}
}
}
}
},
"/user/auth/info": { "/user/auth/info": {
"get": { "get": {
"tags": [ "tags": [
@ -379,6 +347,52 @@ const docTemplate = `{
} }
} }
}, },
"/user/major/list": {
"get": {
"tags": [
"用户专业"
],
"summary": "获取当前用户可检索列表",
"parameters": [
{
"type": "integer",
"default": 1,
"description": "页码",
"name": "page",
"in": "query"
},
{
"type": "integer",
"default": 10,
"description": "每页数量",
"name": "size",
"in": "query"
},
{
"type": "string",
"default": "\"\"",
"description": "批次(本科提前批/本科A段/本科B段/本科/高职高专)",
"name": "batch",
"in": "query"
},
{
"type": "string",
"default": "\"\"",
"description": "录取概率类型(难录取/可冲击/较稳妥/可保底)",
"name": "probability",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/common.Response"
}
}
}
}
},
"/user/score": { "/user/score": {
"get": { "get": {
"tags": [ "tags": [

78
server/docs/swagger.json
View File

@ -276,38 +276,6 @@
} }
} }
}, },
"/user//major/list": {
"get": {
"tags": [
"用户专业"
],
"summary": "获取当前用户可检索列表",
"parameters": [
{
"type": "integer",
"default": 1,
"description": "页码",
"name": "page",
"in": "query"
},
{
"type": "integer",
"default": 10,
"description": "每页数量",
"name": "size",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/common.Response"
}
}
}
}
},
"/user/auth/info": { "/user/auth/info": {
"get": { "get": {
"tags": [ "tags": [
@ -373,6 +341,52 @@
} }
} }
}, },
"/user/major/list": {
"get": {
"tags": [
"用户专业"
],
"summary": "获取当前用户可检索列表",
"parameters": [
{
"type": "integer",
"default": 1,
"description": "页码",
"name": "page",
"in": "query"
},
{
"type": "integer",
"default": 10,
"description": "每页数量",
"name": "size",
"in": "query"
},
{
"type": "string",
"default": "\"\"",
"description": "批次(本科提前批/本科A段/本科B段/本科/高职高专)",
"name": "batch",
"in": "query"
},
{
"type": "string",
"default": "\"\"",
"description": "录取概率类型(难录取/可冲击/较稳妥/可保底)",
"name": "probability",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/common.Response"
}
}
}
}
},
"/user/score": { "/user/score": {
"get": { "get": {
"tags": [ "tags": [

52
server/docs/swagger.yaml
View File

@ -710,27 +710,6 @@ paths:
summary: Sys用户登出 summary: Sys用户登出
tags: tags:
- 认证 - 认证
/user//major/list:
get:
parameters:
- default: 1
description: 页码
in: query
name: page
type: integer
- default: 10
description: 每页数量
in: query
name: size
type: integer
responses:
"200":
description: OK
schema:
$ref: '#/definitions/common.Response'
summary: 获取当前用户可检索列表
tags:
- 用户专业
/user/auth/info: /user/auth/info:
get: get:
responses: responses:
@ -772,6 +751,37 @@ paths:
summary: 用户登出 summary: 用户登出
tags: tags:
- 认证 - 认证
/user/major/list:
get:
parameters:
- default: 1
description: 页码
in: query
name: page
type: integer
- default: 10
description: 每页数量
in: query
name: size
type: integer
- default: '""'
description: 批次(本科提前批/本科A段/本科B段/本科/高职高专)
in: query
name: batch
type: string
- default: '""'
description: 录取概率类型(难录取/可冲击/较稳妥/可保底)
in: query
name: probability
type: string
responses:
"200":
description: OK
schema:
$ref: '#/definitions/common.Response'
summary: 获取当前用户可检索列表
tags:
- 用户专业
/user/score: /user/score:
get: get:
responses: responses:

5
server/modules/user/controller/user_major_controller.go
View File

@ -39,14 +39,19 @@ func (ctrl *UserMajorController) RegisterRoutes(rg *gin.RouterGroup) {
// @Tags 用户专业 // @Tags 用户专业
// @Param page query int false "页码" default(1) // @Param page query int false "页码" default(1)
// @Param size query int false "每页数量" default(10) // @Param size query int false "每页数量" default(10)
// @Param batch query string false "批次(本科提前批/本科A段/本科B段/本科/高职高专)" default("")
// @Param probability query string false "录取概率类型(难录取/可冲击/较稳妥/可保底)" default("")
// @Success 200 {object} common.Response // @Success 200 {object} common.Response
// @Router /user/major/list [get] // @Router /user/major/list [get]
func (ctrl *UserMajorController) List(c *gin.Context) { func (ctrl *UserMajorController) List(c *gin.Context) {
page, _ := strconv.Atoi(c.DefaultQuery("page", "1")) page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
size, _ := strconv.Atoi(c.DefaultQuery("size", "10")) size, _ := strconv.Atoi(c.DefaultQuery("size", "10"))
schoolMajorQuery := yxDto.SchoolMajorQuery{ schoolMajorQuery := yxDto.SchoolMajorQuery{
Keyword: c.DefaultQuery("keyword", ""),
Page: page, Page: page,
Size: size, Size: size,
Batch: c.DefaultQuery("batch", ""),
Probability: c.DefaultQuery("probability", ""),
LoginUserId: common.GetLoginUser(c).ID, LoginUserId: common.GetLoginUser(c).ID,
} }
userScoreVO, err := ctrl.userScoreService.GetActiveByID(schoolMajorQuery.LoginUserId) userScoreVO, err := ctrl.userScoreService.GetActiveByID(schoolMajorQuery.LoginUserId)

8
server/modules/user/service/user_score_service.go
View File

@ -32,7 +32,7 @@ func (s *UserScoreService) GetUserScoreByUserId(id string) {
// GetActiveByID 获取当前激活的成绩 // GetActiveByID 获取当前激活的成绩
func (s *UserScoreService) GetActiveByID(userID string) (vo.UserScoreVO, error) { func (s *UserScoreService) GetActiveByID(userID string) (vo.UserScoreVO, error) {
var score entity.YxUserScore var score entity.YxUserScore
// 先从Redis获取是否存在
scoreRedisData, err := config.RDB.Get(context.Background(), common.RedisUserScorePrefix+userID).Result() scoreRedisData, err := config.RDB.Get(context.Background(), common.RedisUserScorePrefix+userID).Result()
if err != nil { if err != nil {
// 明确指定字段，提高可读性 // 明确指定字段，提高可读性
@ -217,7 +217,6 @@ func (s *UserScoreService) convertEntityToVo(item entity.YxUserScore) vo.UserSco
Type: item.Type, Type: item.Type,
EducationalLevel: item.EducationalLevel, EducationalLevel: item.EducationalLevel,
CognitioPolyclinic: item.CognitioPolyclinic, CognitioPolyclinic: item.CognitioPolyclinic,
SubjectList: strings.Split(item.Subjects, ","),
ProfessionalCategory: item.ProfessionalCategory, ProfessionalCategory: item.ProfessionalCategory,
ProfessionalCategoryChildren: []string{}, ProfessionalCategoryChildren: []string{},
ProfessionalCategoryChildrenScore: make(map[string]float64), ProfessionalCategoryChildrenScore: make(map[string]float64),
@ -228,6 +227,11 @@ func (s *UserScoreService) convertEntityToVo(item entity.YxUserScore) vo.UserSco
Province: item.Province, Province: item.Province,
State: item.State, State: item.State,
} }
if item.Subjects == "" {
voItem.SubjectList = []string{}
} else {
voItem.SubjectList = strings.Split(item.Subjects, ",")
}
if item.ProfessionalCategoryChildren == "" { if item.ProfessionalCategoryChildren == "" {
voItem.ProfessionalCategoryChildren = []string{} voItem.ProfessionalCategoryChildren = []string{}

6
server/modules/yx/dto/yx_school_major_dto.go
View File

@ -57,17 +57,19 @@ type YxHistoryMajorEnrollDTO struct {
type SchoolMajorQuery struct { type SchoolMajorQuery struct {
Page int `json:"page"` Page int `json:"page"`
Size int `json:"size"` Size int `json:"size"`
Keyword string `json:"keyword"` // 对应 keyword
MajorType string `json:"majorType"` // 对应 major_type MajorType string `json:"majorType"` // 对应 major_type
Category string `json:"category"` // 对应 category Category string `json:"category"` // 对应 category
Batch string `json:"batch"` // 对应 batch Batch string `json:"batch"` // 对应 批次
MajorTypeChildren []string `json:"majorTypeChildren"` // 对应 major_type_child in (...) MajorTypeChildren []string `json:"majorTypeChildren"` // 对应 major_type_child in (...)
MainSubjects string `json:"mainSubjects"` // 对应 main_subjects MainSubjects string `json:"mainSubjects"` // 对应 main_subjects
Probability string `json:"probability"` // 对应 录取概率类型
ScoreId string `json:"scoreId"` // 对应 score_id ScoreId string `json:"scoreId"` // 对应 score_id
TagList []string `json:"tagList"` // 对应 tags in (...) TagList []string `json:"tagList"` // 对应 tags in (...)
SchoolNatureList []string `json:"schoolNatureList"` // 对应 school_nature in (...) SchoolNatureList []string `json:"schoolNatureList"` // 对应 school_nature in (...)
AddressList []string `json:"addressList"` // 对应 address in (...) AddressList []string `json:"addressList"` // 对应 address in (...)
KyjxList []string `json:"kyjxList"` // 对应 kyjx in (...) KyjxList []string `json:"kyjxList"` // 对应 kyjx in (...)
RulesEnrollProbabilityList []string `json:"rulesEnrollProbabilityList"` // 对应 rules_enroll_probability in (...) RulesEnrollProbabilityList []string `json:"rulesEnrollProbabilityList"` // 录取方式，对应 rules_enroll_probability in (...)
LoginUserId string `json:"loginUserId"` // 登录用户 ID LoginUserId string `json:"loginUserId"` // 登录用户 ID
UserScoreVO userVO.UserScoreVO `json:"userScoreVO"` // 用户成绩 VO UserScoreVO userVO.UserScoreVO `json:"userScoreVO"` // 用户成绩 VO
CalculationTableName string `json:"calculationTableName"` // 对应 calculation_table_name CalculationTableName string `json:"calculationTableName"` // 对应 calculation_table_name