From b9eeada22b47fe28383052810e795619b8c1f7f9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 21 三月 2023 13:30:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs | 2 +-
Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs | 19 +++++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
index ebb0959..46eac22 100644
--- a/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
+++ b/Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs
@@ -380,9 +380,19 @@
}
else
{//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
- open_pump.Frequency = open_pump.Frequency + 0.5;
+ if (open_pump.Frequency < 49.5)
+ {
+ open_pump.Speed = Math.Round
+ (open_pump.Speed * (open_pump.Frequency + 0.5) / (open_pump.Frequency),0);
+ open_pump.Frequency = open_pump.Frequency + 0.5;
+ }
+
if (open_pump.Frequency > 50)
+ {
open_pump.Frequency = 50;
+
+ }
+
}
}
}
@@ -393,7 +403,12 @@
{//鍘熸按鍙嶉 , 鐢ㄦ洸绾胯绠�, 棰戠巼鍋忎綆, 浜轰负澧炲姞0.5HZ
if (x.Frequency > 10)
{
- x.Frequency = x.Frequency + 0.5;//
+ if (x.Frequency < 49.5)
+ {
+ x.Speed = Math.Round
+ (x.Speed * (x.Frequency + 0.5) / (x.Frequency), 0);
+ x.Frequency = x.Frequency + 0.5;
+ }
}
if (x.Frequency > 50)
x.Frequency = 50;
diff --git a/Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs b/Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs
index 5136372..2fae86c 100644
--- a/Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs
+++ b/Application/IStation.Application.OpenApi/test/report/helper/XmlHelper.cs
@@ -83,7 +83,7 @@
/// <summary>
/// 淇濆瓨瀵硅薄鍒皒ml鏂囦欢涓�
/// </summary>
- /// <typeparam name="T">FX</typeparam>
+ /// <typeparam name="T"></typeparam>
/// <param name="fileName"></param>
/// <param name="t"></param>
public static void SaveObjectXmlFile<T>(string fileName, T t) where T : class
--
Gitblit v1.9.3