From 7f37f008a60b4797cee17ed9b1c0189590baae8d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 10 七月 2024 17:30:02 +0800
Subject: [PATCH] 代码验证
---
Test/IStation.Test/HydraulicModelValidationHelperJob.cs | 92 +++++++++++++++++++++------------------------
1 files changed, 43 insertions(+), 49 deletions(-)
diff --git a/Test/IStation.Test/HydraulicModelValidationHelperJob.cs b/Test/IStation.Test/HydraulicModelValidationHelperJob.cs
index d33124e..c69fd12 100644
--- a/Test/IStation.Test/HydraulicModelValidationHelperJob.cs
+++ b/Test/IStation.Test/HydraulicModelValidationHelperJob.cs
@@ -1,23 +1,23 @@
-锘縩amespace IStation.Test
+锘縩amespace IStation
{
/// <summary>
/// 妯″瀷楠岃瘉杈呭姪绫�
/// </summary>
- public class HydraulicModelValidationHelperJob
+ public class HydraulicModelValidationHelperJob
{
private static readonly string _hydraulic_model_file = Path.Combine(
Settings.ParasHelper.LocalFile.DataFolderDirectory,
Settings.ParasHelper.LocalFile.HydraulicModelFile);
private static readonly Dictionary<string, double> _pump_nr_dict = new() {
- { "Pump11",524},
- { "Pump12",524},
- { "Pump13",524},
- { "Pump14",524},
- //{ "Pump15",545},
- //{ "Pump16",524},
- { "Pump17",524},
- { "Pump18",524},
+ { "Pump11",590},
+ { "Pump12",590},
+ { "Pump13",590},
+ { "Pump14",590},
+ //{ "Pump15",590},
+ //{ "Pump16",590},
+ { "Pump17",590},
+ { "Pump18",590},
{ "Pump21",740},
{ "Pump22",495},
@@ -28,68 +28,55 @@
{ "Pump27",740}
};
+ private static readonly List<string> _MPa = new();
+ private static readonly List<string> _kPa = new();
+
/// <summary>
///
/// </summary>
- public static void Execute()
+ public stat void Execute()
{
-
- var verification_id = Yw.YitIdHelper.NextId();
+ var verification_id = 1;
var current_time = DateTime.Now;
if (!File.Exists(_hydraulic_model_file))
{
- //Log.Info(verification_id, $"妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷鏂囦欢涓嶅瓨鍦�,鑷姩璺宠繃褰撳墠鏁版嵁!");
- return;
+ // Log.Info(verification_id, $"妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷鏂囦欢涓嶅瓨鍦�,鑷姩璺宠繃褰撳墠鏁版嵁!");
+ // return;
}
var hydraulic_model_validation_config = new IStation.Service.HydraulicModelValidationConfig().Get();
if (hydraulic_model_validation_config == null)
{
- //Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷楠岃瘉鏂囦欢涓嶅瓨鍦�,鑷姩璺宠繃褰撳墠鏁版嵁!");
- return;
+ // Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷楠岃瘉鏂囦欢涓嶅瓨鍦�,鑷姩璺宠繃褰撳墠鏁版嵁!");
+ //return;
}
-
- var hydraulic_model_scada_list = new List<Model.HydraulicModelScada>();
-
- var scada_debug_json_file = Path.Combine(Settings.ParasHelper.LocalFile.DataFolderDirectory, "scada_debug.txt");
- var scada_debug_json = File.ReadAllText(scada_debug_json_file);
-
-
- var zy_scada_output = Yw.JsonHelper.Json2Object<IStation.Dto.ScadaScheduleInput>(scada_debug_json);
-
- if (zy_scada_output.data != null && zy_scada_output.data.Any())
+ if (!Settings.ParasHelper.ZyDocking.Enable)
{
- var data_dict = zy_scada_output.data;
- foreach (var scada_dict in data_dict)
- {
- var vals = scada_dict.Value.ElementAt(0).Value;
- var time = scada_dict.Value.ElementAt(1).Value;
- var key = scada_dict.Value.ElementAt(2).Value;
- var hydraulic_model_scada = new Model.HydraulicModelScada();
- hydraulic_model_scada.VerificationID = verification_id;
- hydraulic_model_scada.Tag = key;
- if (DateTime.TryParse(time, out DateTime t))
- hydraulic_model_scada.Time = t;
- if (double.TryParse(vals, out double v))
- hydraulic_model_scada.Value = v;
- hydraulic_model_scada_list.Add(hydraulic_model_scada);
- }
- }
+ //Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,Scada瀵规帴鎺ュ彛鏈惎鐢�,鑷姩璺宠繃褰撳墠鏁版嵁!");
+ // return;
+ }//
+
+
+
+ var fileName = "D:\\ScadaDebug.json";
+ var json = File.ReadAllText(fileName);
+ var hydraulic_model_scada_list = Yw.JsonHelper.Json2Object<List<IStation.Model.HydraulicModelScada>>(json);
if (!hydraulic_model_scada_list.Any())
{
//Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,鎺ユ敹Scada鏁版嵁涓虹┖,鑷姩璺宠繃褰撳墠鏁版嵁!");
- return;
+ // return;
}
else
{
- var json = Yw.JsonHelper.Object2Json(hydraulic_model_scada_list);
- // Log.Debug(verification_id, json);
+ // var json = Yw.JsonHelper.Object2Json(hydraulic_model_scada_list);
+ //Log.Debug(verification_id, json);
}
var flow_id_mapping_dict = hydraulic_model_validation_config.FlowIdMappingDict;
var pressure_id_mapping_dict = hydraulic_model_validation_config.PressureIdMappingDict;
var pattern_id_mapping_dict = hydraulic_model_validation_config.PatternIdMappingDict;
+
var pressure_id_kPa_list = hydraulic_model_validation_config.PressureIdkPaList;
var pattern_list = new List<IStation.Hydraulic.Pattern>();
@@ -145,12 +132,12 @@
}
}
-
+ // Log.Info(verification_id, _hydraulic_model_file);//text
var hydraulic_model_record_list = IStation.Hydraulic.ModeVerifyHelper.Verify(verification_id, _hydraulic_model_file, flow_id_mapping_dict, pressure_id_mapping_dict, pattern_list, time_value);
if (hydraulic_model_record_list == null || !hydraulic_model_record_list.Any())
{
-
- return;
+ // Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,妯″瀷楠岃瘉鏁版嵁涓虹┖锛岃嚜鍔ㄨ烦杩囧綋鍓嶆暟鎹�!");
+ // return;
}
var hydraulic_model_validation = new Model.HydraulicModelValidation();
@@ -161,19 +148,26 @@
var bol = new IStation.Service.HydraulicModelValidation().Insert(hydraulic_model_validation) > 0;
if (!bol)
{
+ //Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷楠岃瘉,淇濆瓨澶辫触!");
}
bol = new IStation.Service.HydraulicModelScada().Inserts(hydraulic_model_scada_list);
if (!bol)
{
+ // Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷Scada,淇濆瓨澶辫触!");
}
bol = new IStation.Service.HydraulicModelRecord().Inserts(hydraulic_model_record_list);
if (!bol)
{
+ // Log.Info(verification_id, "妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷璁板綍,淇濆瓨澶辫触!");
}
+
+ // Log.Info(verification_id, $"妯″瀷楠岃瘉璁″垝浠诲姟涓�,姘村姏妯″瀷楠岃瘉,[{current_time:G}]楠岃瘉鎴愬姛!");
}
+
+
}
}
--
Gitblit v1.9.3