Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
e757c596
Commit
e757c596
authored
Jul 20, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总
parent
53a4b33d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java
...r/src/main/java/com/mortals/xhx/busiz/TestController.java
+6
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
...n/java/com/mortals/xhx/module/hik/AbstractHikService.java
+1
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java
View file @
e757c596
...
@@ -130,7 +130,6 @@ public class TestController {
...
@@ -130,7 +130,6 @@ public class TestController {
}
}
private
void
getDoorEvents
(
Rest
<
DoorEventDataInfo
>
doorEventsRest
)
{
private
void
getDoorEvents
(
Rest
<
DoorEventDataInfo
>
doorEventsRest
)
{
//同步当前考勤数据
//同步当前考勤数据
List
<
AttendanceRecordHikEntity
>
attRecords
=
doorEventsRest
.
getData
().
getList
().
stream
().
map
(
item
->
{
List
<
AttendanceRecordHikEntity
>
attRecords
=
doorEventsRest
.
getData
().
getList
().
stream
().
map
(
item
->
{
...
@@ -138,7 +137,7 @@ public class TestController {
...
@@ -138,7 +137,7 @@ public class TestController {
recordHikEntity
.
initAttrValue
();
recordHikEntity
.
initAttrValue
();
StaffEntity
staffCache
=
staffService
.
getExtCache
(
StrUtil
.
padPre
(
item
.
getJobNo
(),
8
,
"0"
));
StaffEntity
staffCache
=
staffService
.
getExtCache
(
StrUtil
.
padPre
(
item
.
getJobNo
(),
8
,
"0"
));
if
(
ObjectUtils
.
isEmpty
(
staffCache
))
{
if
(
ObjectUtils
.
isEmpty
(
staffCache
))
{
log
.
info
(
"staff is null !staffCode:{}"
,
item
.
getJobNo
());
log
.
info
(
"staff is null !staffCode:{}"
,
item
.
getJobNo
());
return
null
;
return
null
;
}
}
...
@@ -158,12 +157,15 @@ public class TestController {
...
@@ -158,12 +157,15 @@ public class TestController {
recordHikEntity
.
setCreateUserName
(
"system"
);
recordHikEntity
.
setCreateUserName
(
"system"
);
recordHikEntity
.
setCreateUserId
(
1L
);
recordHikEntity
.
setCreateUserId
(
1L
);
return
recordHikEntity
;
return
recordHikEntity
;
}).
filter
(
f
->
f
!=
null
).
collect
(
Collectors
.
toList
());
}).
filter
(
f
->
f
!=
null
).
collect
(
Collectors
.
toList
());
log
.
info
(
"attRecords size:{}"
,
attRecords
.
size
());
log
.
info
(
"attRecords size:{}"
,
attRecords
.
size
());
if
(!
ObjectUtils
.
isEmpty
(
attRecords
))
{
if
(!
ObjectUtils
.
isEmpty
(
attRecords
))
{
recordHikService
.
save
(
attRecords
);
for
(
AttendanceRecordHikEntity
attRecord
:
attRecords
)
{
recordHikService
.
save
(
attRecord
);
}
}
}
/*
/*
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/AbstractHikService.java
View file @
e757c596
...
@@ -8,7 +8,7 @@ import java.util.Map;
...
@@ -8,7 +8,7 @@ import java.util.Map;
public
abstract
class
AbstractHikService
{
public
abstract
class
AbstractHikService
{
@Value
(
"${hik.host:
''
}"
)
@Value
(
"${hik.host:}"
)
protected
String
host
;
protected
String
host
;
@Value
(
"${hik.appKey:''}"
)
@Value
(
"${hik.appKey:''}"
)
...
...
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