From 38ab947790e13c3f4fba2f8a241c7d259c0cafdd Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 2 Jul 2024 14:27:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=83=A8=E7=BD=B2=E7=82=B9=E4=B8=BAAUTO?=
 =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Request/DeviceResigterRequest.cs   |  2 +-
 .../Implements/DeviceConnectService.cs        | 33 +++++++++++--------
 .../Request/DeviceUploadLogUploadRequest.cs   | 11 +++----
 3 files changed, 26 insertions(+), 20 deletions(-)

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; }
 
     /// <summary>
-    /// 设备部署位置
+    /// 设备部署位置(如果传入AUTO,自动获取营业点名称)
     /// </summary>
     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<DeviceRegistryEntity>().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<List<DeviceNotSetBusinessPlaceResponse>> 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; }
 
 
-    /// <summary>
-    /// 记录类型
-    /// </summary>
-    [EnumDataType(typeof(DeviceUploadLogTypeEnumType))]
-    public DeviceUploadLogTypeEnumType Type { get; set; } = DeviceUploadLogTypeEnumType.Attendance;
+    // /// <summary>
+    // /// 记录类型
+    // /// </summary>
+    // [EnumDataType(typeof(DeviceUploadLogTypeEnumType))]
+    // public DeviceUploadLogTypeEnumType Type { get; set; } = DeviceUploadLogTypeEnumType.Attendance;
 }