Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
A
antai-sport-http-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
antai-sport
antai-sport-http-server
Commits
936f8da2
Commit
936f8da2
authored
Sep 26, 2022
by
liming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预选赛成绩确认
parent
960e5f2b
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
140 additions
and
8 deletions
+140
-8
SeriesController.java
...ment/api/business/series/controller/SeriesController.java
+12
-0
SeriesQualifyingMatchRankDTO.java
...api/business/series/dto/SeriesQualifyingMatchRankDTO.java
+11
-0
SeriesBusinessMapper.java
...ment/api/business/series/mapper/SeriesBusinessMapper.java
+5
-0
SeriesService.java
...management/api/business/series/service/SeriesService.java
+24
-8
SeriesQualifyingMatchRankPageVO.java
...i/business/series/vo/SeriesQualifyingMatchRankPageVO.java
+12
-0
SeriesQualifyingMatchRankVO.java
...t/api/business/series/vo/SeriesQualifyingMatchRankVO.java
+64
-0
SeriesBusinessMapper.xml
...src/main/resources/mapper/series/SeriesBusinessMapper.xml
+12
-0
No files found.
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/controller/SeriesController.java
View file @
936f8da2
...
...
@@ -135,4 +135,16 @@ public class SeriesController {
return
success
();
}
@PostMapping
(
"match/qualifying/rank"
)
public
ResponseEntity
<
Result
<
SeriesQualifyingMatchRankPageVO
>>
getSeriesQualifyingMatchRank
(
@RequestBody
SeriesQualifyingMatchRankDTO
dto
)
{
return
success
(
seriesService
.
getSeriesQualifyingMatchRank
(
dto
));
}
@GetMapping
(
"record/result/confirm/status/{recordId}/{status}"
)
public
ResponseEntity
<
Result
>
changeMatchRecordStatus
(
@PathVariable
(
"recordId"
)
Long
recordId
,
@PathVariable
(
"status"
)
Integer
status
)
{
seriesService
.
changeMatchRecordStatus
(
recordId
,
status
);
return
success
();
}
}
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/dto/SeriesQualifyingMatchRankDTO.java
0 → 100644
View file @
936f8da2
package
com
.
antai
.
sport
.
http
.
server
.
management
.
api
.
business
.
series
.
dto
;
import
lombok.Data
;
@Data
public
class
SeriesQualifyingMatchRankDTO
{
private
Integer
pageNo
;
private
Integer
pageSize
;
private
Long
roundId
;
private
Long
areaId
;
}
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/mapper/SeriesBusinessMapper.java
View file @
936f8da2
...
...
@@ -3,6 +3,7 @@ package com.antai.sport.http.server.management.api.business.series.mapper;
import
com.antai.sport.http.server.management.api.business.series.dto.SeriesListQueryDTO
;
import
com.antai.sport.http.server.management.api.business.series.vo.SeriesListVO
;
import
com.antai.sport.http.server.management.api.business.series.vo.SeriesMatchListVO
;
import
com.antai.sport.http.server.management.api.business.series.vo.SeriesQualifyingMatchRankVO
;
import
com.antai.sport.http.server.management.api.business.series.vo.SeriesRoundListVO
;
import
com.antai.sport.http.server.repository.series.entity.SeriesRound
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
...
@@ -19,4 +20,8 @@ public interface SeriesBusinessMapper {
List
<
SeriesRoundListVO
>
getRoundListBySeriesId
(
@Param
(
"seriesId"
)
Long
seriesId
);
List
<
SeriesMatchListVO
>
getMatchByRoundId
(
@Param
(
"roundId"
)
Long
roundId
);
IPage
<
SeriesQualifyingMatchRankVO
>
getSeriesQualifyingMatchRank
(
IPage
<
SeriesQualifyingMatchRankVO
>
page
,
@Param
(
"roundId"
)
Long
roundId
,
@Param
(
"areaId"
)
Long
areaId
);
}
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/service/SeriesService.java
View file @
936f8da2
...
...
@@ -10,14 +10,8 @@ import com.antai.sport.http.server.repository.map.entity.Map;
import
com.antai.sport.http.server.repository.map.entity.MapPath
;
import
com.antai.sport.http.server.repository.map.mapper.MapMapper
;
import
com.antai.sport.http.server.repository.map.mapper.MapPathMapper
;
import
com.antai.sport.http.server.repository.series.entity.Series
;
import
com.antai.sport.http.server.repository.series.entity.SeriesArea
;
import
com.antai.sport.http.server.repository.series.entity.SeriesMatch
;
import
com.antai.sport.http.server.repository.series.entity.SeriesRound
;
import
com.antai.sport.http.server.repository.series.mapper.SeriesAreaMapper
;
import
com.antai.sport.http.server.repository.series.mapper.SeriesMapper
;
import
com.antai.sport.http.server.repository.series.mapper.SeriesMatchMapper
;
import
com.antai.sport.http.server.repository.series.mapper.SeriesRoundMapper
;
import
com.antai.sport.http.server.repository.series.entity.*
;
import
com.antai.sport.http.server.repository.series.mapper.*
;
import
com.antai.sport.http.server.repository.sys.entity.SysUser
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
...
@@ -49,6 +43,8 @@ public class SeriesService {
private
MapPathMapper
mapPathMapper
;
@Resource
private
SeriesMatchMapper
seriesMatchMapper
;
@Resource
private
SeriesMatchPlayerRecordMapper
seriesMatchPlayerRecordMapper
;
@Resource
private
SeriesConverter
seriesConverter
;
...
...
@@ -319,6 +315,26 @@ public class SeriesService {
}
else
{
seriesMatchMapper
.
updateById
(
match
);
}
}
public
SeriesQualifyingMatchRankPageVO
getSeriesQualifyingMatchRank
(
SeriesQualifyingMatchRankDTO
dto
)
{
SeriesQualifyingMatchRankPageVO
result
=
new
SeriesQualifyingMatchRankPageVO
();
result
.
setPageNo
(
dto
.
getPageNo
());
Page
<
SeriesQualifyingMatchRankVO
>
pageParam
=
new
Page
<>(
dto
.
getPageNo
(),
dto
.
getPageSize
());
pageParam
.
addOrder
(
new
OrderItem
(
"t1.duration"
,
true
));
pageParam
.
addOrder
(
new
OrderItem
(
"t1.create_time"
,
true
));
pageParam
.
addOrder
(
new
OrderItem
(
"t1.id"
,
true
));
IPage
<
SeriesQualifyingMatchRankVO
>
rankPage
=
seriesBusinessMapper
.
getSeriesQualifyingMatchRank
(
pageParam
,
dto
.
getRoundId
(),
dto
.
getAreaId
());
result
.
setData
(
rankPage
.
getRecords
());
result
.
setTotalCount
(
rankPage
.
getTotal
());
return
result
;
}
public
void
changeMatchRecordStatus
(
Long
recordId
,
Integer
status
)
{
SeriesMatchPlayerRecord
record
=
seriesMatchPlayerRecordMapper
.
selectById
(
recordId
);
record
.
setResultConfirmStatus
(
status
);
seriesMatchPlayerRecordMapper
.
updateById
(
record
);
}
}
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/vo/SeriesQualifyingMatchRankPageVO.java
0 → 100644
View file @
936f8da2
package
com
.
antai
.
sport
.
http
.
server
.
management
.
api
.
business
.
series
.
vo
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
SeriesQualifyingMatchRankPageVO
{
List
<
SeriesQualifyingMatchRankVO
>
data
;
private
Integer
pageNo
;
private
Long
totalCount
;
}
management-api/src/main/java/com/antai/sport/http/server/management/api/business/series/vo/SeriesQualifyingMatchRankVO.java
0 → 100644
View file @
936f8da2
package
com
.
antai
.
sport
.
http
.
server
.
management
.
api
.
business
.
series
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
@Data
@ApiModel
(
"系列赛预选赛大区排名"
)
public
class
SeriesQualifyingMatchRankVO
{
private
Long
id
;
@ApiModelProperty
(
"用户Id"
)
private
Long
playerId
;
private
String
realName
;
private
String
idCard
;
private
String
phone
;
private
String
sex
;
@ApiModelProperty
(
"昵称"
)
private
String
nickname
;
@ApiModelProperty
(
"头像"
)
private
String
avatar
;
@ApiModelProperty
(
"用时(秒)"
)
private
Integer
duration
;
@ApiModelProperty
(
"骑行总长度"
)
private
BigDecimal
distance
;
@ApiModelProperty
(
"爬坡高度"
)
private
BigDecimal
climbDistance
;
@ApiModelProperty
(
"平均功率"
)
private
BigDecimal
avgFtp
;
@ApiModelProperty
(
"平均速度"
)
private
BigDecimal
avgSpeed
;
@ApiModelProperty
(
"完成时间 yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
LocalDateTime
finishTime
;
@ApiModelProperty
(
"体重"
)
private
BigDecimal
weight
;
@ApiModelProperty
(
"玩家当时ftp"
)
private
Integer
ftp
;
@ApiModelProperty
(
"玩家当时身高"
)
private
BigDecimal
height
;
@ApiModelProperty
(
"玩家当时设置最大心率"
)
private
Integer
heartRate
;
@ApiModelProperty
(
"玩家平均心率"
)
private
Integer
avgHeartRate
;
@ApiModelProperty
(
"1分钟平均最佳FTP"
)
private
BigDecimal
oneMinutesFtp
;
@ApiModelProperty
(
"5分钟平均最佳FTP"
)
private
BigDecimal
fiveMinutesFtp
;
@ApiModelProperty
(
"20分钟平均最佳FTP"
)
private
BigDecimal
twentyMinutesFtp
;
@ApiModelProperty
(
"1分钟平均最佳功体比"
)
private
BigDecimal
oneMinutesWkg
;
@ApiModelProperty
(
"5分钟平均最佳功体比"
)
private
BigDecimal
fiveMinutesWkg
;
@ApiModelProperty
(
"20分钟平均最佳功体比"
)
private
BigDecimal
twentyMinutesWkg
;
@ApiModelProperty
(
"成绩确认状态 10 待确认 20 无效 30已确认未晋级 40晋级"
)
private
Integer
resultConfirmStatus
;
private
Integer
status
;
}
management-api/src/main/resources/mapper/series/SeriesBusinessMapper.xml
View file @
936f8da2
...
...
@@ -43,4 +43,16 @@
where t1.deleted = 0 and t1.round_id = #{roundId}
order by id desc
</select>
<select
id=
"getSeriesQualifyingMatchRank"
resultType=
"com.antai.sport.http.server.management.api.business.series.vo.SeriesQualifyingMatchRankVO"
>
select t2.*,t3.avatar,t3.nickname,t4.ftp,t4.heart_rate,t4.avg_heart_rate,t4.height,t5.name as real_name,
t5.phone,t5.id_card,if(t5.sex=1,'男','女') as sex
from series_round_rank t1
left join series_match_player_record t2 on t1.record_id = t2.id
left join sport_user t3 on t1.sport_user_id = t3.id
left join sport_user_training_log t4 on t4.game_mode = 30 and t1.record_id = t4.record_id
left join series_apply t5 on t1.series_id = t5.series_id and t1.sport_user_id = t5.sport_user_id
where t1.round_id = #{roundId} and t1.area_id = #{areaId}
</select>
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment