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
e15d0ce2
Commit
e15d0ce2
authored
Sep 07, 2022
by
liming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整骑行数据保存
parent
81c8faae
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
3955 additions
and
3810 deletions
+3955
-3810
antai-sport.ndm2
doc/antai-sport.ndm2
+3907
-3803
SportUserTrainingLog.java
.../server/repository/sport/entity/SportUserTrainingLog.java
+4
-0
TrainingDetailRankVO.java
...er/api/business/traininglog/dto/TrainingDetailRankVO.java
+8
-0
TrainingDetailVO.java
...server/api/business/traininglog/dto/TrainingDetailVO.java
+8
-0
SportUserTrainingLogService.java
...ness/traininglog/service/SportUserTrainingLogService.java
+8
-4
CyclingDataDTO.java
...ort/http/server/server/api/common/dto/CyclingDataDTO.java
+2
-0
SportUserTrainingLogBusinessMapper.xml
...mapper/traininglog/SportUserTrainingLogBusinessMapper.xml
+18
-3
No files found.
doc/antai-sport.ndm2
View file @
e15d0ce2
This diff is collapsed.
Click to expand it.
repository/src/main/java/com/antai/sport/http/server/repository/sport/entity/SportUserTrainingLog.java
View file @
e15d0ce2
...
...
@@ -111,6 +111,10 @@ public class SportUserTrainingLog implements Serializable {
private
Integer
calorie
;
private
BigDecimal
weight
;
private
Integer
ftp
;
private
BigDecimal
height
;
private
Integer
heartRate
;
private
Integer
avgHeartRate
;
private
BigDecimal
oneMinutesFtp
;
private
BigDecimal
fiveMinutesFtp
;
private
BigDecimal
twentyMinutesFtp
;
...
...
server-api/src/main/java/com/antai/sport/http/server/server/api/business/traininglog/dto/TrainingDetailRankVO.java
View file @
e15d0ce2
...
...
@@ -35,6 +35,14 @@ public class TrainingDetailRankVO {
@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"
)
...
...
server-api/src/main/java/com/antai/sport/http/server/server/api/business/traininglog/dto/TrainingDetailVO.java
View file @
e15d0ce2
...
...
@@ -62,6 +62,14 @@ public class TrainingDetailVO {
@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"
)
...
...
server-api/src/main/java/com/antai/sport/http/server/server/api/business/traininglog/service/SportUserTrainingLogService.java
View file @
e15d0ce2
...
...
@@ -128,6 +128,10 @@ public class SportUserTrainingLogService {
if
(
clubMember
!=
null
)
{
log
.
setClubId
(
clubMember
.
getClubId
());
}
SportUser
sportUser
=
sportUserMapper
.
selectById
(
playerId
);
log
.
setFtp
(
sportUser
.
getFtp
());
log
.
setHeight
(
sportUser
.
getHeight
());
log
.
setHeartRate
(
sportUser
.
getHeartRate
());
sportUserTrainingLogMapper
.
insert
(
log
);
//处理玩家记录汇总
SportUserSummary
summary
=
this
.
handleSportUserSummary
(
playerId
,
log
,
gameMode
,
sportData
);
...
...
@@ -143,21 +147,21 @@ public class SportUserTrainingLogService {
//处理玩家成就
achievementService
.
handleSportAchievement
(
gameMode
,
summary
);
//处理ftp变化事件
handleFtpChange
(
playerId
,
sportData
.
getTwentyMinutesFtp
());
handleFtpChange
(
sportUser
,
sportData
.
getTwentyMinutesFtp
());
}
void
handleFtpChange
(
Long
sportUserId
,
BigDecimal
twentyMinutesFtp
)
{
void
handleFtpChange
(
SportUser
sportUser
,
BigDecimal
twentyMinutesFtp
)
{
if
(
twentyMinutesFtp
==
null
||
twentyMinutesFtp
.
compareTo
(
BigDecimal
.
ZERO
)
<=
0
)
{
return
;
}
SportUser
sportUser
=
sportUserMapper
.
selectById
(
sportUserId
);
BigDecimal
oldFtp
=
sportUser
.
getFtp
()
==
null
?
BigDecimal
.
ZERO
:
BigDecimal
.
valueOf
(
sportUser
.
getFtp
());
BigDecimal
newFtp
=
twentyMinutesFtp
.
multiply
(
BigDecimal
.
valueOf
(
0.93
)).
setScale
(
0
,
RoundingMode
.
HALF_UP
);
if
(
newFtp
.
compareTo
(
oldFtp
)
==
1
)
{
sportUser
.
setFtp
(
newFtp
.
intValue
());
sportUserMapper
.
updateById
(
sportUser
);
SportUserFtpChangeLog
ftpChangeLog
=
new
SportUserFtpChangeLog
();
ftpChangeLog
.
setSportUserId
(
sportUser
Id
);
ftpChangeLog
.
setSportUserId
(
sportUser
.
getId
()
);
ftpChangeLog
.
setOldFtp
(
oldFtp
.
intValue
());
ftpChangeLog
.
setNewFtp
(
newFtp
.
intValue
());
ftpChangeLog
.
setCreateTime
(
LocalDateTime
.
now
());
...
...
server-api/src/main/java/com/antai/sport/http/server/server/api/common/dto/CyclingDataDTO.java
View file @
e15d0ce2
...
...
@@ -43,6 +43,8 @@ public class CyclingDataDTO {
@ApiModelProperty
(
"完成时间 yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
LocalDateTime
finishTime
;
@ApiModelProperty
(
"平均心率"
)
public
Integer
avgHeartRate
;
@ApiModelProperty
(
hidden
=
true
)
@JsonIgnore
...
...
server-api/src/main/resources/mapper/traininglog/SportUserTrainingLogBusinessMapper.xml
View file @
e15d0ce2
...
...
@@ -57,9 +57,14 @@
select t1.*,
t1.match_rank as game_rank,
t2.avatar,
t2.nickname
t2.nickname,
t3.ftp,
t3.heart_rate,
t3.avg_heart_rate,
t3.height
from simple_match_player_record t1
left join sport_user t2 on t1.player_id = t2.id
left join sport_user_training_log t3 on t3.game_mode = 20 and t1.id = t3.record_id
where t1.match_id = #{sourceId}
order by match_rank asc
</if>
...
...
@@ -67,9 +72,14 @@
select t1.*,
t1.training_rank as game_rank,
t2.avatar,
t2.nickname
t2.nickname,
t3.ftp,
t3.heart_rate,
t3.avg_heart_rate,
t3.height
from team_training_player_record t1
left join sport_user t2 on t1.player_id = t2.id
left join sport_user_training_log t3 on t3.game_mode = 50 and t1.id = t3.record_id
where t1.team_training_id = #{sourceId}
order by training_rank asc
</if>
...
...
@@ -77,9 +87,14 @@
select t1.*,
t1.match_rank as game_rank,
t2.avatar,
t2.nickname
t2.nickname,
t3.ftp,
t3.heart_rate,
t3.avg_heart_rate,
t3.height
from room_mode_player_record t1
left join sport_user t2 on t1.player_id = t2.id
left join sport_user_training_log t3 on t3.game_mode = 60 and t1.id = t3.record_id
where t1.room_id = #{sourceId}
order by match_rank asc
</if>
...
...
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