huangxianguo
/
MasstransferExporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完善查询图片的功能

This commit is contained in:
huangxianguo 2024-09-10 15:06:10 +08:00
parent d199ff7f7f
commit 7bcc84ee8b
4 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MasstransferExporter/ImageExporter/ImageService.cs
View File

@ -24,7 +24,7 @@ public class ImageService : Instant
/// </summary> /// </summary>
private static async Task ListenImageQueryEvent(EventType type, bool start) private static async Task ListenImageQueryEvent(EventType type, bool start)
{ {
await MessageQueueHelper.Subscribe(Topics.UpdateLicenseEvent, HandleImageQueryEvent); await MessageQueueHelper.Subscribe(Topics.QueryImage, HandleImageQueryEvent);
} }
/// <summary> /// <summary>
@ -34,10 +34,10 @@ public class ImageService : Instant
{ {
if (queryDto == null) return; if (queryDto == null) return;
var batchNumber = queryDto.batchNumber; var batchNumber = queryDto.BatchNumber;
var bizNumber = queryDto.bizNumber; var bizNumber = queryDto.BizNumber;
var imageType = queryDto.imageType; var imageType = queryDto.ImageType;
var picType = queryDto.picType; var picType = queryDto.PicType;
var isThumbnail = "thumbnail".Equals(imageType); var isThumbnail = "thumbnail".Equals(imageType);

12
MasstransferExporter/ImageExporter/Model/ImageQueryDTO.cs
View File

@ -1,12 +1,14 @@
namespace MasstransferExporter.ImageExporter.Model; using Newtonsoft.Json;
namespace MasstransferExporter.ImageExporter.Model;
public class ImageQueryDTO public class ImageQueryDTO
{ {
public string picType { get; set; } [JsonProperty("picType")] public string PicType { get; set; }
public string bizNumber { get; set; } [JsonProperty("bizNumber")] public string BizNumber { get; set; }
public string batchNumber { get; set; } [JsonProperty("batchNumber")] public string BatchNumber { get; set; }
public string imageType { get; set; } [JsonProperty("imageType")] public string ImageType { get; set; }
} }

4
MasstransferExporter/Program.cs
View File

@ -38,8 +38,8 @@ class Program
// 启动完成后，广播启动通知 // 启动完成后，广播启动通知
EventBus<bool>.Publish(EventType.StartUp, true); EventBus<bool>.Publish(EventType.StartUp, true);
DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(), // DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(),
TimeSpan.FromSeconds(3)); // TimeSpan.FromSeconds(3));
// 启动与主程序的通信 // 启动与主程序的通信

29
MasstransferInfrastructure/Mqtt/Client/MqttClient.cs
View File

@ -3,7 +3,6 @@ using MasstransferCommon.Model.Constant;
using MasstransferCommon.Utils; using MasstransferCommon.Utils;
using MasstransferCommunicate.Mqtt.Model; using MasstransferCommunicate.Mqtt.Model;
using MasstransferInfrastructure.Mqtt.Model; using MasstransferInfrastructure.Mqtt.Model;
using MasstransferSecurity.Utils;
using MQTTnet; using MQTTnet;
using MQTTnet.Client; using MQTTnet.Client;
using MQTTnet.Protocol; using MQTTnet.Protocol;
@ -27,29 +26,15 @@ internal class MqttClient
/// <returns></returns> /// <returns></returns>
private MqttClientOptions GetConnectionOptions(MqttConnectOptions options) private MqttClientOptions GetConnectionOptions(MqttConnectOptions options)
{ {
var clientId = DeviceInfoUtil.GenerateUniqueID();
return new MqttClientOptionsBuilder() return new MqttClientOptionsBuilder()
.WithTcpServer(options.ServerAddress, options.Port) .WithTcpServer(options.ServerAddress, options.Port)
// .WithCredentials(options.UserName, options.Password)
.WithClientId(Constants.SN) .WithClientId(Constants.SN)
.WithKeepAlivePeriod(TimeSpan.FromSeconds(60))
.WithCleanStart(true)
.WithCleanSession() .WithCleanSession()
.WithTlsOptions(
o =>
{
o.UseTls(options.EnableTls);
o.WithSslProtocols(options.Protocols);
}
)
.Build(); .Build();
} }
private X509Certificate2 GetCertificate(string certBase64)
{
var certBytes = Convert.FromBase64String(certBase64);
return new X509Certificate2(certBytes);
}
/// <summary> /// <summary>
/// 连接MQTT /// 连接MQTT
/// </summary> /// </summary>
@ -66,7 +51,15 @@ internal class MqttClient
client.ApplicationMessageReceivedAsync += (e) => client.ApplicationMessageReceivedAsync += (e) =>
{ {
MessageReceived?.Invoke(client, e); try
{
MessageReceived?.Invoke(client, e);
}
catch (Exception exception)
{
Console.WriteLine(exception);
}
return Task.CompletedTask; return Task.CompletedTask;
}; };