完善查询图片的功能
This commit is contained in:
parent
d199ff7f7f
commit
7bcc84ee8b
|
@ -24,7 +24,7 @@ public class ImageService : Instant
|
|||
/// </summary>
|
||||
private static async Task ListenImageQueryEvent(EventType type, bool start)
|
||||
{
|
||||
await MessageQueueHelper.Subscribe(Topics.UpdateLicenseEvent, HandleImageQueryEvent);
|
||||
await MessageQueueHelper.Subscribe(Topics.QueryImage, HandleImageQueryEvent);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -34,10 +34,10 @@ public class ImageService : Instant
|
|||
{
|
||||
if (queryDto == null) return;
|
||||
|
||||
var batchNumber = queryDto.batchNumber;
|
||||
var bizNumber = queryDto.bizNumber;
|
||||
var imageType = queryDto.imageType;
|
||||
var picType = queryDto.picType;
|
||||
var batchNumber = queryDto.BatchNumber;
|
||||
var bizNumber = queryDto.BizNumber;
|
||||
var imageType = queryDto.ImageType;
|
||||
var picType = queryDto.PicType;
|
||||
|
||||
var isThumbnail = "thumbnail".Equals(imageType);
|
||||
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
namespace MasstransferExporter.ImageExporter.Model;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace MasstransferExporter.ImageExporter.Model;
|
||||
|
||||
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; }
|
||||
}
|
|
@ -38,8 +38,8 @@ class Program
|
|||
// 启动完成后,广播启动通知
|
||||
EventBus<bool>.Publish(EventType.StartUp, true);
|
||||
|
||||
DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(),
|
||||
TimeSpan.FromSeconds(3));
|
||||
// DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(),
|
||||
// TimeSpan.FromSeconds(3));
|
||||
|
||||
|
||||
// 启动与主程序的通信
|
||||
|
|
|
@ -3,7 +3,6 @@ using MasstransferCommon.Model.Constant;
|
|||
using MasstransferCommon.Utils;
|
||||
using MasstransferCommunicate.Mqtt.Model;
|
||||
using MasstransferInfrastructure.Mqtt.Model;
|
||||
using MasstransferSecurity.Utils;
|
||||
using MQTTnet;
|
||||
using MQTTnet.Client;
|
||||
using MQTTnet.Protocol;
|
||||
|
@ -27,29 +26,15 @@ internal class MqttClient
|
|||
/// <returns></returns>
|
||||
private MqttClientOptions GetConnectionOptions(MqttConnectOptions options)
|
||||
{
|
||||
var clientId = DeviceInfoUtil.GenerateUniqueID();
|
||||
|
||||
return new MqttClientOptionsBuilder()
|
||||
.WithTcpServer(options.ServerAddress, options.Port)
|
||||
// .WithCredentials(options.UserName, options.Password)
|
||||
.WithClientId(Constants.SN)
|
||||
.WithKeepAlivePeriod(TimeSpan.FromSeconds(60))
|
||||
.WithCleanStart(true)
|
||||
.WithCleanSession()
|
||||
.WithTlsOptions(
|
||||
o =>
|
||||
{
|
||||
o.UseTls(options.EnableTls);
|
||||
o.WithSslProtocols(options.Protocols);
|
||||
}
|
||||
)
|
||||
.Build();
|
||||
}
|
||||
|
||||
private X509Certificate2 GetCertificate(string certBase64)
|
||||
{
|
||||
var certBytes = Convert.FromBase64String(certBase64);
|
||||
return new X509Certificate2(certBytes);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 连接MQTT
|
||||
/// </summary>
|
||||
|
@ -65,8 +50,16 @@ internal class MqttClient
|
|||
}
|
||||
|
||||
client.ApplicationMessageReceivedAsync += (e) =>
|
||||
{
|
||||
try
|
||||
{
|
||||
MessageReceived?.Invoke(client, e);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Console.WriteLine(exception);
|
||||
}
|
||||
|
||||
return Task.CompletedTask;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue