diff --git a/shuibiao/.vs/ShuiBiao/FileContentIndex/60bc20db-6ffb-4de9-b349-61e88c3d0425.vsidx b/shuibiao/.vs/ShuiBiao/FileContentIndex/351dc33f-0bd3-4011-a13d-bfa8b49dcec3.vsidx similarity index 69% rename from shuibiao/.vs/ShuiBiao/FileContentIndex/60bc20db-6ffb-4de9-b349-61e88c3d0425.vsidx rename to shuibiao/.vs/ShuiBiao/FileContentIndex/351dc33f-0bd3-4011-a13d-bfa8b49dcec3.vsidx index cc03edf..6cc0c97 100644 Binary files a/shuibiao/.vs/ShuiBiao/FileContentIndex/60bc20db-6ffb-4de9-b349-61e88c3d0425.vsidx and b/shuibiao/.vs/ShuiBiao/FileContentIndex/351dc33f-0bd3-4011-a13d-bfa8b49dcec3.vsidx differ diff --git a/shuibiao/.vs/ShuiBiao/FileContentIndex/c9182b59-6bca-4afb-86e0-29b602155114.vsidx b/shuibiao/.vs/ShuiBiao/FileContentIndex/c9182b59-6bca-4afb-86e0-29b602155114.vsidx new file mode 100644 index 0000000..92a5868 Binary files /dev/null and b/shuibiao/.vs/ShuiBiao/FileContentIndex/c9182b59-6bca-4afb-86e0-29b602155114.vsidx differ diff --git a/shuibiao/.vs/ShuiBiao/FileContentIndex/d32e8f2f-1b91-40e3-8fe3-62670cb7fb15.vsidx b/shuibiao/.vs/ShuiBiao/FileContentIndex/d32e8f2f-1b91-40e3-8fe3-62670cb7fb15.vsidx deleted file mode 100644 index 879beaa..0000000 Binary files a/shuibiao/.vs/ShuiBiao/FileContentIndex/d32e8f2f-1b91-40e3-8fe3-62670cb7fb15.vsidx and /dev/null differ diff --git a/shuibiao/.vs/ShuiBiao/FileContentIndex/ec7f99a4-7bb8-429e-86f0-141a9ee63918.vsidx b/shuibiao/.vs/ShuiBiao/FileContentIndex/ec7f99a4-7bb8-429e-86f0-141a9ee63918.vsidx deleted file mode 100644 index a7246f2..0000000 Binary files a/shuibiao/.vs/ShuiBiao/FileContentIndex/ec7f99a4-7bb8-429e-86f0-141a9ee63918.vsidx and /dev/null differ diff --git a/shuibiao/.vs/ShuiBiao/FileContentIndex/f35a26d8-ae7c-4afe-a4d0-4d1b53f9df68.vsidx b/shuibiao/.vs/ShuiBiao/FileContentIndex/f35a26d8-ae7c-4afe-a4d0-4d1b53f9df68.vsidx new file mode 100644 index 0000000..662f4ce Binary files /dev/null and b/shuibiao/.vs/ShuiBiao/FileContentIndex/f35a26d8-ae7c-4afe-a4d0-4d1b53f9df68.vsidx differ diff --git a/shuibiao/.vs/ShuiBiao/v17/.suo b/shuibiao/.vs/ShuiBiao/v17/.suo index ffce447..1e567db 100644 Binary files a/shuibiao/.vs/ShuiBiao/v17/.suo and b/shuibiao/.vs/ShuiBiao/v17/.suo differ diff --git a/shuibiao/ShuiBiao.cs b/shuibiao/ShuiBiao.cs index 2ae5da1..79dd567 100644 --- a/shuibiao/ShuiBiao.cs +++ b/shuibiao/ShuiBiao.cs @@ -69,7 +69,7 @@ namespace ShuiBiao })); - //开启输入任务 + ////开启输入任务 //Task.Run(new Action(() => //{ // BaudRate(); @@ -1376,7 +1376,7 @@ namespace ShuiBiao Console.WriteLine("瞬时流量" + _instantaneousFlow.ToString() + "m³/h"); wd.instantaneous_delivery = (decimal)_instantaneousFlow; Console.WriteLine("累积流量:" + positiveFlow + "m³"); - + wd.integrated_flux = positiveFlow; Console.WriteLine("水温:" + _waterTemperature + "℃"); wd.water_temperature = (decimal)_waterTemperature; Console.WriteLine("累积运行时间:" + RunTime + "h"); diff --git a/shuibiao/bin/Debug/ShuiBiao.exe b/shuibiao/bin/Debug/ShuiBiao.exe index 559f4bb..2e09197 100644 Binary files a/shuibiao/bin/Debug/ShuiBiao.exe and b/shuibiao/bin/Debug/ShuiBiao.exe differ diff --git a/shuibiao/bin/Debug/ShuiBiao.pdb b/shuibiao/bin/Debug/ShuiBiao.pdb index 83e2fc4..aaf0301 100644 Binary files a/shuibiao/bin/Debug/ShuiBiao.pdb and b/shuibiao/bin/Debug/ShuiBiao.pdb differ diff --git a/shuibiao/obj/Debug/ShuiBiao.exe b/shuibiao/obj/Debug/ShuiBiao.exe index 559f4bb..2e09197 100644 Binary files a/shuibiao/obj/Debug/ShuiBiao.exe and b/shuibiao/obj/Debug/ShuiBiao.exe differ diff --git a/shuibiao/obj/Debug/ShuiBiao.pdb b/shuibiao/obj/Debug/ShuiBiao.pdb index 83e2fc4..aaf0301 100644 Binary files a/shuibiao/obj/Debug/ShuiBiao.pdb and b/shuibiao/obj/Debug/ShuiBiao.pdb differ diff --git a/shuibiao/water_data.cs b/shuibiao/water_data.cs index d6d871e..3769a45 100644 --- a/shuibiao/water_data.cs +++ b/shuibiao/water_data.cs @@ -33,7 +33,8 @@ namespace DataService.Model private string _version_number; private decimal? _instantaneous_delivery; private string _transient_flow_symbol; - private decimal? _cumulative_running_time; + private decimal? _integrated_flux; + private decimal? _cumulative_running_time; private decimal? _positive_cumulative_traffic; private decimal? _positive_cumulative_run_time; private decimal? _negative_cumulative_traffic; @@ -108,6 +109,14 @@ namespace DataService.Model get{return _transient_flow_symbol;} } /// + /// 累积流量 + /// + public decimal? integrated_flux + { + set { _integrated_flux = value; } + get { return _integrated_flux; } + } + /// /// 累积运行时间 /// public decimal? cumulative_running_time @@ -204,7 +213,7 @@ namespace DataService.Model get{return _acquisition_time;} } /// - /// 诊断代码 + /// 采集时间 /// public string diagnostic_code { @@ -251,20 +260,22 @@ namespace DataService.Model set{ _r3=value;} get{return _r3;} } + /// + /// 通过验证 + /// + public bool IsValid + { + get;set; + } + /// + /// 采集时间(字符串) + /// + public string acquisition_timeA + { + get;set; + } #endregion Model - - private bool _isValid; - /// - /// 数据是否有效 - /// - public bool IsValid { get { return _isValid; } set { _isValid = value; } } - - private string _acquisition_timeA; - /// - /// 采集时间 - /// - public string acquisition_timeA { get { return _acquisition_timeA; } set { _acquisition_timeA = value; } } } }