Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
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
王琮
entrance_api
Commits
fa035bed
Commit
fa035bed
authored
May 18, 2023
by
gaoyingwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 同步中控考勤
parent
910a500b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
AttendanceSyncSchedule.java
...isoft/sys/attendance/schedule/AttendanceSyncSchedule.java
+7
-7
ScheduledResultServiceImpl.java
...s/attendance/service/impl/ScheduledResultServiceImpl.java
+3
-3
No files found.
src/main/java/org/rcisoft/sys/attendance/schedule/AttendanceSyncSchedule.java
View file @
fa035bed
...
@@ -287,24 +287,24 @@ public class AttendanceSyncSchedule {
...
@@ -287,24 +287,24 @@ public class AttendanceSyncSchedule {
cal1
.
add
(
Calendar
.
MINUTE
,
-
10
);
cal1
.
add
(
Calendar
.
MINUTE
,
-
10
);
endTime
=
cal1
.
getTime
();
endTime
=
cal1
.
getTime
();
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
//
if (zkTecoService.saveDoorRecordInfo(DateUtil.format(beginTime,"yyyy-MM-dd HH:mm:ss")
if
(
zkTecoService
.
saveDoorRecordInfo
(
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)
//
,DateUtil.format(endTime,"yyyy-MM-dd HH:mm:ss"))) {
,
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
)))
{
ScheduledTime
scheduledTime
=
new
ScheduledTime
();
ScheduledTime
scheduledTime
=
new
ScheduledTime
();
String
date
=
DateUtil
.
format
(
now
,
"yyyy-MM-dd"
)
+
" 00:00:00"
;
String
date
=
DateUtil
.
format
(
now
,
"yyyy-MM-dd"
)
+
" 00:00:00"
;
scheduledTime
.
setScheduleDate
(
DateUtil
.
parseDate
(
date
));
scheduledTime
.
setScheduleDate
(
DateUtil
.
parseDate
(
date
));
scheduledTime
.
setBeginTime
(
DateUtil
.
parse
(
date
,
"yyyy-MM-dd HH:mm:ss"
));
scheduledTime
.
setBeginTime
(
DateUtil
.
parse
(
date
,
"yyyy-MM-dd HH:mm:ss"
));
scheduledTime
.
setEndTime
(
endTime
);
scheduledTime
.
setEndTime
(
endTime
);
scheduledResultRepository
.
insertScheduledTime
(
scheduledTime
);
scheduledResultRepository
.
insertScheduledTime
(
scheduledTime
);
//
}
}
}
else
{
}
else
{
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
int
minute
=
(
int
)
((
endTime
.
getTime
()
-
beginTime
.
getTime
())
/
1000
);
//求出两个时间段相差的秒数
int
minute
=
(
int
)
((
endTime
.
getTime
()
-
beginTime
.
getTime
())
/
1000
);
//求出两个时间段相差的秒数
log
.
error
(
"----------minute:"
+
minute
);
log
.
error
(
"----------minute:"
+
minute
);
if
(
minute
<=
600
){
//如果求出的秒数超出十分钟,则说明之前有报错,后续不执行
if
(
minute
<=
600
){
//如果求出的秒数超出十分钟,则说明之前有报错,后续不执行
//
if (zkTecoService.saveDoorRecordInfo(DateUtil.format(beginTime,"yyyy-MM-dd HH:mm:ss")
if
(
zkTecoService
.
saveDoorRecordInfo
(
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)
//
,DateUtil.format(endTime,"yyyy-MM-dd HH:mm:ss"))) {
,
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
)))
{
scheduledResultRepository
.
updateScheduledTime
(
time
.
getEndTime
(),
endTime
,
time
.
getBusinessId
());
scheduledResultRepository
.
updateScheduledTime
(
time
.
getEndTime
(),
endTime
,
time
.
getBusinessId
());
//
}
}
}
}
}
}
}
}
...
...
src/main/java/org/rcisoft/sys/attendance/service/impl/ScheduledResultServiceImpl.java
View file @
fa035bed
...
@@ -426,10 +426,10 @@ public class ScheduledResultServiceImpl extends ServiceImpl<ScheduledResultRepos
...
@@ -426,10 +426,10 @@ public class ScheduledResultServiceImpl extends ServiceImpl<ScheduledResultRepos
cal1
.
add
(
Calendar
.
SECOND
,
1
);
cal1
.
add
(
Calendar
.
SECOND
,
1
);
endTime
=
cal1
.
getTime
();
endTime
=
cal1
.
getTime
();
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
log
.
error
(
"----------同步时间段:"
+
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)+
" "
+
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
));
//
if (zkTecoService.saveDoorRecordInfo(DateUtil.format(beginTime,"yyyy-MM-dd HH:mm:ss")
if
(
zkTecoService
.
saveDoorRecordInfo
(
DateUtil
.
format
(
beginTime
,
"yyyy-MM-dd HH:mm:ss"
)
//
,DateUtil.format(endTime,"yyyy-MM-dd HH:mm:ss"))) {
,
DateUtil
.
format
(
endTime
,
"yyyy-MM-dd HH:mm:ss"
)))
{
scheduledResultRepository
.
updateScheduledTime
(
time
.
getEndTime
(),
endTime
,
time
.
getBusinessId
());
scheduledResultRepository
.
updateScheduledTime
(
time
.
getEndTime
(),
endTime
,
time
.
getBusinessId
());
//
}
}
return
new
CyPersistModel
(
1
);
return
new
CyPersistModel
(
1
);
}
}
...
...
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