From 8587b149063bd5c6dc71bce7b791cc315d40aa0f Mon Sep 17 00:00:00 2001 From: qsp89 Date: Fri, 21 Nov 2025 20:04:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A1=E6=A3=80=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89deviceName?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/SecondaryCircuitInspectionPlanService.cs | 6 ++---- .../YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/SecondaryCircuitInspectionPlanService.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/SecondaryCircuitInspectionPlanService.cs index 23dd30d..4961452 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/SecondaryCircuitInspectionPlanService.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/SecondaryCircuitInspectionPlanService.cs @@ -525,8 +525,8 @@ namespace YunDa.Server.ISMSTcp.Services private async Task ExecutePlan(SecondaryCircuitInspectionItemOutputEx itemEx) { - string func2 = ""; - string data2 = ""; + //string func2 = ""; + //string data2 = ""; try { var item = itemEx.Item; @@ -554,7 +554,6 @@ namespace YunDa.Server.ISMSTcp.Services var engine = new Jint.Engine(); engine.Execute(item.CalculationExpression); - func2 = item.CalculationExpression; ObjectInstance? saveObj = null; @@ -632,7 +631,6 @@ namespace YunDa.Server.ISMSTcp.Services var js = $"JSON.parse('{json.Replace("'", "\\'")}')"; - data2 = json; var jsObj = engine.Evaluate(js).ToObject(); diff --git a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs index 1cce302..85b676e 100644 --- a/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs +++ b/src/YunDa.Server/YunDa.Server.ISMSTcp/Services/ZzDataCacheContainer.cs @@ -97,6 +97,7 @@ namespace YunDa.Server.ISMSTcp.Services { public string Id { get; set; } = string.Empty; public string Name { get; set; } = string.Empty; + public string DeviceName { get; set; } = string.Empty; public int? DispatcherAddress { get; set; } = null; public double Value { get; set; } public string ValueStr { get; set; } = string.Empty;