admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复遥测日志报错问题

Browse Source
This commit is contained in:
ChenYi 2025-10-29 15:19:18 +08:00
parent ec3003acea
commit 090be8f6f0
6 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
DockerComposeShells/mysql/init/init-db.sql
View File

File diff suppressed because one or more lines are too long

6
src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
View File

@ -311,11 +311,11 @@ namespace JiShe.IoT.DeviceAggregation
var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt<DeviceCacheInfos>(), commandRequest.Message); var packetTaskInfo = GetDeviceTelemetryPacketTaskInfo(ioTDBOptions, commandRequest, deviceInfo.Adapt<DeviceCacheInfos>(), commandRequest.Message);
//数据写入遥测任务数据存储通道 //数据写入遥测任务数据存储通道
await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo));
if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET) if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.OneNET)
{ {
return await DeviceCommandInfoToOneNET(deviceInfo, packetTaskInfo); await ioTDBDataChannelManageService.DeviceTelemetryTaskWriterAsync(DataChannelManage.DeviceTelemetryTaskDataChannel.Writer, (DistributedMessageCenterConst.OneNETCommandIssuedEventName, packetTaskInfo));
return await DeviceCommandInfoToOneNET(deviceInfo, packetTaskInfo);
} }
else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing) else if (deviceInfo.IoTPlatform == IoTPlatformTypeEnum.CTWing)
{ {

3
src/JiShe.IoT.Application/IoTAppService.cs
View File

@ -62,7 +62,8 @@ namespace JiShe.IoT
IoTPlatformProductName = deviceInfo.IoTPlatformProductName, IoTPlatformProductName = deviceInfo.IoTPlatformProductName,
IssuePayload = messageBody, IssuePayload = messageBody,
RetryCount = 0, RetryCount = 0,
IssueStatus = (int)DeviceCommandIssueStatusEnum.Unprocessed IssueStatus = (int)DeviceCommandIssueStatusEnum.Unprocessed,
LastIssueTime = DateTime.Now
}; };
return oneNETIssueMessageEntity; return oneNETIssueMessageEntity;

6
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251028091552_InitialCreate.Designer.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251029012420_InitialCreate.Designer.cs generated
View File

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace JiShe.IoT.Migrations namespace JiShe.IoT.Migrations
{ {
[DbContext(typeof(IoTDbContext))] [DbContext(typeof(IoTDbContext))]
[Migration("20251028091552_InitialCreate")] [Migration("20251029012420_InitialCreate")]
partial class InitialCreate partial class InitialCreate
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -751,8 +751,8 @@ namespace JiShe.IoT.Migrations
b.Property<string>("FiledType") b.Property<string>("FiledType")
.IsRequired() .IsRequired()
.HasMaxLength(20) .HasMaxLength(50)
.HasColumnType("varchar(20)") .HasColumnType("varchar(50)")
.HasComment("物联网平台中对应产品物模型属性或者事件类型"); .HasComment("物联网平台中对应产品物模型属性或者事件类型");
b.Property<int>("IoTPlatform") b.Property<int>("IoTPlatform")

2
src/JiShe.IoT.EntityFrameworkCore/Migrations/20251028091552_InitialCreate.cs → src/JiShe.IoT.EntityFrameworkCore/Migrations/20251029012420_InitialCreate.cs
View File

@ -920,7 +920,7 @@ namespace JiShe.IoT.Migrations
IoTPlatform = table.Column<int>(type: "int", nullable: false, comment: "物联网平台类型,默认没有指定"), IoTPlatform = table.Column<int>(type: "int", nullable: false, comment: "物联网平台类型,默认没有指定"),
IoTPlatformProductId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品Id") IoTPlatformProductId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应的产品Id")
.Annotation("MySql:CharSet", "utf8mb4"), .Annotation("MySql:CharSet", "utf8mb4"),
FiledType = table.Column<string>(type: "varchar(20)", maxLength: 20, nullable: false, comment: "物联网平台中对应产品物模型属性或者事件类型") FiledType = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物联网平台中对应产品物模型属性或者事件类型")
.Annotation("MySql:CharSet", "utf8mb4"), .Annotation("MySql:CharSet", "utf8mb4"),
IoTPlatformRawFieldName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "物联网平台中对应的产品物模型属性或者事件名称") IoTPlatformRawFieldName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "物联网平台中对应的产品物模型属性或者事件名称")
.Annotation("MySql:CharSet", "utf8mb4"), .Annotation("MySql:CharSet", "utf8mb4"),

4
src/JiShe.IoT.EntityFrameworkCore/Migrations/IoTDbContextModelSnapshot.cs
View File

@ -748,8 +748,8 @@ namespace JiShe.IoT.Migrations
b.Property<string>("FiledType") b.Property<string>("FiledType")
.IsRequired() .IsRequired()
.HasMaxLength(20) .HasMaxLength(50)
.HasColumnType("varchar(20)") .HasColumnType("varchar(50)")
.HasComment("物联网平台中对应产品物模型属性或者事件类型"); .HasComment("物联网平台中对应产品物模型属性或者事件类型");
b.Property<int>("IoTPlatform") b.Property<int>("IoTPlatform")