Shun 2 yıl önce
ebeveyn
işleme
1fb36f951e

+ 13 - 0
src/YSAI.DAQ/YSAI.Core/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>

+ 1 - 1
src/YSAI.DAQ/YSAI.Core/YSAI.Core.csproj

@@ -8,7 +8,7 @@
 
 
 	<ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
-		<PackageReference Include="Microsoft.ClearScript" Version="7.4.2" />
+		<PackageReference Include="Microsoft.ClearScript" Version="7.4.3" />
 		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
 		<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
 	</ItemGroup>
 	</ItemGroup>

+ 1 - 1
src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
   </PropertyGroup>
 
 
 	<ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Dapper" Version="2.0.143" />
+		<PackageReference Include="Dapper" Version="2.0.151" />
 		<PackageReference Include="MySql.Data" Version="8.1.0" />
 		<PackageReference Include="MySql.Data" Version="8.1.0" />
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />

+ 32 - 14
src/YSAI.DAQ/YSAI.RelayManage/RelayManageOperate.cs

@@ -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");