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
1d81de1f
Commit
1d81de1f
authored
May 17, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加虚增记录日志打印
parent
44feead3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
20 deletions
+20
-20
attendance-performance-manager-ui/admin/src/assets/utils/ajax.js
...nce-performance-manager-ui/admin/src/assets/utils/ajax.js
+5
-12
attendance-performance-manager/pom.xml
attendance-performance-manager/pom.xml
+2
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
...m/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
+8
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
...tendance/service/impl/AttendanceRecordHikServiceImpl.java
+1
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/service/impl/HikStaffServiceImpl.java
...hx/module/hik/staff/service/impl/HikStaffServiceImpl.java
+1
-1
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+3
-4
No files found.
attendance-performance-manager-ui/admin/src/assets/utils/ajax.js
View file @
1d81de1f
...
...
@@ -81,21 +81,14 @@ instance.interceptors.response.use(response=>{
* @returns
*/
export
function
post
(
url
,
option
,
config
=
{})
{
//判断object是数组还是对象
if
(
Array
.
isArray
(
option
)){
return
instance
.
post
(
url
,
option
,
config
)
}
const
data
=
Object
.
assign
({},
option
,
{
// __mortals_token__: cookie.getItem('__mortals_token__'),
})
return
instance
.
post
(
url
,
data
,
config
)
/* //判断object是数组还是对象
if(Object.getPrototypeOf(option) === Object.prototype){
const data = Object.assign({}, option, {
// __mortals_token__: cookie.getItem('__mortals_token__'),
})
return instance.post(url, data, config)
}else{
return instance.post(url, option, config)
}*/
}
/**
...
...
@@ -116,7 +109,7 @@ export function get(url, option, config = {}) {
// 文件上传
const
uploadInstance
=
axios
.
create
({
baseURL
:
'
/
m
'
,
baseURL
:
'
/
attendance
'
,
headers
:
{
post
:
{
'
Content-Type
'
:
'
multipart/form-data
'
,
...
...
attendance-performance-manager/pom.xml
View file @
1d81de1f
...
...
@@ -163,7 +163,7 @@
<profiles.sms.smsSendUrl>
http://sms.wx3.com.cn/api/index/index
</profiles.sms.smsSendUrl>
<profiles.sms.apiId>
ADsUXLrS81vZDU95
</profiles.sms.apiId>
<package.environment>
build
</package.environment>
<skipUi>
t
ur
e
</skipUi>
<skipUi>
t
ru
e
</skipUi>
</properties>
</profile>
...
...
@@ -176,7 +176,7 @@
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.sms.smsSendUrl>
http://sms.wx3.com.cn/api/index/index
</profiles.sms.smsSendUrl>
<profiles.sms.apiId>
ADsUXLrS81vZDU95
</profiles.sms.apiId>
<skipUi>
t
ur
e
</skipUi>
<skipUi>
t
ru
e
</skipUi>
</properties>
</profile>
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
View file @
1d81de1f
...
...
@@ -50,6 +50,13 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
AttendanceRecordHikQuery
recordHikQuery
=
new
AttendanceRecordHikQuery
();
recordHikQuery
.
setAttendanceDateStart
(
DateUtil
.
today
());
recordHikQuery
.
setAttendanceDateEnd
(
DateUtil
.
today
());
recordHikQuery
.
setAttendanceDateStart
(
DateUtil
.
today
());
recordHikQuery
.
setAttendanceDateEnd
(
DateUtil
.
today
());
recordHikService
.
buildCustomHikRecord
(
recordHikQuery
,
null
);
/*
Set<Long> attendStaffSet = recordHikService.find(recordHikQuery).stream().map(i -> i.getStaffId()).distinct().collect(Collectors.toSet());
Map<Long, List<AttendanceGroupStaffEntity>> groupStaffCollect = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery()).stream().collect(Collectors.groupingBy(x -> x.getGroupId()));
Iterator<Map.Entry<Long, List<AttendanceGroupStaffEntity>>> iterator = groupStaffCollect.entrySet().iterator();
...
...
@@ -119,7 +126,7 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
}
}
calculateAttendByDay
();
calculateAttendByDay();
*/
}
private
Boolean
checkWorkByHoliday
()
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @
1d81de1f
...
...
@@ -691,6 +691,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
int
count
=
this
.
count
(
query
,
context
);
if
(
count
>
0
)
{
//删除当前虚增的记录
log
.
info
(
"删除虚增的记录:{}"
,
recordHikEntity
.
getId
());
this
.
remove
(
recordHikEntity
.
getId
(),
context
);
}
}
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/staff/service/impl/HikStaffServiceImpl.java
View file @
1d81de1f
...
...
@@ -91,7 +91,7 @@ public class HikStaffServiceImpl extends AbstractHikService implements IHikStaff
}
else
if
(
dwState
==
HCNetSDK
.
NET_SDK_CONFIG_STATUS_SUCCESS
)
{
ptrOutuff
.
read
();
resp
=
new
String
(
ptrOutuff
.
byValue
).
trim
();
log
.
info
(
"查询人员成功, json==>{}"
,
resp
);
//
log.info("查询人员成功, json==>{}", resp);
break
;
}
else
if
(
dwState
==
HCNetSDK
.
NET_SDK_CONFIG_STATUS_FINISH
)
{
log
.
info
(
"获取人员完成"
);
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
1d81de1f
...
...
@@ -53,14 +53,13 @@ Content-Type: application/json
###
海康
考勤打卡记录虚增记录
###考勤打卡记录虚增记录
POST {{baseUrl}}/attendance/record/hik/addAttendanceRecordCustom
Authorization: {{authToken}}
Content-Type: application/json
{
"attendanceDateStart": "202
3-12-01
",
"attendanceDateEnd": "2024-0
1-2
5"
"attendanceDateStart": "202
4-05-15
",
"attendanceDateEnd": "2024-0
5-1
5"
}
...
...
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