add 补充文件

Src/Dlhis.Basic/Device/Controllers/DevicesController.cs

@@ -43,6 +43,33 @@ public class DevicesController : ControllerBase
         return await _deviceTemplateService.GetPageAsync(request);
     }
 
+
+    /// <summary>
+    /// 设备心跳
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [Obsolete("迁移到DeviceConnect")]
+    [HttpPost("heartbeat")]
+    [IgnoreTenant]
+    public async Task HeartbeatAsync(DeviceHeartbeatRequest request)
+    {
+        await _deviceConnectService.HeartbeatAsync(request);
+    }
+
+    /// <summary>
+    /// 设备注册
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [Obsolete("迁移到DeviceConnect")]
+    [HttpPost("resigter")]
+    [IgnoreTenant]
+    public async Task<string> ResigterAsync(DeviceResigterRequest request)
+    {
+        return await _deviceConnectService.ResigterAsync(request);
+    }
+
     /// <summary>
     /// 设备模板保存
     /// </summary>
@@ -78,18 +105,6 @@ public class DevicesController : ControllerBase
         await _deviceService.SaveAsync(request);
     }
 
-    /// <summary>
-    /// 设备注册
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    [HttpPost("resigter")]
-    [IgnoreTenant]
-    public async Task<string> ResigterAsync(DeviceResigterRequest request)
-    {
-        return await _deviceConnectService.ResigterAsync(request);
-    }
-
     /// <summary>
     /// 获取激活码
     /// </summary>
@@ -126,18 +141,6 @@ public class DevicesController : ControllerBase
         await _deviceConnectService.SetResigterBusinessPlaceAsync(request);
     }
 
-    /// <summary>
-    /// 设备心跳
-    /// </summary>
-    /// <param name="request"></param>
-    /// <returns></returns>
-    [HttpPost("heartbeat")]
-    [IgnoreTenant]
-    public async Task HeartbeatAsync(DeviceHeartbeatRequest request)
-    {
-        await _deviceConnectService.HeartbeatAsync(request);
-    }
-
     /// <summary>
     /// 检查设备是否存在
     /// </summary>

Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs

@@ -16,4 +16,9 @@ public class DevicePageRequest : PageDto
     /// </summary>
     [EnumDataType(typeof(DeviceTypeEnumType))]
     public DeviceTypeEnumType? Type { get; set; }
+
+    /// <summary>
+    /// 启用状态
+    /// </summary>
+    public bool? Enable { get; set; }
 }

Src/Dlhis.Basic/Device/Services/IDeviceConnectService.cs

@@ -19,7 +19,6 @@ public interface IDeviceConnectService : IScopeDependency
     /// <returns></returns>
     Task<List<DeviceNotSetBusinessPlaceResponse>> GetNotSetBusinessPlaceDevicesAsync();
 
-
     /// <summary>
     /// 设置设备营业点
     /// </summary>
@@ -33,4 +32,11 @@ public interface IDeviceConnectService : IScopeDependency
     /// <param name="request"></param>
     /// <returns></returns>
     Task HeartbeatAsync(DeviceHeartbeatRequest request);
+
+    /// <summary>
+    /// 尝试连接
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    Task<bool> TryConnectAsync(DeviceConnectionTryRequest request);
 }

Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

@@ -1,4 +1,7 @@
-using Dlhis.Basic.Device.Request;
+using System.Net;
+using System.Net.Sockets;
+using Dlhis.Basic.Device.Dtos;
+using Dlhis.Basic.Device.Request;
 using Dlhis.Basic.Device.Response;
 using Dlhis.Entity.Basic.Entity;
 using Dlhis.Entity.Device.Entities;
@@ -6,6 +9,7 @@ using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
+using Newtonsoft.Json;
 
 namespace Dlhis.Basic.Device.Services.Implements;
 
@@ -95,6 +99,26 @@ public class DeviceConnectService : IDeviceConnectService
         await _dbContext.UpdateAsync(registry);
     }
 
+
+    public async Task<bool> TryConnectAsync(DeviceConnectionTryRequest request)
+    {
+        try
+        {
+            var ipInfo = request.ConnectionInfo.ToObject<IPPortDto>();
+
+            //超时时间
+            var CancellationTokenSource = new CancellationTokenSource(300);
+            await new TcpClient().ConnectAsync(IPAddress.Parse(ipInfo.IP), ipInfo.Port, CancellationTokenSource.Token);
+
+            return true;
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+    }
+
+
     //******************************************************** help methods **********************************************************
 
     /// <summary>

Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs

@@ -33,6 +33,7 @@ public class DeviceService : IDeviceService
                .LeftJoin<DeviceRegistryEntity>((d, dt, dr) => d.UniqueNo == dr.DeviceUniqueNo)
                .LeftJoin<BusinessPlaceEntity>((d, dt, dr, bp) => dr.BusinessPlaceCode == bp.Code)
                .WhereIF(request.Type.HasValue, (d, dt) => d.Type == request.Type)
+               .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable)
                .WhereIF(request.Search.IsPresent(), (d) => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search))
                .Select((d, dt, dr, bp) => new DevicePageResponse
                {