diff --git a/Src/Dlhis.Basic/Device/Request/DeviceResigterRequest.cs b/Src/Dlhis.Basic/Device/Request/DeviceResigterRequest.cs
index f34ae474..2caa3331 100644
--- a/Src/Dlhis.Basic/Device/Request/DeviceResigterRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DeviceResigterRequest.cs
@@ -11,7 +11,7 @@ public class DeviceResigterRequest
public string UniqueNo { get; set; }
///
- /// 设备部署位置
+ /// 设备部署位置(如果传入AUTO,自动获取营业点名称)
///
public string DeployPlace { get; set; }
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index 55d6cf4e..9a49852a 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -32,22 +32,29 @@ public class DeviceConnectService : IDeviceConnectService
var device = await GetEnableDeviceAsync(request.UniqueNo, false, request.DeployPlace, businessPlace.TenantId);
var registry = await _dbContext.Queryable().Where(x => x.DeviceUniqueNo == request.UniqueNo).FirstAsync();
- if (registry == null)
+ if (registry != null)
{
- registry = new DeviceRegistryEntity
- {
- DeviceUniqueNo = request.UniqueNo,
- LastHeartbeatTime = DateTime.Now,
- RegisterTime = DateTime.Now,
- BusinessPlaceCode = businessPlace?.Code,
- TenantId = device.TenantId
- };
-
- await _dbContext.InsertAsync(registry);
- return "设备注册成功";
+ return "请勿重复注册设备";
}
- return "请勿重复注册设备";
+ registry = new DeviceRegistryEntity
+ {
+ DeviceUniqueNo = request.UniqueNo,
+ LastHeartbeatTime = DateTime.Now,
+ RegisterTime = DateTime.Now,
+ BusinessPlaceCode = businessPlace.Code,
+ TenantId = device.TenantId
+ };
+
+ if (device.DeployPlace == "AUTO")
+ {
+ device.DeployPlace = businessPlace.Name;
+ await _dbContext.UpdateAsync(device);
+ }
+
+ await _dbContext.InsertAsync(registry);
+ return "设备注册成功";
+
}
public async Task> GetNotSetBusinessPlaceDevicesAsync()
diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs
index f11ff379..69ca192b 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogUploadRequest.cs
@@ -1,5 +1,4 @@
using System.ComponentModel.DataAnnotations;
-using Dlhis.Entity.Device.Enums;
namespace Dlhis.ScheduledTask.DeviceUploadLog.Request;
@@ -27,9 +26,9 @@ public class DeviceUploadLogUploadRequest
public string SerialNo { get; set; }
- ///
- /// 记录类型
- ///
- [EnumDataType(typeof(DeviceUploadLogTypeEnumType))]
- public DeviceUploadLogTypeEnumType Type { get; set; } = DeviceUploadLogTypeEnumType.Attendance;
+ // ///
+ // /// 记录类型
+ // ///
+ // [EnumDataType(typeof(DeviceUploadLogTypeEnumType))]
+ // public DeviceUploadLogTypeEnumType Type { get; set; } = DeviceUploadLogTypeEnumType.Attendance;
}