完善系统参数下发功能

完善配方下发功能
2024-09-10 19:44:26 +08:00 · 2024-09-10 19:25:18 +08:00
12 changed files with 182 additions and 172 deletions
--- a/MasstransferCommon.Tests/MasstransferCommon.Tests.csproj
+++ b/MasstransferCommon.Tests/MasstransferCommon.Tests.csproj
@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net7.0</TargetFrameworks>
+    
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MasstransferCommon\MasstransferCommon.csproj" />
+    <ProjectReference Include="..\MasstransferExporter\MasstransferExporter.csproj" />
+  </ItemGroup>
+  
+</Project>
--- a/MasstransferCommon.Tests/Utils/JsonUtilTest.cs
+++ b/MasstransferCommon.Tests/Utils/JsonUtilTest.cs
@ -0,0 +1,21 @@
+using System.IO;
+using JetBrains.Annotations;
+using MasstransferCommon.Utils;
+using MasstransferExporter.DataExporter.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MasstransferCommon.Tests.Utils;
+
+[TestClass]
+[TestSubject(typeof(JsonUtil))]
+public class JsonUtilTest
+{
+    [TestMethod]
+    public void Test()
+    {
+        var json = File.ReadAllText("C:\\Users\\huangxianguo\\Desktop\\formula.json");
+
+        var dto = JsonUtil.FromJson<FormulaDTO>(json);
+        Assert.IsNotNull(dto);
+    }
+}
--- a/MasstransferCommon/Utils/JsonUtil.cs
+++ b/MasstransferCommon/Utils/JsonUtil.cs
@ -49,6 +49,7 @@ public class JsonUtil
        }
        catch (Exception e)
        {
+            Console.WriteLine(e);
            throw new ArgumentException($" 无效的json 字符串 {json} ");
        }
    }
--- a/MasstransferExporter.sln
+++ b/MasstransferExporter.sln
@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferInfrastructure"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferCommon", "MasstransferCommon\MasstransferCommon.csproj", "{66C6D73C-BADB-4E28-9C83-E701B019626D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{D26C3A44-62AF-4ACC-B454-51E1098C2C86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferCommon.Tests", "MasstransferCommon.Tests\MasstransferCommon.Tests.csproj", "{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -26,9 +26,9 @@ Global
 		{66C6D73C-BADB-4E28-9C83-E701B019626D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66C6D73C-BADB-4E28-9C83-E701B019626D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66C6D73C-BADB-4E28-9C83-E701B019626D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
--- a/MasstransferExporter.sln.DotSettings.user
+++ b/MasstransferExporter.sln.DotSettings.user
@ -0,0 +1,8 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=66C6D73C_002DBADB_002D4E28_002D9C83_002DE701B019626D/@EntryIndexedValue">MasstransferCommon.Tests</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestTemplateMapping/=MSTest/@EntryIndexedValue">d6790ab7-33c2-4425-b2c9-51480cd1a852</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=df21ed25_002D5064_002D4b51_002D96dd_002D1d6a1eb4ab6c/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="Test" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;MSTest::DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C::net7.0::MasstransferCommon.Tests.Utils.JsonUtilTest.Test&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
--- a/MasstransferExporter/DataExporter/ConfigService.cs
+++ b/MasstransferExporter/DataExporter/ConfigService.cs
@ -1,6 +1,8 @@
 using MasstransferCommon.Atrributes;
 using MasstransferCommon.Events;
+using MasstransferCommon.Model.Constant;
 using MasstransferCommon.Utils;
+using MasstransferCommunicate.Mqtt.Client;
 using MasstransferExporter.DataExporter.Model;
 using Masuit.Tools;

@ -16,7 +18,7 @@ public class ConfigService : Instant
    /// </summary>
    private static async Task ListenConfigIssuedEvent(EventType type, bool start)
    {
-        // await MessageQueueHelper.Subscribe(Topics.DownloadConfigData, HandleConfigIssuedEvent);
+        await MessageQueueHelper.Subscribe(Topics.DownloadConfigData, HandleConfigIssuedEvent);
    }


@ -25,7 +27,7 @@ public class ConfigService : Instant
    /// </summary>
    /// <param name="topic"></param>
    /// <param name="data"></param>
-    private static void HandleConfigIssuedEvent(string topic, ConfigData data)
+    private static void HandleConfigIssuedEvent(string topic, ConfigData<object> data)
    {
        if (data.IsNullOrEmpty()) return;

@ -33,12 +35,21 @@ public class ConfigService : Instant
        switch (type)
        {
            case "SYSTEM":
-                SystemParamsService.HandleSystemParamsIssuedEvent(data);
+                var systemParamsDto = JsonUtil.FromJson<SystemParamsDTO>(data.Param.ToString());
+                if (systemParamsDto != null)
+                {
+                    SystemParamsService.HandleSystemParamsIssuedEvent(systemParamsDto);
+                }
+
                break;
            case "FORMULA":
            {
-                var param = data.Param;
-                var formulaDto = JsonUtil.FromJson<FormulaDTO>(JsonUtil.ToJson(param));
+                var formulaDto = JsonUtil.FromJson<FormulaDTO>(data.Param.ToString());
+                if (formulaDto != null)
+                {
+                    formulaDto.Name = data.Name;
+                }
+
                FormulaService.HandleFormulaIssuedEvent(formulaDto);
                break;
            }
--- a/MasstransferExporter/DataExporter/FormulaService.cs
+++ b/MasstransferExporter/DataExporter/FormulaService.cs
@ -263,7 +263,7 @@ public class FormulaService
            {
                var formulaDto = GetFormulaById(formula.Id);
                if (formulaDto == null) continue;
-                var data = new ConfigData()
+                var data = new ConfigData<FormulaDTO>()
                {
                    Name = formulaDto.Name,
                    Param = formulaDto,
--- a/MasstransferExporter/DataExporter/Model/ConfigData.cs
+++ b/MasstransferExporter/DataExporter/Model/ConfigData.cs
@ -5,11 +5,11 @@ namespace MasstransferExporter.DataExporter.Model;
 /// <summary>
 /// 配置数据
 /// </summary>
-public class ConfigData
+public class ConfigData<T>
 {
    [JsonProperty("name")] public string Name { get; set; }

    [JsonProperty("type")] public string Type { get; set; }

-    [JsonProperty("param")] public object Param { get; set; }
+    [JsonProperty("param")] public T? Param { get; set; }
 }
--- a/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs
+++ b/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs
@ -5,19 +5,19 @@
 /// </summary>
 public class SystemParamsDTO
 {
-    public CameraParams CameraParams { get; set; }
+    public CameraParams? CameraParams { get; set; }

-    public SystemParams SystemParams { get; set; }
+    public SystemParams? SystemParams { get; set; }

-    public LogParams LogParams { get; set; }
+    public LogParams? LogParams { get; set; }

-    public ScannerParams ScannerParams { get; set; }
+    public ScannerParams? ScannerParams { get; set; }

-    public CameraInternalParams WaferCameraInternalParams { get; set; }
+    public CameraInternalParams? WaferCameraInternalParams { get; set; }

-    public CameraInternalParams SubstrateCameraInternalParams { get; set; }
+    public CameraInternalParams? SubstrateCameraInternalParams { get; set; }

-    public MinioParams MinioParams { get; set; }
+    public MinioParams? MinioParams { get; set; }

-    public MqttParams MqttParams { get; set; }
+    public MqttParams? MqttParams { get; set; }
 }
--- a/MasstransferExporter/DataExporter/SystemParamsService.cs
+++ b/MasstransferExporter/DataExporter/SystemParamsService.cs
@ -1,5 +1,4 @@
 using MasstransferCommon.Model.Constant;
-using MasstransferCommon.Utils;
 using MasstransferCommunicate.Mqtt.Client;
 using MasstransferExporter.DataExporter.Model;
 using MasstransferInfrastructure.Database.Sqlite;
@ -19,175 +18,122 @@ public class SystemParamsService
    /// 处理下发的系统配置参数
    /// </summary>
    /// <param name="data"></param>
-    public static void HandleSystemParamsIssuedEvent(ConfigData data)
+    public static void HandleSystemParamsIssuedEvent(SystemParamsDTO dto)
    {
-        if (data.IsNullOrEmpty()) return;
+        if (dto.IsNullOrEmpty()) return;

-        var name = data.Name;
-        var param = JsonUtil.ToJson(data.Param);
-        switch (name)
+
+        if (dto?.CameraParams != null)
        {
-            case "相机配置":
-                var cameraParams = JsonUtil.FromJson<CameraParams>(param);
-                if (cameraParams == null) break;
-                var cameraParamsFromDb = GetCameraParams();
-                if (cameraParamsFromDb != null)
-                {
-                    cameraParams.Id = cameraParamsFromDb.Id;
-                }
+            var cameraParams = dto.CameraParams;
+            var cameraParamsFromDb = GetCameraParams();
+            if (cameraParamsFromDb != null)
+            {
+                cameraParams.Id = cameraParamsFromDb.Id;
+            }

-                Db.SaveOrUpdate(cameraParams);
-                break;
-            case "日志配置":
-                var logParams = JsonUtil.FromJson<LogParams>(param);
-                if (logParams == null) break;
-                var logParamsFromDb = GetLogParams();
-                if (logParamsFromDb != null)
-                {
-                    logParams.Id = logParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(logParams);
-                break;
-            case "系统配置":
-                var systemParams = JsonUtil.FromJson<SystemParams>(param);
-                if (systemParams == null) break;
-                var systemParamsFromDb = GetSystemParams();
-                if (systemParamsFromDb != null)
-                {
-                    systemParams.Id = systemParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(systemParams);
-                break;
-            case "扫描器配置":
-                var scannerParams = JsonUtil.FromJson<ScannerParams>(param);
-                if (scannerParams == null) break;
-                var scannerParamsFromDb = GetScannerParams();
-                if (scannerParamsFromDb != null)
-                {
-                    scannerParams.Id = scannerParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(scannerParams);
-                break;
-            case "MinIO配置":
-                var minioParams = JsonUtil.FromJson<MinioParams>(param);
-                if (minioParams == null) break;
-                var minioParamsFromDb = GetMinioParams();
-                if (minioParamsFromDb != null)
-                {
-                    minioParams.Id = minioParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(minioParams);
-                break;
-            case "MQTT配置":
-                var mqttParams = JsonUtil.FromJson<MqttParams>(param);
-                if (mqttParams == null) break;
-                var mqttParamsFromDb = GetMqttConnectParams();
-                if (mqttParamsFromDb != null)
-                {
-                    mqttParams.Id = mqttParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(mqttParams);
-                break;
-            case "基板拍照相机内参":
-                var waferCameraInternalParams = JsonUtil.FromJson<CameraInternalParams>(param);
-                if (waferCameraInternalParams == null) break;
-                var waferCameraInternalParamsFromDb = GetWaferParams();
-                if (waferCameraInternalParamsFromDb != null)
-                {
-                    waferCameraInternalParams.Id = waferCameraInternalParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(waferCameraInternalParams);
-                break;
-            case "基板拍照相机外参":
-                var substrateCameraInternalParams = JsonUtil.FromJson<CameraInternalParams>(param);
-                if (substrateCameraInternalParams == null) break;
-                var substrateCameraInternalParamsFromDb = GetSubstrateParams();
-                if (substrateCameraInternalParamsFromDb != null)
-                {
-                    substrateCameraInternalParams.Id = substrateCameraInternalParamsFromDb.Id;
-                }
-
-                Db.SaveOrUpdate(substrateCameraInternalParams);
-                break;
+            Db.SaveOrUpdate(cameraParams);
        }
+
+        if (dto?.LogParams != null)
+        {
+            var logParams = dto.LogParams;
+            var logParamsFromDb = GetLogParams();
+            if (logParamsFromDb != null)
+            {
+                logParams.Id = logParamsFromDb.Id;
+            }
+
+            Db.SaveOrUpdate(logParams);
+        }
+
+        if (dto?.MinioParams != null)
+        {
+            var minioParams = dto.MinioParams;
+            var minioParamsFromDb = GetMinioParams();
+            if (minioParamsFromDb != null)
+            {
+                minioParams.Id = minioParamsFromDb.Id;
+            }
+
+            Db.SaveOrUpdate(minioParams);
+        }
+
+        if (dto?.MqttParams != null)
+        {
+            var mqttParams = dto.MqttParams;
+            var mqttParamsFromDb = GetMqttConnectParams();
+            if (mqttParamsFromDb != null)
+            {
+                mqttParams.Id = mqttParamsFromDb.Id;
+            }
+
+            Db.SaveOrUpdate(mqttParams);
+        }
+
+        if (dto?.ScannerParams != null)
+        {
+            var scannerParams = dto.ScannerParams;
+            var scannerParamsFromDb = GetScannerParams();
+            if (scannerParamsFromDb != null)
+            {
+                scannerParams.Id = scannerParamsFromDb.Id;
+            }
+
+            Db.SaveOrUpdate(scannerParams);
+        }
+
+        if (dto?.WaferCameraInternalParams != null)
+        {
+            var waferCameraInternalParams = dto.WaferCameraInternalParams;
+            var waferCameraInternalParamsFromDb = GetWaferParams();
+            if (waferCameraInternalParamsFromDb != null)
+            {
+                waferCameraInternalParams.Id = waferCameraInternalParamsFromDb.Id;
+            }
+
+            Db.SaveOrUpdate(waferCameraInternalParams);
+        }
+
+        if (dto?.SubstrateCameraInternalParams == null) return;
+
+        var substrateCameraInternalParams = dto.SubstrateCameraInternalParams;
+        var substrateCameraInternalParamsFromDb = GetSubstrateParams();
+        if (substrateCameraInternalParamsFromDb != null)
+        {
+            substrateCameraInternalParams.Id = substrateCameraInternalParamsFromDb.Id;
+        }
+
+        Db.SaveOrUpdate(substrateCameraInternalParams);
    }

    /// <summary>
    /// 系统参数上报
    /// </summary>
-    public static async Task SystemParamsExporter()
+    public static async Task ExportSystemParams()
    {
        try
        {
-            var cameraParams = new ConfigData()
+            var dto = new SystemParamsDTO()
            {
-                Name = "相机配置",
-                Param = GetCameraParams(),
-                Type = "SYSTEM"
+                CameraParams = GetCameraParams(),
+                SubstrateCameraInternalParams = GetSubstrateParams(),
+                WaferCameraInternalParams = GetWaferParams(),
+                LogParams = GetLogParams(),
+                MinioParams = GetMinioParams(),
+                MqttParams = GetMqttConnectParams(),
+                ScannerParams = GetScannerParams(),
+                SystemParams = GetSystemParams(),
            };

-            var substrateCameraInternalParams = new ConfigData()
-            {
-                Name = "基板拍照相机内参",
-                Param = GetSubstrateParams(),
-                Type = "SYSTEM"
-            };
-
-            var waferCameraInternalParams = new ConfigData()
-            {
-                Name = "芯片拍照相机内参",
-                Param = GetWaferParams(),
-                Type = "SYSTEM"
-            };
-            var logParams = new ConfigData()
-            {
-                Name = "日志配置",
-                Param = GetLogParams(),
-                Type = "SYSTEM"
-            };
-
-            var systemParams = new ConfigData()
+            var systemParams = new ConfigData<SystemParamsDTO>()
            {
                Name = "系统配置",
-                Param = GetSystemParams(),
+                Param = dto,
                Type = "SYSTEM"
            };

-            var scannerParams = new ConfigData()
-            {
-                Name = "扫描器配置",
-                Param = GetScannerParams(),
-                Type = "SYSTEM"
-            };
-
-            var minioParams = new ConfigData()
-            {
-                Name = "MinIO配置",
-                Param = GetMinioParams(),
-                Type = "SYSTEM"
-            };
-
-            var mqttParams = new ConfigData()
-            {
-                Name = "MQTT配置",
-                Param = GetMqttConnectParams(),
-                Type = "SYSTEM"
-            };
-
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, cameraParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, substrateCameraInternalParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, waferCameraInternalParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, logParams);
            await MessageQueueHelper.Publish(Topics.ReportConfigData, systemParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, scannerParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, minioParams);
-            await MessageQueueHelper.Publish(Topics.ReportConfigData, mqttParams);
        }
        catch (Exception e)
        {
--- a/MasstransferExporter/Program.cs
+++ b/MasstransferExporter/Program.cs
@ -2,6 +2,7 @@
 using MasstransferCommon.Events;
 using MasstransferCommon.Scheduler;
 using MasstransferCommunicate.Mqtt.Client;
+using MasstransferExporter.DataExporter;
 using MasstransferExporter.Init;
 using MasstransferExporter.StatExporter;
 using MasstransferInfrastructure.Database.Sqlite;
@ -38,8 +39,8 @@ class Program
        // 启动完成后，广播启动通知
        EventBus<bool>.Publish(EventType.StartUp, true);

-        // DelayScheduler.Delay(async () => await SystemStatExporter.ExportSystemStat(),
-        //     TimeSpan.FromSeconds(3));
+        DelayScheduler.Delay(async () => await SystemParamsService.ExportSystemParams(),
+            TimeSpan.FromSeconds(3));


        // 启动与主程序的通信
--- a/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs
+++ b/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs
@ -2,6 +2,7 @@
 using MasstransferCommon.Utils;
 using MasstransferCommunicate.Mqtt.Model;
 using MasstransferInfrastructure.Mqtt.Model;
+using Masuit.Tools;
 using MQTTnet;
 using MQTTnet.Client;
 using MQTTnet.Protocol;
@ -106,7 +107,7 @@ internal class MqttClient

        var payload = JsonUtil.ToJson(message);

-        Console.WriteLine(payload);
+        Console.WriteLine(message.ToJsonString());

        var result = await _client.PublishAsync(new MqttApplicationMessageBuilder()
            .WithTopic(topic)
Author	SHA1	Message	Date
huangxianguo	e5c23c26ef	完善系统参数下发功能	2024-09-10 19:44:26 +08:00
huangxianguo	504216dfbd	完善配方下发功能	2024-09-10 19:25:18 +08:00