diff --git a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 09c5126..5c766da 100644
--- a/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -641,7 +641,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
var evenMessageInfo = new ScheduledMeterReadingIssuedEventMessage
{
- MessageHexString = Convert.ToHexString(dataInfos),
+ IssuedMessageHexString = Convert.ToHexString(dataInfos),
DeviceNo = ammeter.FocusAddress,
MessageId = NewId.NextGuid().ToString(),
TimeDensity = timeDensity,
diff --git a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
index 50ed9e0..7a98a09 100644
--- a/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
+++ b/src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
@@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
@@ -97,7 +97,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
@@ -124,7 +124,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
@@ -153,7 +153,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
@@ -180,7 +180,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
@@ -207,7 +207,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null)
{
- await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString));
+ await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
}
}
}
diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs b/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs
index ce3cc87..9bf229e 100644
--- a/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs
+++ b/src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs
@@ -7,12 +7,12 @@ namespace JiShe.CollectBus.IotSystems.MessageIssueds
///
/// 定时抄读Kafka消息实体,1分钟、5分钟、15分钟
///
- public class ScheduledMeterReadingIssuedEventMessage : AggregateRoot
+ public class ScheduledMeterReadingIssuedEventMessage
{
///
- /// 消息内容
+ /// 下发消息内容
///
- public string MessageHexString { get; set; }
+ public string IssuedMessageHexString { get; set; }
///
/// 集中器编号
@@ -38,5 +38,16 @@ namespace JiShe.CollectBus.IotSystems.MessageIssueds
/// 创建时间
///
public DateTime CreationTime { get; set; }
+
+ ///
+ /// 消息上报内容
+ ///
+ public string? ReceivedMessageHexString { get; set; }
+
+ ///
+ /// 消息上报时间
+ ///
+ public DateTime? ReceivedTime { get; set; }
+
}
}
diff --git a/src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords.cs b/src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords.cs
new file mode 100644
index 0000000..4e8c48c
--- /dev/null
+++ b/src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+
+namespace JiShe.CollectBus.IotSystems
+{
+ ///
+ /// 抄读记录表,包含下发报文和回复报文,以及是否迁移
+ ///
+ public class MeterReadingRecords : AggregateRoot
+ {
+ }
+}