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

测试下发更改发为字节

Browse Source
This commit is contained in:
zenghongyao 2025-05-08 11:58:26 +08:00
parent 245c91c9e3
commit 91386007ae
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
View File

@ -257,7 +257,7 @@ namespace JiShe.CollectBus.Protocol.T37612012
else else
decimal.TryParse(data[i], out value); decimal.TryParse(data[i], out value);
meter.DataValue = value; meter.DataValue = value;
meter.DataType = dataType; meter.DataType = dataType.ToUpper();
meter.FiledDesc = filedDesc; meter.FiledDesc = filedDesc;
meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty; meter.FiledName = meter.DataType.GetDataFieldByGatherDataType() ?? string.Empty;
if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate)) if (DateTime.TryParse(CalculateTimeSpan(i - 3, data[0], density), out DateTime readingDate))

3
services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
View File

@ -25,6 +25,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Threading.Tasks; using System.Threading.Tasks;
using TouchSocket.Core;
using TouchSocket.Sockets; using TouchSocket.Sockets;
namespace JiShe.CollectBus.Samples; namespace JiShe.CollectBus.Samples;
@ -434,7 +435,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
if (_tcpService.ClientExists(dto.Address)) if (_tcpService.ClientExists(dto.Address))
{ {
// 发送给设备 // 发送给设备
await _tcpService.SendAsync(dto.Address, dto.Frame); await _tcpService.SendAsync(dto.Address, Convert.FromHexString(dto.Frame));
_logger.LogWarning($"{dto.Address}下发消息报文：{dto.Frame}"); _logger.LogWarning($"{dto.Address}下发消息报文：{dto.Frame}");
} }
else else

1
web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
View File

@ -16,6 +16,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" /> <link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<title>后端服务</title> <title>后端服务</title>
</head> </head>
<body> <body>