|
@@ -626,15 +626,8 @@ namespace YSAI.RelayManage
|
|
|
{
|
|
{
|
|
|
foreach (var ISn in queueData.ISns)
|
|
foreach (var ISn in queueData.ISns)
|
|
|
{
|
|
{
|
|
|
- if (InstanceIoc.ContainsKey(ISn))
|
|
|
|
|
- {
|
|
|
|
|
- OperateResult operateResult = InstanceIoc[ISn].Produce(queueData.Topic, queueData.Content);
|
|
|
|
|
- OnEventHandler?.Invoke(this, new EventResult(operateResult.State, operateResult.Message, operateResult.RData, operateResult.RType));
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- OnEventHandler?.Invoke(this, new EventResult(false, $"{ISn} 实例未找到"));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ OperateResult operateResult = InstanceIoc[ISn].Produce(queueData.Topic, queueData.Content);
|
|
|
|
|
+ OnEventHandler?.Invoke(this, new EventResult(operateResult.State, operateResult.Message, operateResult.RData, operateResult.RType));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -944,16 +937,42 @@ namespace YSAI.RelayManage
|
|
|
TaskArray.TryAdd(Guid.NewGuid(), TaskHandle());
|
|
TaskArray.TryAdd(Guid.NewGuid(), TaskHandle());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- //入列
|
|
|
|
|
- DataQueue.Enqueue(new QueueData() { Topic = Topic, Content = Content, ISns = ISns });
|
|
|
|
|
- return Break("Produce", true);
|
|
|
|
|
|
|
+ List<string> FailMessage = new List<string>();
|
|
|
|
|
+
|
|
|
|
|
+ if (ISns == null || ISns.Count <= 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ //入列
|
|
|
|
|
+ DataQueue.Enqueue(new QueueData() { Topic = Topic, Content = Content, ISns = ISns });
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+
|
|
|
|
|
+ for (int i = 0; i < ISns.Count; i++)
|
|
|
|
|
+ {
|
|
|
|
|
+ if (!InstanceIoc.ContainsKey(ISns[i]))
|
|
|
|
|
+ {
|
|
|
|
|
+ FailMessage.Add($"{ISns[i]} 实例未找到");
|
|
|
|
|
+ ISns.Remove(ISns[i]);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //入列
|
|
|
|
|
+ DataQueue.Enqueue(new QueueData() { Topic = Topic, Content = Content, ISns = ISns });
|
|
|
|
|
+ }
|
|
|
|
|
+ if (FailMessage.Count > 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ return Break("Produce", false, $"存在 {FailMessage.Count} 失败信息",FailMessage,ResultType.Json);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ return Break("Produce", true);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|
|
|
{
|
|
{
|
|
|
return Break("Produce", false, ex.Message);
|
|
return Break("Produce", false, ex.Message);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
public OperateResult Subscribe(string Topic, string ISn)
|
|
public OperateResult Subscribe(string Topic, string ISn)
|
|
|
{
|
|
{
|
|
|
Depart("Subscribe");
|
|
Depart("Subscribe");
|
|
@@ -973,7 +992,6 @@ namespace YSAI.RelayManage
|
|
|
return Break("Subscribe", false, ex.Message);
|
|
return Break("Subscribe", false, ex.Message);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
public OperateResult UnSubscribe(string Topic, string ISn)
|
|
public OperateResult UnSubscribe(string Topic, string ISn)
|
|
|
{
|
|
{
|
|
|
Depart("UnSubscribe");
|
|
Depart("UnSubscribe");
|