Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gk
Project
Project
Details
Activity
Releases
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
micro_app
gk
Commits
2deb6056
Commit
2deb6056
authored
May 18, 2020
by
sunyuhua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成绩审核的后台代码,提交成绩计算配速,里程的代码
parent
0438868b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
9 deletions
+50
-9
UserScore.java
...n/java/com/dlbridge/jadp/plugins/cmpt/bean/UserScore.java
+1
-2
CmptScoreRuleScoreInfoService.java
...p/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
+4
-4
RemoteService.java
...com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
+28
-0
MicroApiController.java
...om/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
+17
-3
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/UserScore.java
View file @
2deb6056
...
@@ -8,10 +8,9 @@ import java.util.List;
...
@@ -8,10 +8,9 @@ import java.util.List;
@Data
@Data
public
class
UserScore
{
public
class
UserScore
{
//报名iD
private
String
markNo
;
private
String
markNo
;
//报名iD
private
Integer
cmptId
;
private
Integer
cmptId
;
private
Integer
roadId
;
private
Integer
indexId
;
private
Integer
indexId
;
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptScoreRuleScoreInfoService.java
View file @
2deb6056
...
@@ -97,10 +97,10 @@ public class CmptScoreRuleScoreInfoService {
...
@@ -97,10 +97,10 @@ public class CmptScoreRuleScoreInfoService {
cmptEnrollInfo
.
put
(
"remark"
,
DateUtil
.
formatDate
((
Long
)
scoreResult
.
get
(
"userTotalScore"
)));
cmptEnrollInfo
.
put
(
"remark"
,
DateUtil
.
formatDate
((
Long
)
scoreResult
.
get
(
"userTotalScore"
)));
cmptEnrollInfo
.
put
(
"remark2"
,
String
.
valueOf
(((
int
)
scoreResult
.
get
(
"userTotalMileage"
)/
100
d
)/
10
d
));
cmptEnrollInfo
.
put
(
"remark2"
,
String
.
valueOf
(((
int
)
scoreResult
.
get
(
"userTotalMileage"
)/
100
d
)/
10
d
));
boolean
enrollFlag
=
remoteService
.
mergePersonEnrollByMarkNo
(
cmptEnrollInfo
);
boolean
enrollFlag
=
remoteService
.
mergePersonEnrollByMarkNo
(
cmptEnrollInfo
);
//将成绩插入到计时系统,以便出完赛证书
//
//将成绩插入到计时系统,以便出完赛证书
String
records
=
markNo
+
","
+
DateUtil
.
formatDate
((
Long
)
scoreResult
.
get
(
"userTotalScore"
))+
",3"
;
//
String records=markNo+","+DateUtil.formatDate((Long)scoreResult.get("userTotalScore"))+",3";
boolean
timeFlag
=
remoteService
.
uploadTimeScore
(
cmptId
,
records
);
//
boolean timeFlag=remoteService.uploadTimeScore(cmptId,records);
return
enrollFlag
&
timeFlag
;
return
enrollFlag
;
}
}
return
false
;
return
false
;
}
}
...
...
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
View file @
2deb6056
...
@@ -564,5 +564,33 @@ public class RemoteService {
...
@@ -564,5 +564,33 @@ public class RemoteService {
return
false
;
return
false
;
}
}
/**
* 获取赛程的信息
* @param cmptId
* @param roadId
* @return
*/
public
HashMap
<
String
,
Object
>
getTimeSegInfoByRoadId
(
Integer
cmptId
,
Integer
roadId
)
{
ResponseEntity
<
String
>
forEntity
=
restTemplate
.
getForEntity
(
timerURL
+
"getRoad.do?cmptId="
+
cmptId
+
"&roadId="
+
roadId
,
String
.
class
);
HashMap
<
String
,
Object
>
segInfo
=
new
HashMap
<>();
if
(
forEntity
.
getStatusCode
()
==
HttpStatus
.
OK
)
{
List
<
RoadsGpsCheckpointMap
>
roadsGpsCheckpointMapList
=
new
ArrayList
<>();
String
resultString
=
forEntity
.
getBody
();
log
.
info
(
"计时打卡点:"
+
resultString
);
JSONObject
object
=
JSONObject
.
parseObject
(
resultString
);
JSONObject
roadJsonObject
=
object
.
getJSONObject
(
"road"
);
JSONArray
segsResult
=
roadJsonObject
.
getJSONArray
(
"segs"
);
if
(
segsResult
==
null
||
segsResult
.
isEmpty
())
return
null
;
//支持多日赛
for
(
int
j
=
0
;
j
<
segsResult
.
size
();
j
++)
{
JSONObject
resultObject
=
(
JSONObject
)
segsResult
.
get
(
j
);
int
distance
=
resultObject
.
getInteger
(
"distance"
);
segInfo
.
put
(
"distance"
,
distance
);
}
return
segInfo
;
}
else
{
return
null
;
}
}
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @
2deb6056
...
@@ -880,10 +880,25 @@ public class MicroApiController {
...
@@ -880,10 +880,25 @@ public class MicroApiController {
.setRuleId(rule.getId())
.setRuleId(rule.getId())
.setScoreItemId(scoreItemResult.getContent().getId()));
.setScoreItemId(scoreItemResult.getContent().getId()));
*/
*/
//根据里程计算配速,里程来自用户自己填写的里程或者来自项目的里程
int
duration
=
score
.
getScore
().
getDuration
();
int
cmptPace
=
0
;
int
mileage
=
0
;
FuncSetting
settingByCmptId
=
funcSettingService
.
getSettingByCmptId
(
score
.
getCmptId
());
int
isHasMileage
=
settingByCmptId
.
getMileage
();
if
(
isHasMileage
==
1
){
mileage
=
score
.
getScore
().
getMileage
();
cmptPace
=
duration
/
mileage
;
}
else
{
int
distance
=(
int
)
remoteService
.
getTimeSegInfoByRoadId
(
score
.
getCmptId
(),
score
.
getRoadId
()).
get
(
"distance"
);
mileage
=
distance
;
cmptPace
=
duration
/
mileage
;
}
//前端上传json中取出里程,耗时,提交时间,赛事地,规则id,markNo
//前端上传json中取出里程,耗时,提交时间,赛事地,规则id,markNo
int
mileage
=
score
.
getScore
().
getMileage
();
CmptScoreRuleScoreInfo
CmptScoreRuleScoreInfo
=
new
CmptScoreRuleScoreInfo
()
CmptScoreRuleScoreInfo
CmptScoreRuleScoreInfo
=
new
CmptScoreRuleScoreInfo
()
.
setSubsectionscore
(
score
.
getScore
().
getDuration
()).
setSubsectionMileage
(
mileage
)
.
setSubsectionscore
(
score
.
getScore
().
getDuration
()).
setSubsectionMileage
(
mileage
)
.
setCmptPace
(
cmptPace
)
.
setSubsectionTime
(
score
.
getScore
().
getDate
())
.
setSubsectionTime
(
score
.
getScore
().
getDate
())
.
setCmptId
(
score
.
getCmptId
()).
setRuleId
(
rule
.
getId
()).
setMarkNo
(
score
.
getMarkNo
());
.
setCmptId
(
score
.
getCmptId
()).
setRuleId
(
rule
.
getId
()).
setMarkNo
(
score
.
getMarkNo
());
// 保存校验通过的成绩
// 保存校验通过的成绩
...
@@ -897,7 +912,6 @@ public class MicroApiController {
...
@@ -897,7 +912,6 @@ public class MicroApiController {
// 提交成绩保存设置附加项(照片等)
// 提交成绩保存设置附加项(照片等)
cmptScoreFieldValueService
.
saveOrUpdate
(
score
.
getFields
());
cmptScoreFieldValueService
.
saveOrUpdate
(
score
.
getFields
());
//查看自动审核是否开启,如果开启直接将总成绩存入到计时系统remark1,如果没有开启走手动审核的逻辑
//查看自动审核是否开启,如果开启直接将总成绩存入到计时系统remark1,如果没有开启走手动审核的逻辑
FuncSetting
settingByCmptId
=
funcSettingService
.
getSettingByCmptId
(
score
.
getCmptId
());
cmptScoreRuleScoreInfoService
.
scoreReviewByMarkNo
(
score
.
getCmptId
(),
score
.
getMarkNo
(),
settingByCmptId
.
getSwitchScoreReview
());
cmptScoreRuleScoreInfoService
.
scoreReviewByMarkNo
(
score
.
getCmptId
(),
score
.
getMarkNo
(),
settingByCmptId
.
getSwitchScoreReview
());
return
Result
.
success
().
setContent
(
score
);
return
Result
.
success
().
setContent
(
score
);
}
}
...
...
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