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

dev #2

Merged
admin merged 176 commits from dev into master 2025-04-18 01:31:49 +00:00
Conversation 0 Commits 176 Files Changed 427 +37 -10
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f56b6e91f - Show all commits

2
src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -641,7 +641,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
var evenMessageInfo = new ScheduledMeterReadingIssuedEventMessage var evenMessageInfo = new ScheduledMeterReadingIssuedEventMessage
{ {
MessageHexString = Convert.ToHexString(dataInfos), IssuedMessageHexString = Convert.ToHexString(dataInfos),
DeviceNo = ammeter.FocusAddress, DeviceNo = ammeter.FocusAddress,
MessageId = NewId.NextGuid().ToString(), MessageId = NewId.NextGuid().ToString(),
TimeDensity = timeDensity, TimeDensity = timeDensity,

12
src/JiShe.CollectBus.Application/Subscribers/WorkerSubscriberAppService.cs
View File

@ -70,7 +70,7 @@ namespace JiShe.CollectBus.Subscribers
var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) 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); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) 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); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) 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); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) 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); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) 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); var device = await _deviceRepository.FindAsync(a => a.Number == receivedMessage.DeviceNo);
if (device != null) if (device != null)
{ {
await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.MessageHexString)); await _tcpService.SendAsync(device.ClientId, Convert.FromHexString(receivedMessage.IssuedMessageHexString));
} }
} }
} }

17
src/JiShe.CollectBus.Domain/IotSystems/MessageIssueds/ScheduledMeterReadingIssuedEventMessage.cs
View File

@ -7,12 +7,12 @@ namespace JiShe.CollectBus.IotSystems.MessageIssueds
/// <summary> /// <summary>
/// 定时抄读Kafka消息实体，1分钟、5分钟、15分钟 /// 定时抄读Kafka消息实体，1分钟、5分钟、15分钟
/// </summary> /// </summary>
public class ScheduledMeterReadingIssuedEventMessage : AggregateRoot<Guid> public class ScheduledMeterReadingIssuedEventMessage
{ {
/// <summary> /// <summary>
/// 消息内容 /// 下发消息内容
/// </summary> /// </summary>
public string MessageHexString { get; set; } public string IssuedMessageHexString { get; set; }
/// <summary> /// <summary>
/// 集中器编号 /// 集中器编号
@ -38,5 +38,16 @@ namespace JiShe.CollectBus.IotSystems.MessageIssueds
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public DateTime CreationTime { get; set; } public DateTime CreationTime { get; set; }
/// <summary>
/// 消息上报内容
/// </summary>
public string? ReceivedMessageHexString { get; set; }
/// <summary>
/// 消息上报时间
/// </summary>
public DateTime? ReceivedTime { get; set; }
} }
} }

16
src/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords.cs Normal file
View File

@ -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
{
/// <summary>
/// 抄读记录表，包含下发报文和回复报文，以及是否迁移
/// </summary>
public class MeterReadingRecords : AggregateRoot<Guid>
{
}
}