From bc8d900f5ca26216dae0e1be243ab6237790873b Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 21 十月 2024 10:56:42 +0800 Subject: [PATCH] 部分调试升级 --- Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs | 87 ++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs index b7801fa..6126972 100644 --- a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs +++ b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs @@ -4465,7 +4465,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Id), ePropStatus.Error, "缂哄皯[鏋勪欢缂栫爜]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Id), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[鏋勪欢缂栫爜]"); } #endregion @@ -4478,12 +4478,12 @@ if (string.IsNullOrEmpty(exchanger.Code)) { exchanger.Code = exchanger.Id; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Code), ePropStatus.Lack, "浣跨敤[鏋勪欢缂栫爜]璧嬪��"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Code), ePropStatus.Lack, "[鎹㈢儹鍣╙[缂栫爜]缂虹渷锛屼娇鐢╗鏋勪欢缂栫爜]璧嬪��"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Code), ePropStatus.Error, "缂哄皯[缂栫爜]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Code), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[缂栫爜]"); } #endregion @@ -4493,11 +4493,11 @@ if (jobject.ParseString(RevitJsonProp.Name, out string name)) { exchanger.Name = name; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Name), ePropStatus.Lack, "[鍚嶇О]缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Name), ePropStatus.Lack, "[鎹㈢儹鍣╙[鍚嶇О]缂虹渷"); } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Name), ePropStatus.Error, "缂哄皯[鍚嶇О]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Name), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[鍚嶇О]"); } #endregion @@ -4509,12 +4509,12 @@ exchanger.ModelType = modelType; if (string.IsNullOrEmpty(exchanger.ModelType)) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ModelType), ePropStatus.Lack, "[鍨嬪彿淇℃伅]缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ModelType), ePropStatus.Lack, "[鎹㈢儹鍣╙[鍨嬪彿淇℃伅]缂虹渷"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ModelType), ePropStatus.Error, "缂哄皯[鍨嬪彿淇℃伅]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ModelType), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[鍨嬪彿淇℃伅]"); } #endregion @@ -4528,13 +4528,13 @@ { if (exchanger.Flags == null || exchanger.Flags.Count < 1) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Flags), ePropStatus.Abnormal, "[鏍囩]鏍煎紡閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Flags), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[鏍囩]鏍煎紡閿欒"); } } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Flags), ePropStatus.Error, "缂哄皯[鏍囩]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Flags), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[鏍囩]"); } #endregion @@ -4547,7 +4547,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Description), ePropStatus.Error, "缂哄皯[璇存槑淇℃伅]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Description), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[璇存槑淇℃伅]"); } #endregion @@ -4570,12 +4570,12 @@ }).ToList(); if (exchanger.ConnectList == null || exchanger.ConnectList.Count < 1) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ConnectList), ePropStatus.Error, "[杩炴帴鍒楄〃]瑙f瀽澶辫触"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ConnectList), ePropStatus.Error, "[鎹㈢儹鍣╙[杩炴帴鍒楄〃]瑙f瀽澶辫触"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ConnectList), ePropStatus.Error, "缂哄皯[杩炴帴鍒楄〃]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.ConnectList), ePropStatus.Error, "[鎹㈢儹鍣╙缂哄皯[杩炴帴鍒楄〃]"); } #endregion @@ -4586,12 +4586,12 @@ exchanger.StartCode = startConnect?.Id; if (string.IsNullOrEmpty(exchanger.StartCode)) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartCode), ePropStatus.Error, "[涓婃父鏋勪欢]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartCode), ePropStatus.Error, "[鎹㈢儹鍣╙[涓婃父鏋勪欢]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); } exchanger.StartPosition = startConnect?.Position; if (exchanger.StartPosition == null) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartPosition), ePropStatus.Error, "[涓婃父鏋勪欢浣嶇疆]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartPosition), ePropStatus.Error, "[鎹㈢儹鍣╙[涓婃父鏋勪欢浣嶇疆]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); } #endregion @@ -4602,12 +4602,12 @@ exchanger.EndCode = endConnect?.Id; if (string.IsNullOrEmpty(exchanger.EndCode)) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndCode), ePropStatus.Error, "[涓嬫父鏋勪欢]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndCode), ePropStatus.Error, "[鎹㈢儹鍣╙[涓嬫父鏋勪欢]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); } exchanger.EndPosition = endConnect?.Position; if (exchanger.EndPosition == null) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndPosition), ePropStatus.Error, "[涓嬫父鏋勪欢浣嶇疆]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndPosition), ePropStatus.Error, "[鎹㈢儹鍣╙[涓嬫父鏋勪欢浣嶇疆]鍙梉杩炴帴鍒楄〃]褰卞搷瑙f瀽閿欒"); } #endregion @@ -4620,21 +4620,21 @@ if (string.IsNullOrEmpty(exchanger.LinkStatus)) { exchanger.LinkStatus = PipeStatus.Open; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Lack, "[绠¢亾鐘舵�乚缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Lack, "[鎹㈢儹鍣╙[绠¢亾鐘舵�乚缂虹渷"); } else { if (!PipeStatus.Contains(exchanger.LinkStatus)) { exchanger.LinkStatus = PipeStatus.Open; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Abnormal, "[绠¢亾鐘舵�乚璁剧疆閿欒"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[绠¢亾鐘舵�乚璁剧疆閿欒"); } } } else { exchanger.LinkStatus = PipeStatus.Open; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Abnormal, "[绠¢亾鐘舵�乚缂哄皯鎴栨牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.LinkStatus), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[绠¢亾鐘舵�乚缂哄皯鎴栨牸寮忛敊璇�"); } #endregion @@ -4647,7 +4647,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Abnormal, "[涓婃父鏍囬珮]缂哄皯鎴栨牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[涓婃父鏍囬珮]缂哄皯鎴栨牸寮忛敊璇�"); } if (exchanger.StartElev <= 0) @@ -4655,12 +4655,12 @@ //閫氳繃z杞磋嚜鍔ㄨ绠� if (exchanger.StartPosition == null) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Lack, "[涓婃父鏍囬珮]缂虹渷锛屽彈[涓婃父鏋勪欢浣嶇疆]褰卞搷锛屾棤娉曢�氳繃Z杞磋嚜鍔ㄨ绠�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓婃父鏍囬珮]缂虹渷锛屽彈[涓婃父鏋勪欢浣嶇疆]褰卞搷锛屾棤娉曢�氳繃Z杞磋嚜鍔ㄨ绠�"); } else { exchanger.StartElev = exchanger.StartPosition.Z; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Lack, "[涓婃父鏍囬珮]缂虹渷锛岄�氳繃Z杞磋嚜鍔ㄨ绠�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartElev), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓婃父鏍囬珮]缂虹渷锛岄�氳繃Z杞磋嚜鍔ㄨ绠�"); } } @@ -4674,7 +4674,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Abnormal, "[涓嬫父鏍囬珮]缂哄皯鎴栨牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[涓嬫父鏍囬珮]缂哄皯鎴栨牸寮忛敊璇�"); } if (exchanger.EndElev <= 0) @@ -4682,12 +4682,12 @@ //閫氳繃z杞磋嚜鍔ㄨ绠� if (exchanger.EndPosition == null) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Lack, "[涓嬫父鏍囬珮]缂虹渷锛屽彈[涓嬫父鏋勪欢浣嶇疆]褰卞搷锛屾棤娉曢�氳繃Z杞磋嚜鍔ㄨ绠�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓嬫父鏍囬珮]缂虹渷锛屽彈[涓嬫父鏋勪欢浣嶇疆]褰卞搷锛屾棤娉曢�氳繃Z杞磋嚜鍔ㄨ绠�"); } else { exchanger.EndElev = exchanger.EndPosition.Z; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Lack, "[涓嬫父鏍囬珮]缂虹渷锛岄�氳繃Z杞磋嚜鍔ㄨ绠�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndElev), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓嬫父鏍囬珮]缂虹渷锛岄�氳繃Z杞磋嚜鍔ㄨ绠�"); } } @@ -4700,12 +4700,12 @@ exchanger.StartQuality = startQuality; if (exchanger.StartQuality <= 0) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartQuality), ePropStatus.Lack, "[涓婃父鍒濆姘磋川]缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartQuality), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓婃父鍒濆姘磋川]缂虹渷"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartQuality), ePropStatus.Abnormal, "[涓婃父鍒濆姘磋川]缂哄皯鎴栬�呮牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.StartQuality), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[涓婃父鍒濆姘磋川]缂哄皯鎴栬�呮牸寮忛敊璇�"); } #endregion @@ -4717,12 +4717,12 @@ exchanger.EndQuality = endQuality; if (exchanger.EndQuality <= 0) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndQuality), ePropStatus.Lack, "[涓嬫父鍒濆姘磋川]缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndQuality), ePropStatus.Lack, "[鎹㈢儹鍣╙[涓嬫父鍒濆姘磋川]缂虹渷"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndQuality), ePropStatus.Abnormal, "[涓嬫父鍒濆姘磋川]缂哄皯鎴栬�呮牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.EndQuality), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[涓嬫父鍒濆姘磋川]缂哄皯鎴栬�呮牸寮忛敊璇�"); } #endregion @@ -4734,12 +4734,12 @@ exchanger.Material = material; if (string.IsNullOrEmpty(exchanger.Material)) { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Material), ePropStatus.Lack, "[鏉愯川]缂虹渷"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Material), ePropStatus.Lack, "[鎹㈢儹鍣╙[鏉愯川]缂虹渷"); } } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Material), ePropStatus.Abnormal, "缂哄皯[鏉愯川]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Material), ePropStatus.Abnormal, "[鎹㈢儹鍣╙缂哄皯[鏉愯川]"); } #endregion @@ -4752,7 +4752,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鐩村緞]缂哄皯鎴栬�呮牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[鐩村緞]缂哄皯鎴栬�呮牸寮忛敊璇�"); } if (exchanger.Diameter < 1) @@ -4760,11 +4760,11 @@ if (jobject[RevitJsonProp.InternalDiameter].MatchNumeric(out double internalDiameter)) { exchanger.Diameter = internalDiameter; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鐩村緞]閫氳繃[鍐呭緞]杩涜淇]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鎹㈢儹鍣╙[鐩村緞]閫氳繃[鍐呭緞]杩涜淇]"); } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鐩村緞]鏃犳硶閫氳繃[鍐呭緞]杩涜淇]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[鐩村緞]鏃犳硶閫氳繃[鍐呭緞]杩涜淇]"); } } @@ -4773,18 +4773,18 @@ if (jobject[RevitJsonProp.DN].MatchNumeric(out double dn)) { exchanger.Diameter = dn; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鐩村緞]閫氳繃[鍏О鐩村緞]杩涜淇]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鎹㈢儹鍣╙[鐩村緞]閫氳繃[鍏О鐩村緞]杩涜淇]"); } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鐩村緞]鏃犳硶閫氳繃[鍏О鐩村緞]杩涜淇]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[鐩村緞]鏃犳硶閫氳繃[鍏О鐩村緞]杩涜淇]"); } } if (exchanger.Diameter < 1) { exchanger.Diameter = 1000; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鐩村緞][鍐呭緞]瑙f瀽閿欒锛屼娇鐢ㄩ粯璁ゅ��(1000mm)淇]"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Diameter), ePropStatus.Lack, "[鎹㈢儹鍣╙[鐩村緞][鍐呭緞]瑙f瀽閿欒锛屼娇鐢ㄩ粯璁ゅ��(1000mm)淇]"); } #endregion @@ -4797,18 +4797,18 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Abnormal, "[闀垮害]缂哄皯鎴栬�呮牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[闀垮害]缂哄皯鎴栬�呮牸寮忛敊璇�"); } if (exchanger.Length <= 0) { if (exchanger.StartPosition != null && exchanger.EndPosition != null) { exchanger.Length = exchanger.StartPosition.Distance(exchanger.EndPosition); - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Lack, "[闀垮害]缂虹渷锛岄�氳繃浣嶇疆鑷姩璁$畻"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Lack, "[鎹㈢儹鍣╙[闀垮害]缂虹渷锛岄�氳繃浣嶇疆鑷姩璁$畻"); } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Abnormal, "[闀垮害]鍙梉杩炴帴鍒楄〃]褰卞搷鏃犳硶鑷姩璁$畻"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Length), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[闀垮害]鍙梉杩炴帴鍒楄〃]褰卞搷鏃犳硶鑷姩璁$畻"); } } @@ -4822,13 +4822,13 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Roughness), ePropStatus.Abnormal, "[绮楃硻绯绘暟]缂哄皯鎴栬�呮暟鎹牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Roughness), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[绮楃硻绯绘暟]缂哄皯鎴栬�呮暟鎹牸寮忛敊璇�"); } if (exchanger.Roughness < 0.1) { exchanger.Roughness = 110; - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Roughness), ePropStatus.Lack, "[绮楃硻绯绘暟]瑙f瀽閿欒锛岄�氳繃榛樿鍊�(110)杩涜淇"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.Roughness), ePropStatus.Lack, "[鎹㈢儹鍣╙[绮楃硻绯绘暟]瑙f瀽閿欒锛岄�氳繃榛樿鍊�(110)杩涜淇"); } #endregion @@ -4841,7 +4841,7 @@ } else { - exchanger.AppendOrUpdatePropStatus(nameof(exchanger.MinorLoss), ePropStatus.Abnormal, "[灞�閮ㄩ樆鍔涚郴鏁癩缂哄皯鎴栬�呮暟鎹牸寮忛敊璇�"); + exchanger.AppendOrUpdatePropStatus(nameof(exchanger.MinorLoss), ePropStatus.Abnormal, "[鎹㈢儹鍣╙[灞�閮ㄩ樆鍔涚郴鏁癩缂哄皯鎴栬�呮暟鎹牸寮忛敊璇�"); } #endregion @@ -5213,6 +5213,7 @@ if (pump.RatedHz < 1) { + pump.RatedHz = 50; pump.AppendOrUpdatePropStatus(nameof(pump.RatedHz), ePropStatus.Lack, "[棰濆畾棰戠巼]缂虹渷锛屼娇鐢ㄩ粯璁ゅ��(50Hz)杩涜淇"); } -- Gitblit v1.9.3