From 9f86793194a0e610f10dfdffce37647dd741b98b Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Mon, 2 Feb 2026 15:04:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E6=94=B6=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B3=BB=E7=BB=9F=E8=8E=B7=E5=8F=96=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IBusinessSystemAggregationService.cs | 13 +- .../IDeviceAggregationService.cs | 10 +- .../BusinessSystemAggregationService.cs | 202 +++- .../DeviceAggregationService.cs | 895 ++---------------- .../IoTDeviceBasicAppService.cs | 849 +++++++++++++++++ .../BusinessSystemAggregationController.cs | 2 +- 6 files changed, 1105 insertions(+), 866 deletions(-) create mode 100644 src/JiShe.IoT.Application/IoTDeviceBasicAppService.cs diff --git a/src/JiShe.IoT.Application.Contracts/BusinessSystemAggregation/IBusinessSystemAggregationService.cs b/src/JiShe.IoT.Application.Contracts/BusinessSystemAggregation/IBusinessSystemAggregationService.cs index 27662c5..8f25a52 100644 --- a/src/JiShe.IoT.Application.Contracts/BusinessSystemAggregation/IBusinessSystemAggregationService.cs +++ b/src/JiShe.IoT.Application.Contracts/BusinessSystemAggregation/IBusinessSystemAggregationService.cs @@ -14,11 +14,18 @@ namespace JiShe.IoT.BusinessSystemAggregation public interface IBusinessSystemAggregationService : IApplicationService { /// - /// 接收业务系统指令信息，Msg 字段为 ReceiveCommandInfoDto 实体 + /// 接收业务系统设置指令信息，Msg 字段为 ReceiveCommandInfoDto 实体 /// /// /// - Task ReceiveCommandInfoAsync(OpenApiRequest input); + Task ReceiveSetCommandInfoAsync(OpenApiRequest input); + + /// + /// 接收业务系统获取属性指令信息，Msg 字段为 ReceiveCommandInfoDto 实体 + /// + /// + /// + Task>> ReceiveGetCommandInfoAsync(OpenApiRequest input); /// /// 业务系统批量查询设备数据，Msg 字段为 BatchQueryDeviceDataInfoInput 实体 @@ -35,7 +42,7 @@ namespace JiShe.IoT.BusinessSystemAggregation Task>> QueryDeviceDataInfoAsync(OpenApiRequest input); /// - /// 业务系统批量新增设备数据，Msg 字段为 BatchCreateDeviceBusinessSystemInput 实体 + /// 业务系统批量新增设备信息，Msg 字段为 BatchCreateDeviceBusinessSystemInput 实体 /// /// /// diff --git a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs index 161b0aa..69b127b 100644 --- a/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs +++ b/src/JiShe.IoT.Application.Contracts/DeviceAggregation/IDeviceAggregationService.cs @@ -99,15 +99,7 @@ namespace JiShe.IoT.DeviceAggregation /// /// Task RepushDeviceInfoToIoTPlatform(IdInput input); - - /// - /// 业务系统批量创建设备信息 - /// - /// - /// - Task BatchCreateDeviceBusinessSystemAsync(BatchCreateDeviceBusinessSystemInput input); - - + /// /// 绑定设备端物模型 /// diff --git a/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs b/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs index 517f42b..06aaf2d 100644 --- a/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs +++ b/src/JiShe.IoT.Application/BusinessSystemAggregation/BusinessSystemAggregationService.cs @@ -8,45 +8,79 @@ using JiShe.ServicePro.DataChannelManages; using JiShe.ServicePro.DeviceManagement.DeviceInfos; using JiShe.ServicePro.DeviceManagement.ThingModels; using JiShe.ServicePro.Dto; -using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; using JiShe.ServicePro.FreeRedisProvider; using JiShe.ServicePro.IoTDBManagement.DataChannels; using JiShe.ServicePro.IoTDBManagement.TreeModels; +using JiShe.ServicePro.OneNETManagement.OneNETDevices; +using JiShe.ServicePro.OneNETManagement.OneNETProducts; using Mapster; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using System.Collections.Generic; using Volo.Abp; using Volo.Abp.Auditing; +using static Volo.Abp.Ui.LayoutHooks.LayoutHooks; namespace JiShe.IoT.BusinessSystemAggregation { /// /// 业务系统聚合服务 + /// + /// 设备服务 + /// OneNET设备服务 + /// Redis发布订阅服务 + /// 数据通道 + /// IoTDBOptions + /// OneNET产品服务 + /// 设备端物模型服务 + /// 平台端端物模型服务 + /// 设备升级记录服务 + /// 应用服务配置 + /// IoTDB树模型服务 /// [DisableAuditing] - public class BusinessSystemAggregationService(IOptions options, IReliableRedisPubSubService redisPubSubService, IDeviceAppService deviceAppService, IIoTDBDataChannelManageService ioTDBDataChannelManageService, IOptions _ioTDBOptions, ITreeModelService treeModelService, IDeviceAggregationService deviceAggregationService, ILogger _logger, IIoTPlatformThingModelInfoAppService platformThingModelInfoAppService) : IoTAppService, IBusinessSystemAggregationService + public class BusinessSystemAggregationService( + IDeviceAppService _deviceAppService, + IOneNETDeviceService _oneNETDeviceService, + IReliableRedisPubSubService _redisPubSubService, + IIoTDBDataChannelManageService _ioTDBDataChannelManageService, + IOptions _ioTDBOptions, + IOptions _serverOptions, + IOneNETProductService _oneNETProductService, + IDeviceThingModelManagementAppService _deviceThingModelService, + IIoTPlatformThingModelInfoAppService _platformThingModelInfoAppService, + IDeviceUpgradeRecordService _deviceUpgradeRecordService, + ITreeModelService _treeModelService, + ILogger _logger) + : IoTDeviceBasicAppService(_logger, + _deviceAppService, + _oneNETDeviceService, + _redisPubSubService, + _ioTDBDataChannelManageService, + _ioTDBOptions, + _serverOptions, + _oneNETProductService, + _deviceThingModelService, + _platformThingModelInfoAppService, + _deviceUpgradeRecordService, + _treeModelService), IBusinessSystemAggregationService { - ServerApplicationOptions serverOptions = options.Value; - IoTDBOptions ioTDBOptions = _ioTDBOptions.Value; - private const string LUA_SCRIPT = @" local hashKey = KEYS[1] local fieldKeys = ARGV return redis.call('HMGET', hashKey, unpack(fieldKeys))"; /// - /// 接收业务系统指令信息 + /// 接收业务系统设置指令信息 /// [AllowAnonymous] - public async Task ReceiveCommandInfoAsync(OpenApiRequest input) + public async Task ReceiveSetCommandInfoAsync(OpenApiRequest input) { try { - var handleResult = HandleOpenApiRequest(input, serverOptions); + var handleResult = HandleOpenApiRequest(input, serverApplicationOptions); if (handleResult.Success == false) { return handleResult; @@ -75,8 +109,6 @@ namespace JiShe.IoT.BusinessSystemAggregation //将指令存储IoTDB数据库和Redis发布通道 if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) { - - //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); @@ -134,6 +166,119 @@ namespace JiShe.IoT.BusinessSystemAggregation } } + /// + /// 接收业务系统获取属性指令信息 + /// + [AllowAnonymous] + public async Task>> ReceiveGetCommandInfoAsync(OpenApiRequest input) + { + try + { + var handleResult = HandleOpenApiRequest(input, serverApplicationOptions); + if (handleResult.Success == false) + { + return HttpDataResultExtensions.Failed>("获取数据失败，签名校验异常", -101); + } + var messageBody = handleResult.Data; + if (messageBody == null || messageBody.Commands == null || messageBody.Commands.Count <= 0) + { + return HttpDataResultExtensions.Failed>("获取数据失败，设备属性值不能为空", -103, ResponeResultEnum.Fail); + } + + //限定来源类型必须为业务系统 + if (messageBody.SourceType != DeviceTelemetrySourceTypeEnum.BusinessSystem) + { + return HttpDataResultExtensions.Failed>("获取数据失败，来源类型错误，业务系统传固定值2", -104, ResponeResultEnum.Fail); + } + + var deviceInfo = await deviceAppService.FindByDeviceAddressAsync(messageBody.DeviceAddress); + + if (deviceInfo == null) + { + return HttpDataResultExtensions.Failed>("设备不存在", -105, ResponeResultEnum.Fail); + } + + var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, input, deviceInfo.Adapt(), messageBody.Commands.Serialize()); + + //将指令存储IoTDB数据库和Redis发布通道 + if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) + { + //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 + + var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); + + if (platformThingModelInfo == null) + { + return HttpDataResultExtensions.Failed>($"业务系统推送指令时设备{deviceInfo.DeviceAddress}的平台端物模型信息不存在。", -106, ResponeResultEnum.Fail); + } + + foreach (var item in messageBody.Commands) + { + var tempPlatformThingModelInfo = platformThingModelInfo.Where(d => d.IoTPlatformRawFieldName == item.Key).FirstOrDefault(); + if (tempPlatformThingModelInfo == null) + { + _logger.LogError($"业务系统推送指令时设备设备{deviceInfo.DeviceAddress}平台端物模型信息不存在属性标识符{item.Key}。"); + messageBody.Commands.RemoveAll(d => d.Key == item.Key); + continue; + } + + //排除升级指令 + if (tempPlatformThingModelInfo.StandardFieldName.ToLowerInvariant() == ThingModelFixedTypeConst.FIRMWARE_UPGRADE.ToLowerInvariant()) + { + _logger.LogError($"业务系统推送指令时设备{deviceInfo.DeviceAddress}平台端物模型属性标识符{item.Key}是升级指令操作，被禁止。"); + messageBody.Commands.RemoveAll(d => d.Key == item.Key); + continue; + } + + if (deviceInfo.IsNeedConfigDeviceModel && deviceInfo.DeviceThingModelDataId.HasValue && item.Key.ToLowerInvariant() == ThingModelFixedTypeConst.SpecialCommand.ToLowerInvariant()) + { + _logger.LogError($"业务系统推送指令时设备{deviceInfo.DeviceAddress}平台端物模型属性标识符{item.Key}是特殊指令操作，被禁止。"); + messageBody.Commands.RemoveAll(d => d.Key == item.Key); + continue; + } + } + + //数据写入遥测任务数据存储通道 + await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo)); + + + if (messageBody.Commands == null || messageBody.Commands.Count <= 0) + { + return HttpDataResultExtensions.Failed>("获取数据失败，OneNET平台未返回数据", -106); + } + + var queryResult = await DevicePropertyValueToOneNET(deviceInfo, new DevicePropertyValueForApiInput() { PropertyList = messageBody.Commands.Select(d => d.Key).ToList() }); + + if (queryResult == null || queryResult.Count <= 0) + { + return HttpDataResultExtensions.Failed>("获取数据失败，OneNET平台未返回数据", -106); + } + + return HttpDataResultExtensions.Success>(queryResult); + + } + else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing) + { + //await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.CTWingAepCommandIssuedEventName, input); + } + else + { + return HttpDataResultExtensions.Failed>("指令处理失败，当前设备平台类型异常", -105); + } + + return HttpDataResultExtensions.Success>("指令下发成功"); + } + catch (UserFriendlyException) + { + throw; // 重新抛出用户友好异常 + } + catch (Exception ex) + { + _logger.LogError(ex, "接收业务系统指令信息时发生异常"); + return HttpDataResultExtensions.Failed>("指令处理失败，发送异常", -106); + } + } + /// /// 业务系统批量查询设备数据，Msg 字段为 BatchQueryDeviceDataInfoInput 实体 @@ -145,7 +290,7 @@ namespace JiShe.IoT.BusinessSystemAggregation { try { - var handleResult = HandleOpenApiRequest(input, serverOptions); + var handleResult = HandleOpenApiRequest(input, serverApplicationOptions); if (handleResult.Success == false) { return HttpDataResultExtensions.Failed>(null, handleResult.Message, handleResult.LocationCode); @@ -244,7 +389,7 @@ namespace JiShe.IoT.BusinessSystemAggregation { try { - var handleResult = HandleOpenApiRequest(input, serverOptions); + var handleResult = HandleOpenApiRequest(input, serverApplicationOptions); if (handleResult.Success == false) { return HttpDataResultExtensions.Failed>(null, handleResult.Message, handleResult.LocationCode); @@ -329,7 +474,7 @@ namespace JiShe.IoT.BusinessSystemAggregation /// - /// 业务系统批量新增设备数据，Msg 字段为 BatchCreateDeviceBusinessSystemInput 实体 + /// 业务系统批量新增设备信息，Msg 字段为 BatchCreateDeviceBusinessSystemInput 实体 /// /// /// @@ -338,7 +483,7 @@ namespace JiShe.IoT.BusinessSystemAggregation { try { - var handleResult = HandleOpenApiRequest(input, serverOptions); + var handleResult = HandleOpenApiRequest(input, serverApplicationOptions); if (handleResult.Success == false) { return HttpDataResultExtensions.Failed(handleResult.Message, handleResult.LocationCode); @@ -347,16 +492,37 @@ namespace JiShe.IoT.BusinessSystemAggregation if (messageBody.DeviceInfos == null || messageBody.DeviceInfos.Count <= 0) { + _logger.LogError($"{nameof(BatchCreateDeviceInfoAsync)} 业务系统批量新增设备数据，设备地址不能为空，消息体为：{input.Serialize()}"); return HttpDataResultExtensions.Failed("设备地址不能为空", -101); } - // 批量新增设备 - var createResult = await deviceAggregationService.BatchCreateDeviceBusinessSystemAsync(messageBody); + if (messageBody.DeviceSourceType != DeviceSourceTypeEnum.Prepay && messageBody.DeviceSourceType != DeviceSourceTypeEnum.Energy) + { + _logger.LogError($"{nameof(BatchCreateDeviceInfoAsync)} 业务系统批量创建设备信息，设备来源异常，消息体为：{input.Serialize()}"); + return HttpDataResultExtensions.Failed("业务系统批量创建设备信息，设备来源异常。", -102); + } + + var createResult = false; + if (messageBody.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.CTWing) + { + var batchCreateDeviceInput = input.Adapt(); + batchCreateDeviceInput.AddressList = messageBody.DeviceInfos.Select(f => f.DeviceAddress.Trim()).ToList(); + + createResult = await CTWingDeviceBatchCreateAsync(batchCreateDeviceInput); + } + else if (messageBody.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.OneNET) + { + var batchCreateDeviceInput = input.Adapt(); + batchCreateDeviceInput.AddressList = messageBody.DeviceInfos.Select(f => f.DeviceAddress.Trim()).ToList(); + + createResult = await OneNETDeviceBatchCreateAsync(batchCreateDeviceInput); + } + if (createResult == false) { _logger.LogError($"{nameof(BatchCreateDeviceInfoAsync)} 业务系统批量新增设备数据没有成功，消息体为：{input.Serialize()}"); - return HttpDataResultExtensions.Failed("新增设备失败", -102); + return HttpDataResultExtensions.Failed("新增设备失败", -104); } return HttpDataResultExtensions.Success("新增设备成功"); diff --git a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs index 82777e8..db4cd85 100644 --- a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs +++ b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs @@ -9,12 +9,11 @@ using JiShe.ServicePro.DeviceManagement.DeviceInfos.Dto; using JiShe.ServicePro.DeviceManagement.Permissions; using JiShe.ServicePro.DeviceManagement.ThingModels; using JiShe.ServicePro.Dto; -using JiShe.ServicePro.Encrypt; using JiShe.ServicePro.Enums; using JiShe.ServicePro.FileManagement.Files; using JiShe.ServicePro.FreeRedisProvider; using JiShe.ServicePro.IoTDBManagement.DataChannels; -using JiShe.ServicePro.OneNET.Provider.OpenApiModels.Commands; +using JiShe.ServicePro.IoTDBManagement.TreeModels; using JiShe.ServicePro.OneNETManagement.OneNETDevices; using JiShe.ServicePro.OneNETManagement.OneNETProducts; using Mapster; @@ -27,26 +26,51 @@ namespace JiShe.IoT.DeviceAggregation { /// /// 设备聚合服务 - /// - /// - /// 设备服务 - /// OneNET设备服务 - /// Redis发布订阅服务 - /// 数据通道 + /// + /// + /// 设备服务 + /// OneNET设备服务 + /// Redis发布订阅服务 + /// 数据通道 /// IoTDBOptions - /// OneNET产品服务 - /// 设备端物模型服务 - /// 平台端端物模型服务 - /// 设备固件服务 - /// 设备升级记录服务 - /// 文件管理服务 + /// OneNET产品服务 + /// 设备端物模型服务 + /// 平台端端物模型服务 + /// 设备固件服务 + /// 设备升级记录服务 + /// 文件管理服务 /// 应用服务配置 - public class DeviceAggregationService(ILogger logger, IDeviceAppService deviceAppService, IOneNETDeviceService oneNETDeviceService, IReliableRedisPubSubService redisPubSubService, IIoTDBDataChannelManageService ioTDBDataChannelManageService, IOptions _ioTDBOptions, IOptions _serverOptions, IOneNETProductService oneNETProductService, IDeviceThingModelManagementAppService deviceThingModelService, IIoTPlatformThingModelInfoAppService platformThingModelInfoAppService, IDeviceFirmwareInfoService deviceFirmwareInfoService, IDeviceUpgradeRecordService deviceUpgradeRecordService, IFileAppService fileAppService) : IoTAppService, IDeviceAggregationService + /// IoTDB树模型服务 + public class DeviceAggregationService( + ILogger _logger, + IDeviceAppService _deviceAppService, + IOneNETDeviceService _oneNETDeviceService, + IReliableRedisPubSubService _redisPubSubService, + IIoTDBDataChannelManageService _ioTDBDataChannelManageService, + IOptions _ioTDBOptions, + IOptions _serverOptions, + IOneNETProductService _oneNETProductService, + IDeviceThingModelManagementAppService _deviceThingModelService, + IIoTPlatformThingModelInfoAppService _platformThingModelInfoAppService, + IDeviceFirmwareInfoService _deviceFirmwareInfoService, + IDeviceUpgradeRecordService _deviceUpgradeRecordService, + IFileAppService _fileAppService, + ITreeModelService _treeModelService) : + IoTDeviceBasicAppService( + _logger, + _deviceAppService, + _oneNETDeviceService, + _redisPubSubService, + _ioTDBDataChannelManageService, + _ioTDBOptions, + _serverOptions, + _oneNETProductService, + _deviceThingModelService, + _platformThingModelInfoAppService, + _deviceUpgradeRecordService, + _treeModelService), + IDeviceAggregationService { - IoTDBOptions ioTDBOptions = _ioTDBOptions.Value; - ServerApplicationOptions serverApplicationOptions = _serverOptions.Value; - - /// /// 管理后台创建设备信息 /// @@ -261,42 +285,6 @@ namespace JiShe.IoT.DeviceAggregation } } - /// - /// 更新设备信息并处理缓存 - /// - /// - /// 推送结果原始信息 - /// 设备接入鉴权key - /// - /// - private async Task DeviceUpdateHandler(DeviceManagementInfoDto input, HttpDataResult pushResult, string platformPassword = null) - { - UpdateDeviceInput updateDeviceInput = input.Adapt(); - updateDeviceInput.IoTPlatformResponse = pushResult.Serialize(); - updateDeviceInput.IsPlatformPushSuccess = true; - if (!string.IsNullOrWhiteSpace(updateDeviceInput.PlatformPassword)) - { - updateDeviceInput.PlatformPassword = platformPassword; - } - - var updateResult = await deviceAppService.UpdateAsync(updateDeviceInput); - if (updateResult == null) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 更新设备信息失败：{input.Serialize()}"); - throw new UserFriendlyException($"推送结果更新失败。"); - } - - //设备数据缓存到Redis - DeviceCacheInfos deviceCacheInfos = input.Adapt(); - deviceCacheInfos.PlatformPassword = null; - - FreeRedisProvider.Instance.HSet(RedisConst.CacheAllDeviceInfoHashKey, input.DeviceAddress, deviceCacheInfos); - - - - return input.Adapt(); - } - /// /// 发送设备指令信息 /// @@ -358,7 +346,7 @@ namespace JiShe.IoT.DeviceAggregation /// 返回固件信息和文件信息的元组 private async Task<(DeviceFirmwareInfoDto FirmwareInfo, FileObjectDto FileInfo)> ValidateAndGetFirmwareInfoAsync(Guid firmwareVersionDataId, string iotPlatformProductId, string firmwareNotFoundErrorCode = null, string fileNotFoundErrorCode = null) { - var deviceFirmwareVersionInfo = await deviceFirmwareInfoService.FindByIdAsync(new IdInput() { Id = firmwareVersionDataId }); + var deviceFirmwareVersionInfo = await _deviceFirmwareInfoService.FindByIdAsync(new IdInput() { Id = firmwareVersionDataId }); if (deviceFirmwareVersionInfo == null) { @@ -366,7 +354,7 @@ namespace JiShe.IoT.DeviceAggregation throw new UserFriendlyException(errorMsg, firmwareNotFoundErrorCode ?? string.Empty); } - var fileInfo = await fileAppService.GetFileAsync(new IdInput() { Id = deviceFirmwareVersionInfo.FirmwareFileId }); + var fileInfo = await _fileAppService.GetFileAsync(new IdInput() { Id = deviceFirmwareVersionInfo.FirmwareFileId }); if (fileInfo == null) { @@ -393,69 +381,7 @@ namespace JiShe.IoT.DeviceAggregation }; } - /// - /// 获取OneNET产品信息和平台端物模型信息 - /// - /// 物联网平台产品Id - /// 设备地址（用于错误信息） - /// 返回产品信息和平台端物模型信息的元组 - private async Task<(dynamic ProductInfo, dynamic PlatformThingModelInfo)> GetOneNETProductAndThingModelInfoAsync(string iotPlatformProductId, string deviceAddress) - { - //获取设备对应的产品信息 - var productInfo = await oneNETProductService.GetProductInfoAsync(new IdInput() { Id = iotPlatformProductId }); - if (productInfo == null) - { - throw new UserFriendlyException($"{nameof(DeviceUpgradeCommandToOneNET)} OneNET设备升级属性设置失败，产品Id{iotPlatformProductId}未找到对应的产品信息。"); - } - - //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 - var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = iotPlatformProductId }); - - if (platformThingModelInfo == null) - { - throw new UserFriendlyException($"设备{deviceAddress}的平台端物模型信息不存在。"); - } - - return (productInfo, platformThingModelInfo); - } - - /// - /// 根据平台处理设备升级指令 - /// - /// 设备信息 - /// 接收指令信息Dto - /// 固件版本信息 - /// 文件信息 - /// 升级输入参数 - /// OneNET产品信息（可选，如果已获取则传入以避免重复调用） - /// OneNET平台端物模型信息（可选，如果已获取则传入以避免重复调用） - /// 处理结果 - private async Task ProcessDeviceUpgradeByPlatformAsync(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto receiveCommandInfoDto, DeviceFirmwareInfoDto deviceFirmwareVersionInfo, FileObjectDto fileInfo, DeviceUpgradeForApiInput input, dynamic oneNETProductInfo = null, dynamic oneNETPlatformThingModelInfo = null) - { - if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) - { - //如果未传入产品信息和物模型信息，则获取 - if (oneNETProductInfo == null || oneNETPlatformThingModelInfo == null) - { - var (productInfo, platformThingModelInfo) = await GetOneNETProductAndThingModelInfoAsync(deviceInfo.IoTPlatformProductId, deviceInfo.DeviceAddress); - oneNETProductInfo = productInfo; - oneNETPlatformThingModelInfo = platformThingModelInfo; - } - - return await DeviceUpgradeCommandToOneNET(deviceInfo, receiveCommandInfoDto, deviceFirmwareVersionInfo, fileInfo, input, oneNETProductInfo, oneNETPlatformThingModelInfo); - } - else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing) - { - //await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.CTWingAepCommandIssuedEventName,commandRequest); - //return true; - throw new UserFriendlyException($"发送设备升级指令信息失败，CTWing暂未实现。"); - } - else - { - throw new UserFriendlyException($"发送设备升级指令信息失败，未找到对应的产品配置信息。"); - } - } /// /// 发送设备升级指令信息 @@ -577,10 +503,11 @@ namespace JiShe.IoT.DeviceAggregation throw new UserFriendlyException($"{nameof(DownloadFirmwareInfoAsync)} 设备升级记录信息 {input.Id} 不存在"); } + _logger.LogWarning($"{nameof(DownloadFirmwareInfoAsync)} 设备升级下载固件，记录信息 {input.Id} 缓存结果：{redisResult}"); //将缓存中的文件ID转换成GUID Guid fileId = new Guid(redisResult); - var downLoadResult = await fileAppService.AllowDownloadAsync(new IdInput() + var downLoadResult = await _fileAppService.AllowDownloadAsync(new IdInput() { Id = fileId, }); @@ -598,7 +525,7 @@ namespace JiShe.IoT.DeviceAggregation } catch (Exception ex) { - logger.LogError($"{nameof(DownloadFirmwareInfoAsync)}{input.Id}下载设备固件文件发生异常，{ex.Message}"); + _logger.LogError($"{nameof(DownloadFirmwareInfoAsync)}{input.Id}下载设备固件文件发生异常，{ex.Message}"); throw; } } @@ -625,9 +552,17 @@ namespace JiShe.IoT.DeviceAggregation } - //数据写入遥测任务数据存储通道 + //数据写入遥测任务数据存储通道 + var commandRequest = new OpenApiRequest() + { + Message = input.Serialize(), + }; + var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt(), input.PropertyList.Serialize()); + if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) { + await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETUpgradeCommandIssuedEventName, packetTaskInfo)); + return await DevicePropertyValueToOneNET(deviceInfo, input); } else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing) @@ -646,56 +581,7 @@ namespace JiShe.IoT.DeviceAggregation throw; } } - - /// - /// 业务系统批量创建设备信息 - /// - /// - /// - public async Task BatchCreateDeviceBusinessSystemAsync(BatchCreateDeviceBusinessSystemInput input) - { - try - { - if (input.DeviceInfos == null || input.DeviceInfos.Count <= 0) - { - throw new UserFriendlyException($"业务系统批量创建设备信息，设备信息不能为空。"); - } - - if (input.DeviceInfos.Count > 100) - { - throw new UserFriendlyException($"业务系统批量创建设备信息，设备信息不能超过100个。"); - } - - if (input.DeviceSourceType != DeviceSourceTypeEnum.Prepay && input.DeviceSourceType != DeviceSourceTypeEnum.Energy) - { - throw new UserFriendlyException($"业务系统批量创建设备信息，设备来源异常。"); - } - - if (input.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.CTWing) - { - var batchCreateDeviceInput = input.Adapt(); - batchCreateDeviceInput.AddressList = input.DeviceInfos.Select(f => f.DeviceAddress.Trim()).ToList(); - - return await CTWingDeviceBatchCreateAsync(batchCreateDeviceInput); - } - else if (input.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.OneNET) - { - var batchCreateDeviceInput = input.Adapt(); - batchCreateDeviceInput.AddressList = input.DeviceInfos.Select(f => f.DeviceAddress.Trim()).ToList(); - - return await OneNETDeviceBatchCreateAsync(batchCreateDeviceInput); - } - - throw new UserFriendlyException($"不支持的物联网平台"); - } - catch (Exception) - { - - throw; - } - } - - + /// /// 绑定设备端物模型 /// @@ -715,7 +601,7 @@ namespace JiShe.IoT.DeviceAggregation { if (item.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.CTWing) { - logger.LogInformation($"{nameof(BindingDeviceThingModel)} CTWing设备{item.DeviceAddress}绑定设备物模型未实现"); + _logger.LogInformation($"{nameof(BindingDeviceThingModel)} CTWing设备{item.DeviceAddress}绑定设备物模型未实现"); continue; } else if (item.IoTPlatform == ServicePro.Enums.IoTPlatformTypeEnum.OneNET) @@ -748,648 +634,6 @@ namespace JiShe.IoT.DeviceAggregation } - #region OneNET 设备操作 - /// - /// OneNET设备创建 - /// - /// - /// - protected async Task OneNETDeviceCreateAsync(CreateDeviceAggregationInput input) - { - try - { - CreateDeviceInput createDeviceInput = input.Adapt(); - - var productInfo = await oneNETProductService.GetProductInfoAsync(new IdInput() { Id = input.IoTPlatformProductId }); - - if (productInfo == null) - { - throw new UserFriendlyException($"OneNET创建设备失败，未找到对应的产品配置信息。"); - } - - if (input.DeviceSourceType == DeviceSourceTypeEnum.Workshop && !productInfo.IsEnabled) //车间生产推送，必须是已经启用的产品才可以 - { - throw new UserFriendlyException($"车间生产推送OneNET创建设备失败，产品未启用。"); - } - - createDeviceInput.DeviceName = input.DeviceAddress; - createDeviceInput.IoTPlatformAccountId = productInfo.OneNETAccountId; - createDeviceInput.IoTPlatformDeviceOpenInfo = $"{input.IoTPlatformProductId}{input.DeviceAddress}"; - createDeviceInput.PlatformPassword = productInfo.ProductAccesskey; - createDeviceInput.IoTPlatformProductName = productInfo.ProductName; - createDeviceInput.AccountPhoneNumber = productInfo.AccountPhoneNumber; - if (input.DeviceType.HasValue) - { - createDeviceInput.DeviceType = input.DeviceType.Value; - } - - var insertResult = await deviceAppService.CreateAsync(createDeviceInput); - if (insertResult == null) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 添加设备信息失败：{input.Serialize()}"); - return false; - } - - //推送至OneNET平台 - var pushResult = await oneNETDeviceService.CreateDeviceInfoAsync(new CreateDeviceInfoInput() - { - DeviceName = createDeviceInput.IoTPlatformDeviceOpenInfo, - ProductId = productInfo.IoTPlatformProductId, - OneNETAccountId = productInfo.OneNETAccountId, - Description = input.DeviceAddress, - }); - - if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success || pushResult.Data == null) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 推送设备信息失败：{pushResult.Serialize()}"); - return false; - } - - //更新OneNET平台推送结果 - await DeviceUpdateHandler(insertResult, pushResult, pushResult.Data.SecurityKey); - - return true; - } - catch (Exception) - { - - throw; - } - } - - /// - /// OneNET设备批量创建 - /// - /// - /// - protected async Task OneNETDeviceBatchCreateAsync(BatchCreateDeviceAggregationInput input) - { - try - { - var productInfo = await FreeSqlDbContext.Instance.Select() - .Where(e => e.IoTPlatformProductId == input.IoTPlatformProductId)//此处不需要过滤产品状态，方便测试产品配置信息是否准确，避免跟车间生产搞混 - .WhereIf(input.DeviceSourceType == DeviceSourceTypeEnum.Workshop, e => e.IsEnabled == true) - .FirstAsync(); - - if (productInfo == null) - { - throw new UserFriendlyException($"批量创建设备失败，未找到对应的产品配置信息。"); - } - - BatchCreateDeviceInput batchCreateDeviceInput = new BatchCreateDeviceInput() - { - IoTPlatform = input.IoTPlatform, - AddressList = input.AddressList, - DeviceInputs = new List() - }; - - //检查网关或者直连设备信息是否已经存在 - var checkDevicesInfos = await deviceAppService.FindByDeviceAddressAsync(new FindByDeviceAddressInput() - { - AddressList = input.AddressList, - IoTPlatform = input.IoTPlatform, - IoTPlatformProductId = input.IoTPlatformProductId, - }); - - foreach (var item in input.DeviceInfos) - { - if (checkDevicesInfos != null) - { - - var checkDevices = checkDevicesInfos.Where(e => e.DeviceAddress == item.DeviceAddress).FirstOrDefault(); - - if (checkDevices != null && checkDevices.IsPlatformPushSuccess) - { - logger.LogError($"{nameof(OneNETDeviceBatchCreateAsync)} 平台{input.IoTPlatform} 产品 {input.IoTPlatformProductId} 下设备信息已存在：{item.DeviceAddress}"); - continue; - } - } - - - CreateDeviceInput createDeviceInput = input.Adapt(); - createDeviceInput.DeviceName = item.DeviceAddress; - createDeviceInput.DeviceAddress = item.DeviceAddress; - createDeviceInput.IoTPlatformAccountId = productInfo.OneNETAccountId; - createDeviceInput.IoTPlatformDeviceOpenInfo = $"{input.IoTPlatformProductId}{item.DeviceAddress}"; - createDeviceInput.PlatformPassword = productInfo.ProductAccesskey; - createDeviceInput.IoTPlatformProductName = productInfo.ProductName; - createDeviceInput.AccountPhoneNumber = productInfo.AccountPhoneNumber; - - if (input.DeviceSourceType.HasValue) - { - createDeviceInput.DeviceSourceType = input.DeviceSourceType.Value; - } - - if (input.DeviceType.HasValue) - { - createDeviceInput.DeviceType = input.DeviceType.Value; - } - - if (item.BusinessSystemDeviceDataId.HasValue) - { - createDeviceInput.BusinessSystemDeviceDataId = item.BusinessSystemDeviceDataId.Value; - } - - batchCreateDeviceInput.DeviceInputs.Add(createDeviceInput); - } - - - if (batchCreateDeviceInput.DeviceInputs != null || batchCreateDeviceInput.DeviceInputs.Count > 0) - { - - - var insertResult = await deviceAppService.BatchCreateAsync(batchCreateDeviceInput); - if (insertResult == null) - { - logger.LogError($"{nameof(OneNETDeviceBatchCreateAsync)} OneNET设备批量创建添加设备信息失败：{input.Serialize()}"); - return false; - } - //网关或者直连设备 推送至OneNET平台 - var oneNETBatchCreateDeviceInfoInput = new BatchCreateDeviceInfoInput() - { - ProductId = productInfo.IoTPlatformProductId, - OneNETAccountId = productInfo.OneNETAccountId, - DeviceList = new List() - }; - - oneNETBatchCreateDeviceInfoInput.DeviceList = batchCreateDeviceInput.DeviceInputs.Select(d => d.IoTPlatformDeviceOpenInfo).ToList(); - - var pushResult = await oneNETDeviceService.BatchCreateDeviceInfoAsync(oneNETBatchCreateDeviceInfoInput); - - if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 推送设备信息失败：{pushResult.Serialize()}"); - return false; - } - - //更新OneNET平台推送结果 - foreach (var item in insertResult) - { - var successEntity = pushResult.Data.Successlist.Where(d => d.DeviceName == item.IoTPlatformDeviceOpenInfo).FirstOrDefault(); - if (successEntity != null) - { - await DeviceUpdateHandler(item, HttpDataResultExtensions.Success(successEntity), successEntity.SecurityKey); - } - } - } - - //暂不考虑子设备地址信息，由网关设备主动上报 - - return true; - } - catch (Exception) - { - - throw; - } - } - - - /// - /// 重新推送设备信息到OneNET物联网平台 - /// - /// - /// - /// - public async Task RepushDeviceInfoToOneNET(DeviceManagementInfoDto input) - { - try - { - //检查OneNET平台设备是否已经存在 - var oneNETDeviceInfoResult = await oneNETDeviceService.DeviceInfoDetailAsync(new DeviceInfoDetailInput() - { - DeviceName = input.IoTPlatformDeviceOpenInfo, - ProductId = input.IoTPlatformProductId, - OneNETAccountId = input.IoTPlatformAccountId, - }); - - if (oneNETDeviceInfoResult != null && oneNETDeviceInfoResult.Code == ServicePro.Enums.ResponeResultEnum.Success) - { - throw new UserFriendlyException($"OneNET推送失败，账号产品下{input.IoTPlatformProductId}已经存在该设备{input.DeviceAddress}。"); - } - - //推送至OneNET平台 - var pushResult = await oneNETDeviceService.CreateDeviceInfoAsync(new CreateDeviceInfoInput() - { - DeviceName = input.IoTPlatformDeviceOpenInfo, - ProductId = input.IoTPlatformProductId, - OneNETAccountId = input.IoTPlatformAccountId, - Description = input.DeviceAddress, - }); - - if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success || pushResult.Data == null) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 推送设备信息失败：{pushResult.Serialize()}"); - throw new UserFriendlyException($"平台请求失败。"); - - } - - return await DeviceUpdateHandler(input, pushResult, pushResult.Data.SecurityKey); - } - catch (Exception) - { - - throw; - } - } - - /// - /// 删除OneNET平台设备 - /// - /// - /// - /// - public async Task DeleteDeviceInfoToOneNET(DeviceManagementInfoDto input) - { - try - { - //删除OneNET平台设备信息 - var deleteResult = await oneNETDeviceService.DeleteDeviceInfoAsync(new DeleteDeviceInfoInput() - { - DeviceName = input.IoTPlatformDeviceOpenInfo, - ProductId = input.IoTPlatformProductId, - OneNETAccountId = input.IoTPlatformAccountId, - }); - - if (deleteResult == null || deleteResult.Code != ServicePro.Enums.ResponeResultEnum.Success) - { - logger.LogError($"{nameof(CreateDeviceForApiAsync)} 删除设备信息失败：{deleteResult.Serialize()}"); - throw new UserFriendlyException($"删除设备平台请求失败。"); - - } - - var localDeleteReult = await deviceAppService.DeleteAsync(new IdInput() { Id = input.Id }); - if (localDeleteReult == false) - { - throw new UserFriendlyException($"平台设备信息删除成功，系统删除设备失败。"); - } - - return localDeleteReult; - } - catch (Exception) - { - - throw; - } - } - - /// - /// 发送OneNET平台设备指令 - /// - /// 设备信息 - /// 指令信息 - /// 平台端物模型信息 - /// - /// - protected async Task DeviceCommandInfoToOneNET(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto input, List platformThingModelInfos = null) - { - try - { - - //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 - if (platformThingModelInfos == null || platformThingModelInfos.Count <= 0) - { - platformThingModelInfos = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); - } - - if (platformThingModelInfos == null || platformThingModelInfos.Count <= 0) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}的平台端物模型信息不存在。"); - } - - foreach (var item in input.Commands) - { - var tempPlatformThingModelInfo = platformThingModelInfos.Where(d => d.IoTPlatformRawFieldName == item.Key).FirstOrDefault(); - if (tempPlatformThingModelInfo == null) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息不存在属性标识符{item.Key}。"); - } - - //排除升级指令 - if (tempPlatformThingModelInfo.StandardFieldName.ToLowerInvariant() == ThingModelFixedTypeConst.FIRMWARE_UPGRADE.ToLowerInvariant()) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型属性标识符{item.Key}是升级指令，此处不允许下发。"); - } - } - - //检查设备是否有配置设备端物模型信息 - //如果有配置，就检查指令字典中是否有SpecialCommand标识符 - //如果有就需要构建 SpecialCommand 的特别指令 - if (deviceInfo.IsNeedConfigDeviceModel && deviceInfo.DeviceThingModelDataId.HasValue && input.Commands.ContainsKey(ThingModelFixedTypeConst.SpecialCommand)) - { - var propertyInfo = await oneNETProductService.GetProductThingModelSpecialCommandDataTypeListAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); - - if (propertyInfo == null) - { - throw new UserFriendlyException($"{nameof(DeviceCommandInfoToOneNET)} OneNET设备属性设置失败，产品Id{deviceInfo.IoTPlatformProductId}未找到对应的属性信息。"); - } - - Dictionary tempSpecialCommand = await deviceThingModelService.BuildThingModelSpecialCommandAsync(propertyInfo, deviceInfo.DeviceThingModelDataId.Value); - - input.Commands[ThingModelFixedTypeConst.SpecialCommand] = tempSpecialCommand; - } - else if (input.Commands.ContainsKey(ThingModelFixedTypeConst.SpecialCommand)) - { - //设备端物模型解除绑定情况下，SpecialCommand 还原默认值，设备也会恢复默认采集方式 - //给SpecialCommand第一个参数设置默认值 - - var propertyInfo = await oneNETProductService.GetProductThingModelSpecialCommandDataTypeListAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); - - if (propertyInfo == null) - { - throw new UserFriendlyException($"{nameof(DeviceCommandInfoToOneNET)} OneNET设备属性设置失败，产品Id{deviceInfo.IoTPlatformProductId}未找到对应的属性信息。"); - } - string paName = propertyInfo.FirstOrDefault()?.Identifier; - - input.Commands[ThingModelFixedTypeConst.SpecialCommand] = new Dictionary() { - { paName, CommonConst.SpecialCommandDefaultValue } - }; - logger.LogWarning($"{nameof(DeviceCommandInfoToOneNET)} OneNET平台设备{deviceInfo.DeviceAddress}特殊抄读指令还原为{CommonConst.SpecialCommandDefaultValue}"); - } - - var commandRequest = new OpenApiRequest() - { - Message = input.Serialize(), - }; - var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt(), input.Commands.Serialize()); - - await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo)); - - await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo); - return true; - } - catch (Exception ex) - { - logger.LogError($"{nameof(DeviceCommandInfoToOneNET)} 发送OneNET设备指令信息发生异常，设备地址：{deviceInfo.DeviceAddress}，异常信息：{ex.Message}"); - throw; - } - } - - /// - /// 发送OneNET平台设备升级指令 - /// - /// - /// 设置属性请求内容相关 - /// 固件数据Id - /// 固件文件信息 - /// 入参 - /// 产品信息（如果已获取则传入以避免重复调用） - /// 平台端物模型信息（如果已获取则传入以避免重复调用） - /// - /// - protected async Task DeviceUpgradeCommandToOneNET(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto taskInput, DeviceFirmwareInfoDto deviceFirmwareInfo, FileObjectDto fileObject, DeviceUpgradeForApiInput input, dynamic productInfo = null, dynamic platformThingModelInfo = null) - { - try - { - if (deviceInfo == null || deviceFirmwareInfo == null || fileObject == null) - { - throw new UserFriendlyException($"{nameof(DeviceUpgradeCommandToOneNET)}设备或固件信息不能为空"); - } - - if ((deviceInfo.IoTPlatformProductId != deviceFirmwareInfo.IoTPlatformProductId) || (deviceInfo.IoTPlatform != deviceFirmwareInfo.IoTPlatform)) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台产品信息固件中不一致"); - } - - //如果未传入产品信息和物模型信息，则获取 - if (productInfo == null || platformThingModelInfo == null) - { - var (productInfoResult, platformThingModelInfoResult) = await GetOneNETProductAndThingModelInfoAsync(deviceInfo.IoTPlatformProductId, deviceInfo.DeviceAddress); - productInfo = productInfoResult; - platformThingModelInfo = platformThingModelInfoResult; - } - - var upgradeProperty = ((List)platformThingModelInfo).Where(d => d.StandardFieldName == ThingModelFixedTypeConst.FIRMWARE_UPGRADE).FirstOrDefault(); - if (upgradeProperty == null) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息不存在升级属性标识符{ThingModelFixedTypeConst.FIRMWARE_UPGRADE}。"); - } - - //构建升级指令，《文件MD5值+OneNET产品KEY+升级标识符+文件大小》=>MD5计算获得签名值 - - var upgradeRecordInput = new CreateDeviceUpgradeRecordInput() - { - DeviceDataId = deviceInfo.Id, - DeviceName = deviceInfo.DeviceName, - DeviceAddress = deviceInfo.DeviceAddress, - OldFirmwareVersion = deviceInfo.FirmwareVersion, - NowFirmwareVersion = deviceFirmwareInfo.FirmwareVersion, - UpgradeSource = DeviceUpgradeSourceTypeEnum.AdminSystem, - UpgradeIdentifier = Yitter.IdGenerator.YitIdHelper.NextId(), - UpgradeDescription = input.UpgradeDescription, - UpgradeStatus = DeviceUpgradeStatusTypeEnum.NotUpgrade, - Id = GuidGenerator.Create() - }; - - var md5HashRaw = $"{fileObject.Md5Hash}{productInfo.ProductAccesskey}{upgradeRecordInput.UpgradeIdentifier}{fileObject.FileSize}"; - - var upgradeRequest = new DeviceUpgradeCommandRequest() - { - Length = fileObject.FileSize, - UpgradeIdentifier = upgradeRecordInput.UpgradeIdentifier, - SignatureValue = md5HashRaw.Md5Fun(), - FirmwareUrl = $"{serverApplicationOptions.DownloadDeviceFirmwareBasicUrl}{upgradeRecordInput.Id}", - TimeOut = serverApplicationOptions.DownloadDeviceFirmwareTimeOut, - }; - - upgradeRecordInput.UpgradeMessage = upgradeRequest.Serialize(); - upgradeRecordInput.FirmwareSignature = upgradeRequest.SignatureValue; - - string upgradeMessageHexString = upgradeRecordInput.UpgradeMessage.ToHexString(); - - //检查长度是否超过了OneNET平台升级属性标识符的长度限制 - var thingModelInfoStr = ((OneNETProductInfoDto)productInfo).ThingModelInfos; - if (string.IsNullOrWhiteSpace(thingModelInfoStr)) - { - logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，属性信息为空"); - return false; - } - var thingModelInfo = thingModelInfoStr.Deserialize(); - if (thingModelInfo.Properties == null) - { - logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，属性信息为空"); - return false; - } - - var property = thingModelInfo.Properties.Where(d => d.Identifier == upgradeProperty.IoTPlatformRawFieldName).FirstOrDefault(); //精准匹配 - - if (property == null) - { - logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，没有找到属性标识升级对应的属性平台信息"); - return false; - } - - var length = ((OneNETModelStringSpecs)property.DataType.Specs).Length; - if (upgradeMessageHexString.Length > length) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息属性标识符{upgradeProperty.IoTPlatformRawFieldName}长度超过OneNET平台限制，请检查物模型属性标识符长度是否超过了{length}"); - } - - var insertResult = await deviceUpgradeRecordService.CreateAsync(upgradeRecordInput); - - if (insertResult == null) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}升级记录失败"); - } - - //发送OneNET平台设备升级指令，HEX格式字符串 - taskInput.Commands = new Dictionary() - { - { upgradeProperty.IoTPlatformRawFieldName, upgradeMessageHexString } - }; - - var commandRequest = new OpenApiRequest() - { - Message = taskInput.Serialize(), - }; - var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt(), taskInput.Commands.Serialize()); - - await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETUpgradeCommandIssuedEventName, packetTaskInfo)); - - //将升级记录数据Id作为key，文件数据ID作为值，存入Redis缓存中。 - string cacheKey = string.Format($"{RedisConst.CacheDeviceUpgradeRecordDataKey}", upgradeRecordInput.Id); - - await FreeRedisProvider.Instance.SetAsync(cacheKey, fileObject.Id); - - await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo); - - //更新状态为升级中 - await deviceUpgradeRecordService.UpdateStatusAsync(new UpdateStatusInput() - { - Id = upgradeRecordInput.Id.Value, - UpgradeStatus = DeviceUpgradeStatusTypeEnum.Upgrading, - }); - return true; - } - catch (Exception) - { - - throw; - } - } - - /// - /// 抄读OneNET平台设备属性数据 - /// - /// - /// - /// - /// - protected async Task> DevicePropertyValueToOneNET(DeviceManagementInfoDto deviceInfo, DevicePropertyValueForApiInput input) - { - try - { - //检查下设备是否在线 - var deviceOnlineStatus = await oneNETDeviceService.DeviceInfoDetailAsync(new DeviceInfoDetailInput() - { - DeviceName = deviceInfo.IoTPlatformDeviceOpenInfo, - OneNETAccountId = deviceInfo.IoTPlatformAccountId, - ProductId = deviceInfo.IoTPlatformProductId, - }); - - if (deviceOnlineStatus == null || deviceOnlineStatus.Code != ResponeResultEnum.Success) - { - throw new UserFriendlyException("获取平台设备信息失败"); - } - - if (deviceOnlineStatus.Data.Status != 1) - { - throw new UserFriendlyException("设备不在线"); - } - - var deviceDataResult = await oneNETDeviceService.QueryDevicePropertyDetail(new QueryDevicePropertyDetailInput() - { - DeviceName = deviceInfo.IoTPlatformDeviceOpenInfo, - OneNETAccountId = deviceInfo.IoTPlatformAccountId, - ProductId = deviceInfo.IoTPlatformProductId, - PropertyInfos = input.PropertyList - }); - if (deviceDataResult == null || deviceDataResult.Success == false || deviceDataResult.Data == null) - { - throw new UserFriendlyException($"设备{deviceInfo.DeviceName}获取数据失败"); - } - - //获取设备产品平台端物模型信息 - var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); - if (platformThingModelInfo == null || platformThingModelInfo.Count <= 0) - { - return deviceDataResult.Data; - } - - List updateKeys = new List() - { - ThingModelFixedTypeConst.FIRMWARE_VERSION.ToLowerInvariant(), - ThingModelFixedTypeConst.ReadingMode.ToLowerInvariant() - }; - - var platformUpdatePropertyInfos = platformThingModelInfo.Where(d => updateKeys.Contains(d.StandardFieldName.ToLowerInvariant())).ToList(); - if (platformUpdatePropertyInfos == null || platformUpdatePropertyInfos.Count <= 0) - { - return deviceDataResult.Data; - } - - //根据抄读结果（单个或多个属性）更新设备信息，统一收集后只调用一次 UpdateDeviceInfos - bool needUpdate = false; - - //抄读结果如果有固件版本号，则更新固件版本号到设备信息中 - var firmwareVersionKey = platformUpdatePropertyInfos.FirstOrDefault(d => d.StandardFieldName?.ToLowerInvariant() == ThingModelFixedTypeConst.FIRMWARE_VERSION.ToLowerInvariant())?.IoTPlatformRawFieldName; - if (!string.IsNullOrWhiteSpace(firmwareVersionKey) && deviceDataResult.Data.ContainsKey(firmwareVersionKey)) - { - deviceInfo.FirmwareVersion = deviceDataResult.Data[firmwareVersionKey].ToString(); - needUpdate = true; - } - - //抄读结果如果有抄读模式，则更新抄读模式到设备信息中 - var readModeKey = platformUpdatePropertyInfos.FirstOrDefault(d => d.StandardFieldName?.ToLowerInvariant() == ThingModelFixedTypeConst.ReadingMode.ToLowerInvariant())?.IoTPlatformRawFieldName; - if (!string.IsNullOrWhiteSpace(readModeKey) && deviceDataResult.Data.ContainsKey(readModeKey)) - { - var readModeValue = deviceDataResult.Data[readModeKey]; - - // 兼容 JsonElement / 字符串 / 数值 三种情况 - int readModeInt; - if (readModeValue is System.Text.Json.JsonElement jsonElement) - { - if (jsonElement.ValueKind == System.Text.Json.JsonValueKind.Number && jsonElement.TryGetInt32(out var num)) - { - readModeInt = num; - } - else - { - readModeInt = Convert.ToInt32(jsonElement.ToString()); - } - } - else - { - readModeInt = Convert.ToInt32(readModeValue); - } - - deviceInfo.ReadingMode = (DeviceReadingModeEnum)readModeInt; - needUpdate = true; - } - - if (needUpdate) - { - await deviceAppService.UpdateDeviceInfos(deviceInfo); - } - - return deviceDataResult.Data; - } - catch (Exception ex) - { - - if (input.PropertyList.Contains(ThingModelFixedTypeConst.SpecialCommand)) - { - ex = new UserFriendlyException("请检查设备是否已经采集数据"); - throw ex; - } - else - { - throw; - } - } - } - #endregion - #region CTWing 设备操作 /// /// CTWing 设备创建 @@ -1400,26 +644,7 @@ namespace JiShe.IoT.DeviceAggregation { throw new UserFriendlyException($"CTWing 设备创建失败，功能未实现。"); } - - /// - /// CTWing 批量设备创建 - /// - /// - /// - protected async Task CTWingDeviceBatchCreateAsync(BatchCreateDeviceAggregationInput input) - { - try - { - throw new UserFriendlyException($"CTWing 批量设备创建失败，CTWing暂未实现。"); - } - catch (Exception) - { - - throw; - } - } - - + /// /// 重新推送设备信息到CTWing物联网平台 diff --git a/src/JiShe.IoT.Application/IoTDeviceBasicAppService.cs b/src/JiShe.IoT.Application/IoTDeviceBasicAppService.cs new file mode 100644 index 0000000..d7c6d66 --- /dev/null +++ b/src/JiShe.IoT.Application/IoTDeviceBasicAppService.cs @@ -0,0 +1,849 @@ +using JiShe.IoT.DeviceAggregation; +using JiShe.IoT.DeviceAggregation.Dto; +using JiShe.ServicePro; +using JiShe.ServicePro.ApacheIoTDB.Provider.Options; +using JiShe.ServicePro.Core; +using JiShe.ServicePro.DataChannelManages; +using JiShe.ServicePro.DeviceManagement.DeviceInfos; +using JiShe.ServicePro.DeviceManagement.DeviceInfos.Dto; +using JiShe.ServicePro.DeviceManagement.ThingModels; +using JiShe.ServicePro.Dto; +using JiShe.ServicePro.Encrypt; +using JiShe.ServicePro.Enums; +using JiShe.ServicePro.FileManagement.Files; +using JiShe.ServicePro.FreeRedisProvider; +using JiShe.ServicePro.FreeSqlProvider; +using JiShe.ServicePro.IoTDBManagement.DataChannels; +using JiShe.ServicePro.IoTDBManagement.TableModels; +using JiShe.ServicePro.IoTDBManagement.TreeModels; +using JiShe.ServicePro.OneNET.Provider.OpenApiModels.Commands; +using JiShe.ServicePro.OneNETManagement.OneNETDevices; +using JiShe.ServicePro.OneNETManagement.OneNETProducts; +using Mapster; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Volo.Abp; + +namespace JiShe.IoT +{ + /// + /// 设备基础服务 + /// + public abstract class IoTDeviceBasicAppService : IoTAppService + { + protected readonly ILogger logger; + protected readonly IDeviceAppService deviceAppService; + protected readonly IOneNETDeviceService oneNETDeviceService; + protected readonly IReliableRedisPubSubService redisPubSubService; + protected readonly IIoTDBDataChannelManageService ioTDBDataChannelManageService; + protected readonly IoTDBOptions ioTDBOptions; + protected readonly ServerApplicationOptions serverApplicationOptions; + protected readonly IOneNETProductService oneNETProductService; + protected readonly IDeviceThingModelManagementAppService deviceThingModelService; + protected readonly IIoTPlatformThingModelInfoAppService platformThingModelInfoAppService; + protected readonly IDeviceUpgradeRecordService deviceUpgradeRecordService; + protected readonly ITreeModelService treeModelService; + + /// + /// 设备服务 + /// OneNET设备服务 + /// Redis发布订阅服务 + /// 数据通道 + /// IoTDBOptions + /// OneNET产品服务 + /// 设备端物模型服务 + /// 平台端端物模型服务 + /// 设备升级记录服务 + /// 应用服务配置 + /// IoTDB树模型服务 + protected IoTDeviceBasicAppService( + ILogger logger, + IDeviceAppService deviceAppService, + IOneNETDeviceService oneNETDeviceService, + IReliableRedisPubSubService redisPubSubService, + IIoTDBDataChannelManageService ioTDBDataChannelManageService, + IOptions _ioTDBOptions, + IOptions _serverOptions, + IOneNETProductService oneNETProductService, + IDeviceThingModelManagementAppService deviceThingModelService, + IIoTPlatformThingModelInfoAppService platformThingModelInfoAppService, + IDeviceUpgradeRecordService deviceUpgradeRecordService, + ITreeModelService treeModelService) + { + this.logger = logger; + this.deviceAppService = deviceAppService; + this.oneNETDeviceService = oneNETDeviceService; + this.redisPubSubService = redisPubSubService; + this.ioTDBDataChannelManageService = ioTDBDataChannelManageService; + this.ioTDBOptions = _ioTDBOptions.Value; + this.serverApplicationOptions = _serverOptions.Value; + this.oneNETProductService = oneNETProductService; + this.deviceThingModelService = deviceThingModelService; + this.platformThingModelInfoAppService = platformThingModelInfoAppService; + this.deviceUpgradeRecordService = deviceUpgradeRecordService; + this.treeModelService = treeModelService; + } + + #region OneNET 设备操作 + /// + /// OneNET设备创建 + /// + /// + /// + protected async Task OneNETDeviceCreateAsync(CreateDeviceAggregationInput input) + { + try + { + CreateDeviceInput createDeviceInput = input.Adapt(); + + var productInfo = await oneNETProductService.GetProductInfoAsync(new IdInput() { Id = input.IoTPlatformProductId }); + + if (productInfo == null) + { + throw new UserFriendlyException($"OneNET创建设备失败，未找到对应的产品配置信息。"); + } + + if (input.DeviceSourceType == DeviceSourceTypeEnum.Workshop && !productInfo.IsEnabled) //车间生产推送，必须是已经启用的产品才可以 + { + throw new UserFriendlyException($"车间生产推送OneNET创建设备失败，产品未启用。"); + } + + createDeviceInput.DeviceName = input.DeviceAddress; + createDeviceInput.IoTPlatformAccountId = productInfo.OneNETAccountId; + createDeviceInput.IoTPlatformDeviceOpenInfo = $"{input.IoTPlatformProductId}{input.DeviceAddress}"; + createDeviceInput.PlatformPassword = productInfo.ProductAccesskey; + createDeviceInput.IoTPlatformProductName = productInfo.ProductName; + createDeviceInput.AccountPhoneNumber = productInfo.AccountPhoneNumber; + if (input.DeviceType.HasValue) + { + createDeviceInput.DeviceType = input.DeviceType.Value; + } + + var insertResult = await deviceAppService.CreateAsync(createDeviceInput); + if (insertResult == null) + { + logger.LogError($"{nameof(OneNETDeviceCreateAsync)} 添加设备信息失败：{input.Serialize()}"); + return false; + } + + //推送至OneNET平台 + var pushResult = await oneNETDeviceService.CreateDeviceInfoAsync(new CreateDeviceInfoInput() + { + DeviceName = createDeviceInput.IoTPlatformDeviceOpenInfo, + ProductId = productInfo.IoTPlatformProductId, + OneNETAccountId = productInfo.OneNETAccountId, + Description = input.DeviceAddress, + }); + + if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success || pushResult.Data == null) + { + logger.LogError($"{nameof(OneNETDeviceCreateAsync)} 推送设备信息失败：{pushResult.Serialize()}"); + return false; + } + + //更新OneNET平台推送结果 + await DeviceUpdateHandler(insertResult, pushResult, pushResult.Data.SecurityKey); + + return true; + } + catch (Exception) + { + + throw; + } + } + + /// + /// OneNET设备批量创建 + /// + /// + /// + protected async Task OneNETDeviceBatchCreateAsync(BatchCreateDeviceAggregationInput input) + { + try + { + var productInfo = await FreeSqlDbContext.Instance.Select() + .Where(e => e.IoTPlatformProductId == input.IoTPlatformProductId)//此处不需要过滤产品状态，方便测试产品配置信息是否准确，避免跟车间生产搞混 + .WhereIf(input.DeviceSourceType == DeviceSourceTypeEnum.Workshop, e => e.IsEnabled == true) + .FirstAsync(); + + if (productInfo == null) + { + throw new UserFriendlyException($"批量创建设备失败，未找到对应的产品配置信息。"); + } + + BatchCreateDeviceInput batchCreateDeviceInput = new BatchCreateDeviceInput() + { + IoTPlatform = input.IoTPlatform, + AddressList = input.AddressList, + DeviceInputs = new List() + }; + + //检查网关或者直连设备信息是否已经存在 + var checkDevicesInfos = await deviceAppService.FindByDeviceAddressAsync(new FindByDeviceAddressInput() + { + AddressList = input.AddressList, + IoTPlatform = input.IoTPlatform, + IoTPlatformProductId = input.IoTPlatformProductId, + }); + + foreach (var item in input.DeviceInfos) + { + if (checkDevicesInfos != null) + { + + var checkDevices = checkDevicesInfos.Where(e => e.DeviceAddress == item.DeviceAddress).FirstOrDefault(); + + if (checkDevices != null && checkDevices.IsPlatformPushSuccess) + { + logger.LogError($"{nameof(OneNETDeviceBatchCreateAsync)} 平台{input.IoTPlatform} 产品 {input.IoTPlatformProductId} 下设备信息已存在：{item.DeviceAddress}"); + continue; + } + } + + + CreateDeviceInput createDeviceInput = input.Adapt(); + createDeviceInput.DeviceName = item.DeviceAddress; + createDeviceInput.DeviceAddress = item.DeviceAddress; + createDeviceInput.IoTPlatformAccountId = productInfo.OneNETAccountId; + createDeviceInput.IoTPlatformDeviceOpenInfo = $"{input.IoTPlatformProductId}{item.DeviceAddress}"; + createDeviceInput.PlatformPassword = productInfo.ProductAccesskey; + createDeviceInput.IoTPlatformProductName = productInfo.ProductName; + createDeviceInput.AccountPhoneNumber = productInfo.AccountPhoneNumber; + + if (input.DeviceSourceType.HasValue) + { + createDeviceInput.DeviceSourceType = input.DeviceSourceType.Value; + } + + if (input.DeviceType.HasValue) + { + createDeviceInput.DeviceType = input.DeviceType.Value; + } + + if (item.BusinessSystemDeviceDataId.HasValue) + { + createDeviceInput.BusinessSystemDeviceDataId = item.BusinessSystemDeviceDataId.Value; + } + + batchCreateDeviceInput.DeviceInputs.Add(createDeviceInput); + } + + + if (batchCreateDeviceInput.DeviceInputs != null || batchCreateDeviceInput.DeviceInputs.Count > 0) + { + + + var insertResult = await deviceAppService.BatchCreateAsync(batchCreateDeviceInput); + if (insertResult == null) + { + logger.LogError($"{nameof(OneNETDeviceBatchCreateAsync)} OneNET设备批量创建添加设备信息失败：{input.Serialize()}"); + return false; + } + //网关或者直连设备 推送至OneNET平台 + var oneNETBatchCreateDeviceInfoInput = new BatchCreateDeviceInfoInput() + { + ProductId = productInfo.IoTPlatformProductId, + OneNETAccountId = productInfo.OneNETAccountId, + DeviceList = new List() + }; + + oneNETBatchCreateDeviceInfoInput.DeviceList = batchCreateDeviceInput.DeviceInputs.Select(d => d.IoTPlatformDeviceOpenInfo).ToList(); + + var pushResult = await oneNETDeviceService.BatchCreateDeviceInfoAsync(oneNETBatchCreateDeviceInfoInput); + + if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success) + { + logger.LogError($"{nameof(OneNETDeviceBatchCreateAsync)} 推送设备信息失败：{pushResult.Serialize()}"); + return false; + } + + //更新OneNET平台推送结果 + foreach (var item in insertResult) + { + var successEntity = pushResult.Data.Successlist.Where(d => d.DeviceName == item.IoTPlatformDeviceOpenInfo).FirstOrDefault(); + if (successEntity != null) + { + await DeviceUpdateHandler(item, HttpDataResultExtensions.Success(successEntity), successEntity.SecurityKey); + } + } + } + + //暂不考虑子设备地址信息，由网关设备主动上报 + + return true; + } + catch (Exception) + { + + throw; + } + } + + + /// + /// 重新推送设备信息到OneNET物联网平台 + /// + /// + /// + /// + public async Task RepushDeviceInfoToOneNET(DeviceManagementInfoDto input) + { + try + { + //检查OneNET平台设备是否已经存在 + var oneNETDeviceInfoResult = await oneNETDeviceService.DeviceInfoDetailAsync(new DeviceInfoDetailInput() + { + DeviceName = input.IoTPlatformDeviceOpenInfo, + ProductId = input.IoTPlatformProductId, + OneNETAccountId = input.IoTPlatformAccountId, + }); + + if (oneNETDeviceInfoResult != null && oneNETDeviceInfoResult.Code == ServicePro.Enums.ResponeResultEnum.Success) + { + throw new UserFriendlyException($"OneNET推送失败，账号产品下{input.IoTPlatformProductId}已经存在该设备{input.DeviceAddress}。"); + } + + //推送至OneNET平台 + var pushResult = await oneNETDeviceService.CreateDeviceInfoAsync(new CreateDeviceInfoInput() + { + DeviceName = input.IoTPlatformDeviceOpenInfo, + ProductId = input.IoTPlatformProductId, + OneNETAccountId = input.IoTPlatformAccountId, + Description = input.DeviceAddress, + }); + + if (pushResult == null || pushResult.Code != ServicePro.Enums.ResponeResultEnum.Success || pushResult.Data == null) + { + logger.LogError($"{nameof(RepushDeviceInfoToOneNET)} 推送设备信息失败：{pushResult.Serialize()}"); + throw new UserFriendlyException($"平台请求失败。"); + + } + + return await DeviceUpdateHandler(input, pushResult, pushResult.Data.SecurityKey); + } + catch (Exception) + { + + throw; + } + } + + /// + /// 删除OneNET平台设备 + /// + /// + /// + /// + public async Task DeleteDeviceInfoToOneNET(DeviceManagementInfoDto input) + { + try + { + //删除OneNET平台设备信息 + var deleteResult = await oneNETDeviceService.DeleteDeviceInfoAsync(new DeleteDeviceInfoInput() + { + DeviceName = input.IoTPlatformDeviceOpenInfo, + ProductId = input.IoTPlatformProductId, + OneNETAccountId = input.IoTPlatformAccountId, + }); + + if (deleteResult == null || deleteResult.Code != ServicePro.Enums.ResponeResultEnum.Success) + { + logger.LogError($"{nameof(DeleteDeviceInfoToOneNET)} 删除设备信息失败：{deleteResult.Serialize()}"); + throw new UserFriendlyException($"删除设备平台请求失败。"); + + } + + var localDeleteReult = await deviceAppService.DeleteAsync(new IdInput() { Id = input.Id }); + if (localDeleteReult == false) + { + throw new UserFriendlyException($"平台设备信息删除成功，系统删除设备失败。"); + } + + return localDeleteReult; + } + catch (Exception) + { + + throw; + } + } + + /// + /// 发送OneNET平台设备指令 + /// + /// 设备信息 + /// 指令信息 + /// 平台端物模型信息 + /// + /// + protected async Task DeviceCommandInfoToOneNET(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto input, List platformThingModelInfos = null) + { + try + { + + //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 + if (platformThingModelInfos == null || platformThingModelInfos.Count <= 0) + { + platformThingModelInfos = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); + } + + if (platformThingModelInfos == null || platformThingModelInfos.Count <= 0) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}的平台端物模型信息不存在。"); + } + + foreach (var item in input.Commands) + { + var tempPlatformThingModelInfo = platformThingModelInfos.Where(d => d.IoTPlatformRawFieldName == item.Key).FirstOrDefault(); + if (tempPlatformThingModelInfo == null) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息不存在属性标识符{item.Key}。"); + } + + //排除升级指令 + if (tempPlatformThingModelInfo.StandardFieldName.ToLowerInvariant() == ThingModelFixedTypeConst.FIRMWARE_UPGRADE.ToLowerInvariant()) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型属性标识符{item.Key}是升级指令，此处不允许下发。"); + } + } + + //检查设备是否有配置设备端物模型信息 + //如果有配置，就检查指令字典中是否有SpecialCommand标识符 + //如果有就需要构建 SpecialCommand 的特别指令 + if (deviceInfo.IsNeedConfigDeviceModel && deviceInfo.DeviceThingModelDataId.HasValue && input.Commands.ContainsKey(ThingModelFixedTypeConst.SpecialCommand)) + { + var propertyInfo = await oneNETProductService.GetProductThingModelSpecialCommandDataTypeListAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); + + if (propertyInfo == null) + { + throw new UserFriendlyException($"{nameof(DeviceCommandInfoToOneNET)} OneNET设备属性设置失败，产品Id{deviceInfo.IoTPlatformProductId}未找到对应的属性信息。"); + } + + Dictionary tempSpecialCommand = await deviceThingModelService.BuildThingModelSpecialCommandAsync(propertyInfo, deviceInfo.DeviceThingModelDataId.Value); + + input.Commands[ThingModelFixedTypeConst.SpecialCommand] = tempSpecialCommand; + } + else if (input.Commands.ContainsKey(ThingModelFixedTypeConst.SpecialCommand)) + { + //设备端物模型解除绑定情况下，SpecialCommand 还原默认值，设备也会恢复默认采集方式 + //给SpecialCommand第一个参数设置默认值 + + var propertyInfo = await oneNETProductService.GetProductThingModelSpecialCommandDataTypeListAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); + + if (propertyInfo == null) + { + throw new UserFriendlyException($"{nameof(DeviceCommandInfoToOneNET)} OneNET设备属性设置失败，产品Id{deviceInfo.IoTPlatformProductId}未找到对应的属性信息。"); + } + string paName = propertyInfo.FirstOrDefault()?.Identifier; + + input.Commands[ThingModelFixedTypeConst.SpecialCommand] = new Dictionary() { + { paName, CommonConst.SpecialCommandDefaultValue } + }; + logger.LogWarning($"{nameof(DeviceCommandInfoToOneNET)} OneNET平台设备{deviceInfo.DeviceAddress}特殊抄读指令还原为{CommonConst.SpecialCommandDefaultValue}"); + } + + var commandRequest = new OpenApiRequest() + { + Message = input.Serialize(), + }; + var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt(), input.Commands.Serialize()); + + await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo)); + + await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo); + return true; + } + catch (Exception ex) + { + logger.LogError($"{nameof(DeviceCommandInfoToOneNET)} 发送OneNET设备指令信息发生异常，设备地址：{deviceInfo.DeviceAddress}，异常信息：{ex.Message}"); + throw; + } + } + + /// + /// 发送OneNET平台设备升级指令 + /// + /// + /// 设置属性请求内容相关 + /// 固件数据Id + /// 固件文件信息 + /// 入参 + /// 产品信息（如果已获取则传入以避免重复调用） + /// 平台端物模型信息（如果已获取则传入以避免重复调用） + /// + /// + protected async Task DeviceUpgradeCommandToOneNET(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto taskInput, DeviceFirmwareInfoDto deviceFirmwareInfo, FileObjectDto fileObject, DeviceUpgradeForApiInput input, dynamic productInfo = null, dynamic platformThingModelInfo = null) + { + try + { + if (deviceInfo == null || deviceFirmwareInfo == null || fileObject == null) + { + throw new UserFriendlyException($"{nameof(DeviceUpgradeCommandToOneNET)}设备或固件信息不能为空"); + } + + if ((deviceInfo.IoTPlatformProductId != deviceFirmwareInfo.IoTPlatformProductId) || (deviceInfo.IoTPlatform != deviceFirmwareInfo.IoTPlatform)) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台产品信息固件中不一致"); + } + + //如果未传入产品信息和物模型信息，则获取 + if (productInfo == null || platformThingModelInfo == null) + { + var (productInfoResult, platformThingModelInfoResult) = await GetOneNETProductAndThingModelInfoAsync(deviceInfo.IoTPlatformProductId, deviceInfo.DeviceAddress); + productInfo = productInfoResult; + platformThingModelInfo = platformThingModelInfoResult; + } + + var upgradeProperty = ((List)platformThingModelInfo).Where(d => d.StandardFieldName == ThingModelFixedTypeConst.FIRMWARE_UPGRADE).FirstOrDefault(); + if (upgradeProperty == null) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息不存在升级属性标识符{ThingModelFixedTypeConst.FIRMWARE_UPGRADE}。"); + } + + //构建升级指令，《文件MD5值+OneNET产品KEY+升级标识符+文件大小》=>MD5计算获得签名值 + + var upgradeRecordInput = new CreateDeviceUpgradeRecordInput() + { + DeviceDataId = deviceInfo.Id, + DeviceName = deviceInfo.DeviceName, + DeviceAddress = deviceInfo.DeviceAddress, + OldFirmwareVersion = deviceInfo.FirmwareVersion, + NowFirmwareVersion = deviceFirmwareInfo.FirmwareVersion, + UpgradeSource = DeviceUpgradeSourceTypeEnum.AdminSystem, + UpgradeIdentifier = Yitter.IdGenerator.YitIdHelper.NextId(), + UpgradeDescription = input.UpgradeDescription, + UpgradeStatus = DeviceUpgradeStatusTypeEnum.NotUpgrade, + Id = GuidGenerator.Create() + }; + + var md5HashRaw = $"{fileObject.Md5Hash}{productInfo.ProductAccesskey}{upgradeRecordInput.UpgradeIdentifier}{fileObject.FileSize}"; + + var upgradeRequest = new DeviceUpgradeCommandRequest() + { + Length = fileObject.FileSize, + UpgradeIdentifier = upgradeRecordInput.UpgradeIdentifier, + SignatureValue = md5HashRaw.Md5Fun(), + FirmwareUrl = $"{serverApplicationOptions.DownloadDeviceFirmwareBasicUrl}{upgradeRecordInput.Id}", + TimeOut = serverApplicationOptions.DownloadDeviceFirmwareTimeOut, + }; + + upgradeRecordInput.UpgradeMessage = upgradeRequest.Serialize(); + upgradeRecordInput.FirmwareSignature = upgradeRequest.SignatureValue; + + string upgradeMessageHexString = upgradeRecordInput.UpgradeMessage.ToHexString(); + + //检查长度是否超过了OneNET平台升级属性标识符的长度限制 + var thingModelInfoStr = ((OneNETProductInfoDto)productInfo).ThingModelInfos; + if (string.IsNullOrWhiteSpace(thingModelInfoStr)) + { + logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，属性信息为空"); + return false; + } + var thingModelInfo = thingModelInfoStr.Deserialize(); + if (thingModelInfo.Properties == null) + { + logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，属性信息为空"); + return false; + } + + var property = thingModelInfo.Properties.Where(d => d.Identifier == upgradeProperty.IoTPlatformRawFieldName).FirstOrDefault(); //精准匹配 + + if (property == null) + { + logger.LogError($"{nameof(DeviceUpgradeCommandToOneNET)} 通过OneNET产品ID和属性标识符获取属性配置信息失败，没有找到属性标识升级对应的属性平台信息"); + return false; + } + + var length = ((OneNETModelStringSpecs)property.DataType.Specs).Length; + if (upgradeMessageHexString.Length > length) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}平台端物模型信息属性标识符{upgradeProperty.IoTPlatformRawFieldName}长度超过OneNET平台限制，请检查物模型属性标识符长度是否超过了{length}"); + } + + var insertResult = await deviceUpgradeRecordService.CreateAsync(upgradeRecordInput); + + if (insertResult == null) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceAddress}升级记录失败"); + } + + //发送OneNET平台设备升级指令，HEX格式字符串 + taskInput.Commands = new Dictionary() + { + { upgradeProperty.IoTPlatformRawFieldName, upgradeMessageHexString } + }; + + var commandRequest = new OpenApiRequest() + { + Message = taskInput.Serialize(), + }; + var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt(), taskInput.Commands.Serialize()); + + await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETUpgradeCommandIssuedEventName, packetTaskInfo)); + + //将升级记录数据Id作为key，文件数据ID作为值，存入Redis缓存中。 + string cacheKey = string.Format($"{RedisConst.CacheDeviceUpgradeRecordDataKey}", upgradeRecordInput.Id); + + await FreeRedisProvider.Instance.SetAsync(cacheKey, fileObject.Id); + + await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo); + + //更新状态为升级中 + await deviceUpgradeRecordService.UpdateStatusAsync(new UpdateStatusInput() + { + Id = upgradeRecordInput.Id.Value, + UpgradeStatus = DeviceUpgradeStatusTypeEnum.Upgrading, + }); + return true; + } + catch (Exception) + { + + throw; + } + } + + /// + /// 抄读OneNET平台设备属性数据 + /// + /// + /// + /// + /// + protected async Task> DevicePropertyValueToOneNET(DeviceManagementInfoDto deviceInfo, DevicePropertyValueForApiInput input) + { + try + { + //检查下设备是否在线 + var deviceOnlineStatus = await oneNETDeviceService.DeviceInfoDetailAsync(new DeviceInfoDetailInput() + { + DeviceName = deviceInfo.IoTPlatformDeviceOpenInfo, + OneNETAccountId = deviceInfo.IoTPlatformAccountId, + ProductId = deviceInfo.IoTPlatformProductId, + }); + + if (deviceOnlineStatus == null || deviceOnlineStatus.Code != ResponeResultEnum.Success) + { + throw new UserFriendlyException("获取平台设备信息失败"); + } + + if (deviceOnlineStatus.Data.Status != 1) + { + throw new UserFriendlyException("设备不在线"); + } + + var deviceDataResult = await oneNETDeviceService.QueryDevicePropertyDetail(new QueryDevicePropertyDetailInput() + { + DeviceName = deviceInfo.IoTPlatformDeviceOpenInfo, + OneNETAccountId = deviceInfo.IoTPlatformAccountId, + ProductId = deviceInfo.IoTPlatformProductId, + PropertyInfos = input.PropertyList + }); + if (deviceDataResult == null || deviceDataResult.Success == false || deviceDataResult.Data == null) + { + throw new UserFriendlyException($"设备{deviceInfo.DeviceName}获取数据失败"); + } + + //获取设备产品平台端物模型信息 + var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = deviceInfo.IoTPlatformProductId }); + if (platformThingModelInfo == null || platformThingModelInfo.Count <= 0) + { + return deviceDataResult.Data; + } + + List updateKeys = new List() + { + ThingModelFixedTypeConst.FIRMWARE_VERSION.ToLowerInvariant(), + ThingModelFixedTypeConst.ReadingMode.ToLowerInvariant() + }; + + var platformUpdatePropertyInfos = platformThingModelInfo.Where(d => updateKeys.Contains(d.StandardFieldName.ToLowerInvariant())).ToList(); + if (platformUpdatePropertyInfos == null || platformUpdatePropertyInfos.Count <= 0) + { + return deviceDataResult.Data; + } + + //根据抄读结果（单个或多个属性）更新设备信息，统一收集后只调用一次 UpdateDeviceInfos + bool needUpdate = false; + + //抄读结果如果有固件版本号，则更新固件版本号到设备信息中 + var firmwareVersionKey = platformUpdatePropertyInfos.FirstOrDefault(d => d.StandardFieldName?.ToLowerInvariant() == ThingModelFixedTypeConst.FIRMWARE_VERSION.ToLowerInvariant())?.IoTPlatformRawFieldName; + if (!string.IsNullOrWhiteSpace(firmwareVersionKey) && deviceDataResult.Data.ContainsKey(firmwareVersionKey)) + { + deviceInfo.FirmwareVersion = deviceDataResult.Data[firmwareVersionKey].ToString(); + needUpdate = true; + } + + //抄读结果如果有抄读模式，则更新抄读模式到设备信息中 + var readModeKey = platformUpdatePropertyInfos.FirstOrDefault(d => d.StandardFieldName?.ToLowerInvariant() == ThingModelFixedTypeConst.ReadingMode.ToLowerInvariant())?.IoTPlatformRawFieldName; + if (!string.IsNullOrWhiteSpace(readModeKey) && deviceDataResult.Data.ContainsKey(readModeKey)) + { + var readModeValue = deviceDataResult.Data[readModeKey]; + + // 兼容 JsonElement / 字符串 / 数值 三种情况 + int readModeInt; + if (readModeValue is System.Text.Json.JsonElement jsonElement) + { + if (jsonElement.ValueKind == System.Text.Json.JsonValueKind.Number && jsonElement.TryGetInt32(out var num)) + { + readModeInt = num; + } + else + { + readModeInt = Convert.ToInt32(jsonElement.ToString()); + } + } + else + { + readModeInt = Convert.ToInt32(readModeValue); + } + + deviceInfo.ReadingMode = (DeviceReadingModeEnum)readModeInt; + needUpdate = true; + } + + if (needUpdate) + { + await deviceAppService.UpdateDeviceInfos(deviceInfo); + } + + return deviceDataResult.Data; + } + catch (Exception ex) + { + + if (input.PropertyList.Contains(ThingModelFixedTypeConst.SpecialCommand)) + { + ex = new UserFriendlyException("请检查设备是否已经采集数据"); + throw ex; + } + else + { + throw; + } + } + } + #endregion + + #region CTWing 设备操作 + /// + /// CTWing 批量设备创建 + /// + /// + /// + protected async Task CTWingDeviceBatchCreateAsync(BatchCreateDeviceAggregationInput input) + { + try + { + throw new UserFriendlyException($"CTWing 批量设备创建失败，CTWing暂未实现。"); + } + catch (Exception) + { + + throw; + } + } + #endregion + + /// + /// 更新设备信息并处理缓存 + /// + /// + /// 推送结果原始信息 + /// 设备接入鉴权key + /// + /// + private async Task DeviceUpdateHandler(DeviceManagementInfoDto input, HttpDataResult pushResult, string platformPassword = null) + { + UpdateDeviceInput updateDeviceInput = input.Adapt(); + updateDeviceInput.IoTPlatformResponse = pushResult.Serialize(); + updateDeviceInput.IsPlatformPushSuccess = true; + if (!string.IsNullOrWhiteSpace(updateDeviceInput.PlatformPassword)) + { + updateDeviceInput.PlatformPassword = platformPassword; + } + + var updateResult = await deviceAppService.UpdateAsync(updateDeviceInput); + if (updateResult == null) + { + logger.LogError($"{nameof(DeviceUpdateHandler)} 更新设备信息失败：{input.Serialize()}"); + throw new UserFriendlyException($"推送结果更新失败。"); + } + + //设备数据缓存到Redis + DeviceCacheInfos deviceCacheInfos = input.Adapt(); + deviceCacheInfos.PlatformPassword = null; + + FreeRedisProvider.Instance.HSet(RedisConst.CacheAllDeviceInfoHashKey, input.DeviceAddress, deviceCacheInfos); + + + + return input.Adapt(); + } + + /// + /// 获取OneNET产品信息和平台端物模型信息 + /// + /// 物联网平台产品Id + /// 设备地址（用于错误信息） + /// 返回产品信息和平台端物模型信息的元组 + protected async Task<(dynamic ProductInfo, dynamic PlatformThingModelInfo)> GetOneNETProductAndThingModelInfoAsync(string iotPlatformProductId, string deviceAddress) + { + //获取设备对应的产品信息 + var productInfo = await oneNETProductService.GetProductInfoAsync(new IdInput() { Id = iotPlatformProductId }); + + if (productInfo == null) + { + throw new UserFriendlyException($"{nameof(DeviceUpgradeCommandToOneNET)} OneNET设备升级属性设置失败，产品Id{iotPlatformProductId}未找到对应的产品信息。"); + } + + //获取设备对应的平台端物模型信息，校验前端传入的属性标识集合是否存在不合法的属性标识符 + var platformThingModelInfo = await platformThingModelInfoAppService.FindByPlatformProductIdAsync(new IdInput() { Id = iotPlatformProductId }); + + if (platformThingModelInfo == null) + { + throw new UserFriendlyException($"设备{deviceAddress}的平台端物模型信息不存在。"); + } + + return (productInfo, platformThingModelInfo); + } + + /// + /// 根据平台处理设备升级指令 + /// + /// 设备信息 + /// 接收指令信息Dto + /// 固件版本信息 + /// 文件信息 + /// 升级输入参数 + /// OneNET产品信息（可选，如果已获取则传入以避免重复调用） + /// OneNET平台端物模型信息（可选，如果已获取则传入以避免重复调用） + /// 处理结果 + protected async Task ProcessDeviceUpgradeByPlatformAsync(DeviceManagementInfoDto deviceInfo, ReceiveCommandInfoDto receiveCommandInfoDto, DeviceFirmwareInfoDto deviceFirmwareVersionInfo, FileObjectDto fileInfo, DeviceUpgradeForApiInput input, dynamic oneNETProductInfo = null, dynamic oneNETPlatformThingModelInfo = null) + { + if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) + { + //如果未传入产品信息和物模型信息，则获取 + if (oneNETProductInfo == null || oneNETPlatformThingModelInfo == null) + { + var (productInfo, platformThingModelInfo) = await GetOneNETProductAndThingModelInfoAsync(deviceInfo.IoTPlatformProductId, deviceInfo.DeviceAddress); + oneNETProductInfo = productInfo; + oneNETPlatformThingModelInfo = platformThingModelInfo; + } + + return await DeviceUpgradeCommandToOneNET(deviceInfo, receiveCommandInfoDto, deviceFirmwareVersionInfo, fileInfo, input, oneNETProductInfo, oneNETPlatformThingModelInfo); + } + else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing) + { + //await redisPubSubService.PublishReliableAsync(DistributedMessageCenterConst.CTWingAepCommandIssuedEventName,commandRequest); + //return true; + throw new UserFriendlyException($"发送设备升级指令信息失败，CTWing暂未实现。"); + } + else + { + throw new UserFriendlyException($"发送设备升级指令信息失败，未找到对应的产品配置信息。"); + } + } + } +} diff --git a/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs b/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs index 3d52158..1ec8f6f 100644 --- a/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs +++ b/src/JiShe.IoT.HttpApi/Controllers/BusinessSystemAggregationController.cs @@ -22,7 +22,7 @@ namespace JiShe.IoT.Controllers [SwaggerOperation(summary: "接收业务系统指令信息", Tags = new[] { "AggregationBusiness" })] public async Task ReceiveCommandInfoAsync(OpenApiRequest input) { - return await _businessSystemAggregationService.ReceiveCommandInfoAsync(input); + return await _businessSystemAggregationService.ReceiveSetCommandInfoAsync(input); } ///