fix .

Src/Dlhis.ScheduledTask/Common/Request/UploadAttendanceRequest.cs

@@ -1,9 +1,18 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
-namespace Dlhis.ScheduledTask.Common.Request;
+namespace Dlhis.ScheduledTask.Common.Request
-
-public class UploadAttendanceRequest
 {
+    public class UploadAttendanceRequest
+    {
+        /// <summary>
+        /// 考勤数据包
+        /// </summary>
+        [JsonProperty("T_DATA")]
+        public List<UploadAttendanceRequestItem> Data { get; set; }
+    }
+    
+    public class UploadAttendanceRequestItem
+    {
         [JsonIgnore]
         public long Id { get; set; }
 
@@ -29,4 +38,5 @@ public class UploadAttendanceRequest
         /// 设备位置
         /// </summary>
         public string ZNOTE { get; set; }
+    }
 }

Src/Dlhis.ScheduledTask/Common/Services/IJinkoJipService.cs

@@ -37,4 +37,7 @@ public interface IJinkoJipService : ISingletonDependency
     /// <param name="base64"></param>
     /// <returns></returns>
     Task<SapFaceSyncResponse> SyncFaceToSapAsync(string userCode, string base64);
+    
+    
+    Task<UploadAttendanceResponse> UploadAttendancesAsync(UploadAttendanceRequest request);
 }

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<UploadAttendanceResponse> UploadAttendancesAsync(List<UploadAttendanceRequest> requests)
+    public async Task<UploadAttendanceResponse> UploadAttendancesAsync(UploadAttendanceRequest request)
     {
         var requestUrl = "/JIP/HCM/HCM_SWIPE_DATA_SAVE";
 
-        var body = new
+        var json = request.ToJson();
-        {
-            T_DATA = requests,
-        };
-
-        var json = body.ToJson();
 
         //_logger.LogInformation("上传考勤记录请求:{json}", json);
 

Src/Dlhis.ScheduledTask/Dlhis.ScheduledTask.csproj

@@ -25,7 +25,6 @@
     <ItemGroup>
       <ProjectReference Include="..\Dlhis.Basic.Api\Dlhis.Basic.Api.csproj" />
       <ProjectReference Include="..\Dlhis.Entity\Dlhis.Entity.csproj" />
-      <ProjectReference Include="..\Dlhis.Jip.Api\Dlhis.Jip.Api.csproj" />
       <ProjectReference Include="..\Dlhis.Sys.Api\Dlhis.Sys.Api.csproj" />
     </ItemGroup>
 

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<DeviceUploadLogEntity>()