fix 下发任务结构修改,根据类型处理

Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs

@@ -22,7 +22,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
     public async Task<Pagination<DeviceUploadLogResponse>> GetPageAsync(DeviceUploadLogPageRequest request)
     {
         var page = await _dbContext.Queryable<DeviceUploadLogEntity>()
-            .LeftJoin<GainfoEntity>((deviceUp, ga) => deviceUp.UserNo == ga.No)
+            .LeftJoin<GainfoEntity>((deviceUp, ga) => deviceUp.UserUniqueNo == ga.No)
             .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.UploadTime >= request.SearchDateTimePeriod.Start)
             .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.UploadTime <= request.SearchDateTimePeriod.End)
             .Select((deviceUp, ga) => new DeviceUploadLogResponse
@@ -31,8 +31,8 @@ public class DeviceUploadLogService : IDeviceUploadLogService
                 Id = deviceUp.Id,
                 Ip = deviceUp.Ip,
                 UploadTime = deviceUp.UploadTime,
-                UserNo = deviceUp.UserNo,
-                UserCode = deviceUp.UserCode,
+                UserNo = ga.No,
+                UserCode = ga.Code,
                 UserName = ga.Name,
             })
             .ToPageListAsync(request);
@@ -46,18 +46,41 @@ public class DeviceUploadLogService : IDeviceUploadLogService
         var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).SingleAsync();
         device.ThrowIfNull("设备信息不存在");
 
-        var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == request.UserCode).FirstAsync();
-        device.ThrowIfNull("人员信息不存在");
-
         var entity = new DeviceUploadLogEntity
         {
             DeviceUniqueNo = request.DeviceUniqueNo,
             UploadTime = request.UploadTime,
-            UserCode = request.UserCode,
-            UserNo = gainfo.No,
+            UserUniqueNo = request.UserUniqueNo,
             TenantId = device.TenantId,
         };
 
         await _dbContext.InsertAsync(entity);
     }
+
+    [IgnoreTenant]
+    public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)
+    {
+        var nos = requests.Select(x => x.DeviceUniqueNo).ToList();
+        var devices = await _dbContext.Queryable<DeviceEntity>().Where(x => nos.Contains(x.UniqueNo)).ToListAsync();
+
+        var records = requests.GroupBy(x => x.DeviceUniqueNo).Select(x =>
+          {
+              var device = devices.FirstOrDefault(item => item.UniqueNo == x.Key);
+              if (device != null)
+              {
+                  return x.AsEnumerable().Select(item => new DeviceUploadLogEntity
+                  {
+                      DeviceUniqueNo = x.Key,
+                      UserUniqueNo = item.UserUniqueNo,
+                      UploadTime = item.UploadTime,
+                      TenantId = device.TenantId,
+
+                  }).ToList();
+              }
+
+              return null;
+          }).Where(x => x != null).ToList();
+
+        await _dbContext.InsertAsync(records);
+    }
 }