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
e7fac3de
Commit
e7fac3de
authored
Aug 21, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改本月统计
parent
c6a3afb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
.../module/attendance/web/AttendanceRecordHikController.java
+14
-1
common-lib/src/main/java/com/mortals/xhx/common/keys/RedisCacheKeys.java
...main/java/com/mortals/xhx/common/keys/RedisCacheKeys.java
+6
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordHikController.java
View file @
e7fac3de
...
@@ -6,11 +6,13 @@ import com.mortals.framework.common.Rest;
...
@@ -6,11 +6,13 @@ import com.mortals.framework.common.Rest;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.Context
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.service.ICacheService
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.framework.utils.ServletUtils
;
import
com.mortals.framework.utils.ServletUtils
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.upload.service.UploadService
;
import
com.mortals.xhx.base.system.upload.service.UploadService
;
import
com.mortals.xhx.common.keys.RedisCacheKeys
;
import
com.mortals.xhx.module.attendance.model.AttendanceClassEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceClassEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceExportRecordEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceExportRecordEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceGroupEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceGroupEntity
;
...
@@ -65,6 +67,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -65,6 +67,8 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
private
AttendanceGroupService
groupService
;
private
AttendanceGroupService
groupService
;
@Autowired
@Autowired
private
AttendanceClassService
classService
;
private
AttendanceClassService
classService
;
@Autowired
private
ICacheService
cacheService
;
public
AttendanceRecordHikController
()
{
public
AttendanceRecordHikController
()
{
super
.
setModuleDesc
(
"海康考勤打卡记录汇总信息"
);
super
.
setModuleDesc
(
"海康考勤打卡记录汇总信息"
);
...
@@ -183,6 +187,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -183,6 +187,13 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
}
else
{
}
else
{
query
.
getOrderColList
().
add
(
new
OrderCol
(
"attendanceDate"
,
OrderCol
.
DESCENDING
));
query
.
getOrderColList
().
add
(
new
OrderCol
(
"attendanceDate"
,
OrderCol
.
DESCENDING
));
}
}
boolean
bool
=
cacheService
.
set
(
RedisCacheKeys
.
getHikExportLockKey
(),
"111"
,
120L
);
if
(!
bool
)
{
throw
new
AppException
(
"考勤数据正在导出中,请稍后再试!"
);
}
}
}
@Override
@Override
...
@@ -222,7 +233,9 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
...
@@ -222,7 +233,9 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
attendanceExportRecordEntity
.
setType
(
1
);
attendanceExportRecordEntity
.
setType
(
1
);
attendanceExportRecordEntity
.
setExportOrImport
(
1
);
attendanceExportRecordEntity
.
setExportOrImport
(
1
);
attendanceExportRecordService
.
save
(
attendanceExportRecordEntity
);
attendanceExportRecordService
.
save
(
attendanceExportRecordEntity
);
super
.
doExportFileAfter
(
data
,
query
,
context
);
cacheService
.
del
(
RedisCacheKeys
.
getHikExportLockKey
());
}
}
}
}
common-lib/src/main/java/com/mortals/xhx/common/keys/RedisCacheKeys.java
View file @
e7fac3de
...
@@ -17,5 +17,10 @@ public final class RedisCacheKeys {
...
@@ -17,5 +17,10 @@ public final class RedisCacheKeys {
public
static
String
getCoopsDistributedLockKey
()
{
public
static
String
getCoopsDistributedLockKey
()
{
return
"coops:distributed:lock"
;
return
"coops:distributed:lock"
;
}
}
public
static
String
getHikExportLockKey
()
{
return
"hik:export:lock"
;
}
}
}
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