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
056129d8
Commit
056129d8
authored
May 08, 2020
by
sunyuhua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自动打卡后台清空完数据,通知前端清空数据
parent
c7d14ac9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
3 deletions
+35
-3
RemoteService.java
...com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
+31
-1
MicroApiController.java
...om/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
+4
-2
No files found.
src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java
View file @
056129d8
...
@@ -414,7 +414,37 @@ public class RemoteService {
...
@@ -414,7 +414,37 @@ public class RemoteService {
return
null
;
return
null
;
}
}
}
}
/**
* 根据号码牌获取此人是否有成绩,
* 有成绩就通知小程序不清空打卡内存数据,返回0L
* 没有成绩就通知小程序清空打卡内存数据,返回1L
* @param cmptId
* @param roadId
* @param markNo
* @return
*/
public
long
getIsCleanByMarkNo
(
Integer
cmptId
,
Integer
roadId
,
String
markNo
){
ResponseEntity
<
String
>
forEntity
=
restTemplate
.
getForEntity
(
timerURL
+
"personCPScore.do?cmptId="
+
cmptId
+
"&markNo="
+
markNo
,
String
.
class
);
log
.
info
(
"计时个人详情请求地址:"
+
timerURL
+
"personCPScore.do?cmptId="
+
cmptId
+
"&markNo="
+
markNo
);
if
(
forEntity
.
getStatusCode
()
==
HttpStatus
.
OK
)
{
String
resultString
=
forEntity
.
getBody
();
JSONObject
object
=
JSONObject
.
parseObject
(
resultString
);
JSONArray
segsResult
=
object
.
getJSONArray
(
"segs"
);
if
(
segsResult
==
null
||
segsResult
.
isEmpty
())
return
0L
;
for
(
int
i
=
0
;
i
<
segsResult
.
size
();
i
++){
JSONObject
resultObject
=
(
JSONObject
)
segsResult
.
get
(
i
);
String
segTimespan
=
resultObject
.
getString
(
"segTimespan"
);
if
(
"0"
.
equals
(
segTimespan
)){
//通知小程序清空内存数据
return
1L
;
}
else
{
//不能清空内存数据
return
0L
;
}
}
}
return
0L
;
}
}
}
src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java
View file @
056129d8
...
@@ -992,13 +992,15 @@ public class MicroApiController {
...
@@ -992,13 +992,15 @@ public class MicroApiController {
}
}
@GetMapping
(
value
=
"/getRoadOpenTimeAndCloseTime/{cmptId}/{roadId}"
)
@GetMapping
(
value
=
"/getRoadOpenTimeAndCloseTime/{cmptId}/{roadId}
/{markNo}
"
)
@ApiResponses
({
@ApiResponses
({
@ApiResponse
(
code
=
-
1
,
message
=
"失败"
,
response
=
ObjectUtils
.
Null
.
class
),
@ApiResponse
(
code
=
-
1
,
message
=
"失败"
,
response
=
ObjectUtils
.
Null
.
class
),
@ApiResponse
(
code
=
200
,
message
=
"成功"
,
response
=
Result
.
class
,
responseContainer
=
"List"
)})
@ApiResponse
(
code
=
200
,
message
=
"成功"
,
response
=
Result
.
class
,
responseContainer
=
"List"
)})
@ApiOperation
(
value
=
"自动打卡获取开枪时间或者结束时间"
,
notes
=
"自动打卡获取开枪时间或者结束时间"
,
tags
=
"自动打卡获取开枪时间或者结束时间"
)
@ApiOperation
(
value
=
"自动打卡获取开枪时间或者结束时间"
,
notes
=
"自动打卡获取开枪时间或者结束时间"
,
tags
=
"自动打卡获取开枪时间或者结束时间"
)
public
Result
getRoadOpenTimeAndCloseTime
(
@PathVariable
(
"cmptId"
)
int
cmptId
,
@PathVariable
(
"roadId"
)
int
roadId
){
public
Result
getRoadOpenTimeAndCloseTime
(
@PathVariable
(
"cmptId"
)
int
cmptId
,
@PathVariable
(
"roadId"
)
int
roadId
,
@PathVariable
(
"markNo"
)
String
markNo
){
HashMap
<
String
,
Long
>
roadsGpsCheckpointMapList
=
remoteService
.
getRoadOpenTimeAndCloseTime
(
cmptId
,
roadId
);
HashMap
<
String
,
Long
>
roadsGpsCheckpointMapList
=
remoteService
.
getRoadOpenTimeAndCloseTime
(
cmptId
,
roadId
);
long
_isclean
=
remoteService
.
getIsCleanByMarkNo
(
cmptId
,
roadId
,
markNo
);
roadsGpsCheckpointMapList
.
put
(
"isClean"
,
_isclean
);
return
Result
.
success
().
setContent
(
roadsGpsCheckpointMapList
);
return
Result
.
success
().
setContent
(
roadsGpsCheckpointMapList
);
}
}
...
...
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