Commit 1d81de1f authored by 赵啸非's avatar 赵啸非

添加虚增记录日志打印

parent 44feead3
...@@ -81,21 +81,14 @@ instance.interceptors.response.use(response=>{ ...@@ -81,21 +81,14 @@ instance.interceptors.response.use(response=>{
* @returns * @returns
*/ */
export function post(url, option, config = {}) { export function post(url, option, config = {}) {
//判断object是数组还是对象
if(Array.isArray(option)){
return instance.post(url, option, config)
}
const data = Object.assign({}, option, { const data = Object.assign({}, option, {
// __mortals_token__: cookie.getItem('__mortals_token__'), // __mortals_token__: cookie.getItem('__mortals_token__'),
}) })
return instance.post(url, data, config) 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 = {}) { ...@@ -116,7 +109,7 @@ export function get(url, option, config = {}) {
// 文件上传 // 文件上传
const uploadInstance = axios.create({ const uploadInstance = axios.create({
baseURL: '/m', baseURL: '/attendance',
headers: { headers: {
post: { post: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl> <profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>
<profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId> <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
<package.environment>build</package.environment> <package.environment>build</package.environment>
<skipUi>ture</skipUi> <skipUi>true</skipUi>
</properties> </properties>
</profile> </profile>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl> <profiles.sms.smsSendUrl>http://sms.wx3.com.cn/api/index/index</profiles.sms.smsSendUrl>
<profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId> <profiles.sms.apiId>ADsUXLrS81vZDU95</profiles.sms.apiId>
<skipUi>ture</skipUi> <skipUi>true</skipUi>
</properties> </properties>
</profile> </profile>
......
...@@ -50,6 +50,13 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService { ...@@ -50,6 +50,13 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery(); AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery();
recordHikQuery.setAttendanceDateStart(DateUtil.today()); recordHikQuery.setAttendanceDateStart(DateUtil.today());
recordHikQuery.setAttendanceDateEnd(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()); 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())); 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(); Iterator<Map.Entry<Long, List<AttendanceGroupStaffEntity>>> iterator = groupStaffCollect.entrySet().iterator();
...@@ -119,7 +126,7 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService { ...@@ -119,7 +126,7 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
} }
} }
calculateAttendByDay(); calculateAttendByDay();*/
} }
private Boolean checkWorkByHoliday() { private Boolean checkWorkByHoliday() {
......
...@@ -691,6 +691,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte ...@@ -691,6 +691,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
int count = this.count(query, context); int count = this.count(query, context);
if (count > 0) { if (count > 0) {
//删除当前虚增的记录 //删除当前虚增的记录
log.info("删除虚增的记录:{}", recordHikEntity.getId());
this.remove(recordHikEntity.getId(), context); this.remove(recordHikEntity.getId(), context);
} }
} }
......
...@@ -91,7 +91,7 @@ public class HikStaffServiceImpl extends AbstractHikService implements IHikStaff ...@@ -91,7 +91,7 @@ public class HikStaffServiceImpl extends AbstractHikService implements IHikStaff
} else if (dwState == HCNetSDK.NET_SDK_CONFIG_STATUS_SUCCESS) { } else if (dwState == HCNetSDK.NET_SDK_CONFIG_STATUS_SUCCESS) {
ptrOutuff.read(); ptrOutuff.read();
resp = new String(ptrOutuff.byValue).trim(); resp = new String(ptrOutuff.byValue).trim();
log.info("查询人员成功, json==>{}", resp); // log.info("查询人员成功, json==>{}", resp);
break; break;
} else if (dwState == HCNetSDK.NET_SDK_CONFIG_STATUS_FINISH) { } else if (dwState == HCNetSDK.NET_SDK_CONFIG_STATUS_FINISH) {
log.info("获取人员完成"); log.info("获取人员完成");
......
...@@ -53,14 +53,13 @@ Content-Type: application/json ...@@ -53,14 +53,13 @@ Content-Type: application/json
###海康考勤打卡记录虚增记录 ###考勤打卡记录虚增记录
POST {{baseUrl}}/attendance/record/hik/addAttendanceRecordCustom POST {{baseUrl}}/attendance/record/hik/addAttendanceRecordCustom
Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"attendanceDateStart": "2023-12-01", "attendanceDateStart": "2024-05-15",
"attendanceDateEnd": "2024-01-25" "attendanceDateEnd": "2024-05-15"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment