diff --git a/Src/Dlhis.ScheduledTask/Common/Request/UploadAttendanceRequest.cs b/Src/Dlhis.ScheduledTask/Common/Request/UploadAttendanceRequest.cs
index f4784c1b..5748502e 100644
--- a/Src/Dlhis.ScheduledTask/Common/Request/UploadAttendanceRequest.cs
+++ b/Src/Dlhis.ScheduledTask/Common/Request/UploadAttendanceRequest.cs
@@ -1,32 +1,42 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-namespace Dlhis.ScheduledTask.Common.Request;
-
-public class UploadAttendanceRequest
+namespace Dlhis.ScheduledTask.Common.Request
{
- [JsonIgnore]
- public long Id { get; set; }
+ public class UploadAttendanceRequest
+ {
+ ///
+ /// 考勤数据包
+ ///
+ [JsonProperty("T_DATA")]
+ public List Data { get; set; }
+ }
+
+ public class UploadAttendanceRequestItem
+ {
+ [JsonIgnore]
+ public long Id { get; set; }
- ///
- /// item.CardNo.TrimEnd('\0')
- ///
- public string ZWORKCODE { get; set; }
+ ///
+ /// item.CardNo.TrimEnd('\0')
+ ///
+ public string ZWORKCODE { get; set; }
- [JsonIgnore]
- public DateTime RaiseDateTime { get; set; }
+ [JsonIgnore]
+ public DateTime RaiseDateTime { get; set; }
- ///
- /// yyyy-MM-dd
- ///
- public string ZDATE => RaiseDateTime.ToString("yyyy-MM-dd");
+ ///
+ /// yyyy-MM-dd
+ ///
+ public string ZDATE => RaiseDateTime.ToString("yyyy-MM-dd");
- ///
- /// HH:mm:ss
- ///
- public string ZTIME => RaiseDateTime.ToString("HH:mm:ss");
+ ///
+ /// HH:mm:ss
+ ///
+ public string ZTIME => RaiseDateTime.ToString("HH:mm:ss");
- ///
- /// 设备位置
- ///
- public string ZNOTE { get; set; }
+ ///
+ /// 设备位置
+ ///
+ public string ZNOTE { get; set; }
+ }
}
\ No newline at end of file
diff --git a/Src/Dlhis.ScheduledTask/Common/Services/IJinkoJipService.cs b/Src/Dlhis.ScheduledTask/Common/Services/IJinkoJipService.cs
index a07923d5..60bca394 100644
--- a/Src/Dlhis.ScheduledTask/Common/Services/IJinkoJipService.cs
+++ b/Src/Dlhis.ScheduledTask/Common/Services/IJinkoJipService.cs
@@ -37,4 +37,7 @@ public interface IJinkoJipService : ISingletonDependency
///
///
Task SyncFaceToSapAsync(string userCode, string base64);
+
+
+ Task UploadAttendancesAsync(UploadAttendanceRequest request);
}
\ No newline at end of file
diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoJipService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoJipService.cs
index df9fb632..047f2b94 100644
--- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoJipService.cs
+++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/JinkoJipService.cs
@@ -2,7 +2,6 @@
using System.Net.Http.Headers;
using System.Security.Claims;
using System.Text;
-using Dlhis.Jip.Api.Requests;
using Dlhis.ScheduledTask.Common.Request;
using Dlhis.ScheduledTask.Common.Response;
using Kurisu.AspNetCore.Utils.Extensions;
@@ -33,16 +32,11 @@ public class JinkoJipService : IJinkoJipService
return httpClient;
}
- public async Task UploadAttendancesAsync(List requests)
+ public async Task UploadAttendancesAsync(UploadAttendanceRequest request)
{
var requestUrl = "/JIP/HCM/HCM_SWIPE_DATA_SAVE";
- var body = new
- {
- T_DATA = requests,
- };
-
- var json = body.ToJson();
+ var json = request.ToJson();
//_logger.LogInformation("上传考勤记录请求:{json}", json);
diff --git a/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj b/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
index 0376df7c..83bae8f0 100644
--- a/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
+++ b/Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj
@@ -25,7 +25,6 @@
-
diff --git a/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs b/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs
index ad5c3c53..e167cf94 100644
--- a/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs
+++ b/Src/Dlhis.ScheduledTask/Jobs/SyncOriginCardInfoJob.cs
@@ -1,9 +1,9 @@
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
-using Dlhis.Jip.Api;
-using Dlhis.Jip.Api.Requests;
using Dlhis.ScheduledTask.Attributes;
+using Dlhis.ScheduledTask.Common.Request;
+using Dlhis.ScheduledTask.Common.Services;
using SqlSugar;
namespace Dlhis.ScheduledTask.Jobs;
@@ -14,11 +14,11 @@ namespace Dlhis.ScheduledTask.Jobs;
[RecurringJob(nameof(SyncOriginCardInfoJob), "0 0/1 * * * ?", Name = "上传考勤记录")]
public class SyncOriginCardInfoJob : BaseJob
{
- private readonly IJinkoJipApi _jinkoJipApi;
+ private readonly IJinkoJipService _jinkoJipService;
- public SyncOriginCardInfoJob(IJinkoJipApi jinkoJipApi, IServiceProvider serviceProvider) : base(serviceProvider)
+ public SyncOriginCardInfoJob(IJinkoJipService jinkoJipService, IServiceProvider serviceProvider) : base(serviceProvider)
{
- _jinkoJipApi = jinkoJipApi;
+ _jinkoJipService = jinkoJipService;
}
protected override async Task RunAsync(IServiceProvider serviceProvider)
@@ -52,7 +52,7 @@ public class SyncOriginCardInfoJob : BaseJob
try
{
var ids = items.Select(x => x.Id).ToList();
- var r = await _jinkoJipApi.UploadAttendancesAsync(new UploadAttendanceRequest { Data = items.ToList() });
+ var r = await _jinkoJipService.UploadAttendancesAsync(new UploadAttendanceRequest { Data = items.ToList() });
if (r.OLX == "0")
{
await DbContext.Updateable()