From f9c5a816b1ffd3a58769e6bd110ee0b46a9625f0 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 25 Jan 2024 14:14:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4,=E5=AE=9E=E4=BD=93=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Entity/Sys/Entities/UserEntity.cs | 2 +- Src/Dlhis.ScheduledTask/Packs/JobPack.cs | 2 +- Src/Dlhis.User.Api/Response/UserResponse.cs | 2 +- Src/Dlhis.User/Identity/Response/UserResponse.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs b/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs index 37bfdbb5..14fb8f09 100644 --- a/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs @@ -61,7 +61,7 @@ public class UserEntity /// /// 手机号确认 /// - public string PhoneNumberConfirmed { get; set; } + public bool PhoneNumberConfirmed { get; set; } /// /// 双重验证启用 diff --git a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs index 1827ccb5..c297f580 100644 --- a/Src/Dlhis.ScheduledTask/Packs/JobPack.cs +++ b/Src/Dlhis.ScheduledTask/Packs/JobPack.cs @@ -24,7 +24,7 @@ public class JobPack : BaseAppPack }); - RecurringJob.AddOrUpdate("CreateGetAttendance", s => s.RunAsync(), "0 0/5 * * * ?", new RecurringJobOptions + RecurringJob.AddOrUpdate("CreateGetAttendance", s => s.RunAsync(), "0 0/1 * * * ?", new RecurringJobOptions { TimeZone = TimeZoneInfo.Local }); diff --git a/Src/Dlhis.User.Api/Response/UserResponse.cs b/Src/Dlhis.User.Api/Response/UserResponse.cs index da8b7164..63e4f67e 100644 --- a/Src/Dlhis.User.Api/Response/UserResponse.cs +++ b/Src/Dlhis.User.Api/Response/UserResponse.cs @@ -16,7 +16,7 @@ public class UserResponse public string PhoneNumber { get; set; } - public string PhoneNumberConfirmed { get; set; } + public bool PhoneNumberConfirmed { get; set; } public bool TwoFactorEnabled { get; set; } diff --git a/Src/Dlhis.User/Identity/Response/UserResponse.cs b/Src/Dlhis.User/Identity/Response/UserResponse.cs index be3b78b1..8269d1b2 100644 --- a/Src/Dlhis.User/Identity/Response/UserResponse.cs +++ b/Src/Dlhis.User/Identity/Response/UserResponse.cs @@ -16,7 +16,7 @@ public class UserResponse public string PhoneNumber { get; set; } - public string PhoneNumberConfirmed { get; set; } + public bool PhoneNumberConfirmed { get; set; } public bool TwoFactorEnabled { get; set; } From e669134fea4f16297fc4d11bac2d7750b0b4e404 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 25 Jan 2024 14:29:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=E5=8D=95=E7=8B=AC=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=86=E9=A1=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/Controllers/DevicesController.cs | 7 +- .../Device/Response/DevicePageResponse.cs | 80 +++++++++++++++++++ .../Device/Services/IDeviceService.cs | 2 +- .../Services/Implements/DeviceService.cs | 2 +- 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs index 2e089366..0fc36ce8 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs @@ -20,7 +20,10 @@ public class DevicesController : ControllerBase private readonly IDeviceConnectService _deviceConnectService; private readonly IConfiguration _configuration; - public DevicesController(IDeviceService deviceService, IDeviceTemplateService deviceTemplateService, IDeviceConnectService deviceConnectService, IConfiguration configuration) + public DevicesController(IDeviceService deviceService, + IDeviceTemplateService deviceTemplateService, + IDeviceConnectService deviceConnectService, + IConfiguration configuration) { _deviceService = deviceService; _deviceTemplateService = deviceTemplateService; @@ -56,7 +59,7 @@ public class DevicesController : ControllerBase /// /// [HttpGet("page")] - public async Task> GetPageAsync([FromQuery] DevicePageRequest request) + public async Task> GetPageAsync([FromQuery] DevicePageRequest request) { return await _deviceService.GetPageAsync(request); } diff --git a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs new file mode 100644 index 00000000..3269982a --- /dev/null +++ b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs @@ -0,0 +1,80 @@ +using Dlhis.Entity.Device.Enums; +using Kurisu.AspNetCore.Utils.Extensions; + +namespace Dlhis.Basic.Device.Response; + +public class DevicePageResponse +{ + public long Id { get; set; } + + /// + /// 设备code + /// + public Guid Code { get; set; } + + /// + /// 设备唯一码,IP/MAC/SNO + /// + public string UniqueNo { get; set; } + + /// + /// 心跳间隔 + /// + public int HeartbeatInterval { get; set; } + + /// + /// 品牌 + /// + public string Brand { get; set; } + + /// + /// 供应商 + /// + public string Supplier { get; set; } + + /// + /// 设备功能 DeviceFuncEnumType + /// + public List Funcs + { + get + { + if (FuncsStr.IsEmpty()) FuncsStr = "[]"; + + return FuncsStr.ToObject>(); + } + } + + public string FuncsStr { get; set; } + + /// + /// 部署点 + /// + public string DeployPlace { get; set; } + + /// + /// 部署坐标 + /// + public string DeployPosition { get; set; } + + /// + /// 部署方向 + /// + public string DeployDirection { get; set; } + + /// + /// 模板code + /// + public Guid TemplateCode { get; set; } + + /// + /// 连接信息 + /// + public string ConnectionInfo { get; set; } + + + /// + /// 是否启用 + /// + public bool Enable { get; set; } +} diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs index eb429293..095effcb 100644 --- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs @@ -6,7 +6,7 @@ namespace Dlhis.Basic.Device.Services; public interface IDeviceService : IScopeDependency { - Task> GetPageAsync(DevicePageRequest request); + Task> GetPageAsync(DevicePageRequest request); Task SaveAsync(DeviceSaveRequest request); diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 0e4f5dcb..ac6e0adb 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -24,7 +24,7 @@ public class DeviceService : IDeviceService _dbContext = dbContext; } - public async Task> GetPageAsync(DevicePageRequest request) + public async Task> GetPageAsync(DevicePageRequest request) { var page = await _dbContext.Queryable() .Select(device => new DeviceResponse From 5bd0cec44ec4bddf699f61f794187b3830c29dff Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 25 Jan 2024 14:30:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index ac6e0adb..68f7f420 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -27,7 +27,7 @@ public class DeviceService : IDeviceService public async Task> GetPageAsync(DevicePageRequest request) { var page = await _dbContext.Queryable() - .Select(device => new DeviceResponse + .Select(device => new DevicePageResponse { FuncsStr = device.Funcs.ToString() From 83c3238a14db04a827459e0af3e22e49d1a982bd Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 25 Jan 2024 14:36:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=20=E5=88=97json=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs index 90e508fe..4b451a3c 100644 --- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs @@ -56,7 +56,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId /// /// 部署坐标 /// - [SugarColumn(IsJson = true, ColumnDescription = "部署坐标")] + [SugarColumn(ColumnDescription = "部署坐标")] public string DeployPosition { get; set; } /// From 54510f28eaa571edfd1ba28398b087822b2f24c0 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 25 Jan 2024 14:43:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4brand=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/Services/Implements/DeviceConnectService.cs | 1 - Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 2 -- Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs | 6 ------ .../TaskAssignment/Services/Implements/AssignmentService.cs | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs index 75559b76..e507e5e5 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs @@ -120,7 +120,6 @@ public class DeviceConnectService : IDeviceConnectService device = new DeviceEntity() { Code = Guid.NewGuid(), - Brand = string.Empty, ConnectionInfo = string.Empty, TemplateCode = null, UniqueNo = uniqueNo, diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 68f7f420..9403f1a2 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -48,7 +48,6 @@ public class DeviceService : IDeviceService { var entity = request.Adapt(); entity.Code = Guid.NewGuid(); - entity.Brand = template.Brand; await _dbContext.InsertAsync(entity); //同时保存注册信息 var registry = await _dbContext.Queryable().Where(x => x.DeviceUniqueNo == request.UniqueNo).FirstAsync(); @@ -72,7 +71,6 @@ public class DeviceService : IDeviceService entity.ThrowIfNull("设备不存在,无法更新"); request.Adapt(entity); - entity.Brand = template.Brand; await _dbContext.UpdateAsync(entity); } diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs index 4b451a3c..18cdee52 100644 --- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs +++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs @@ -29,12 +29,6 @@ public class DeviceEntity : SugarBaseEntity, ITenantId [SugarColumn(ColumnDescription = "心跳检查间隔")] public int HeartbeatInterval { get; set; } - /// - /// 品牌 - /// - [SugarColumn(ColumnDescription = "品牌")] - public string Brand { get; set; } - /// /// 供应商 /// diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index 72b402f7..3c485d7f 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -51,7 +51,7 @@ public class AssignmentService : IAssignmentService deviceTask.Type, deviceTask.DeviceUniqueNo, DeviceConnectionInfo = deivce.ConnectionInfo, - deivce.Brand, + deivceTamplate.Brand, FuncStr = deivce.Funcs.ToString(), deviceTask.UserNo, deviceTask.UserCode,