tangxu
2022-10-31 8ea88fedd51e4961d0fd0aec6c2873a579fb6db8
Calculation/IStation.Calculation.Dispatch/custom/shys/station/³¤Ð˵º/Current.cs
@@ -25,20 +25,21 @@
        public Model.CurrentRecordBundle GetCurrentRecord(long CorpID, long StationID, out string error_info)
        {
            error_info = null;
            var monitor_ids = new List<long>() { 70, 71, 72, 73, 76, 77, 79 };
            var monitor_ids = new List<long>() { _montiro_id_water_level, _monitor_id_中间阀门状态, _monitor_id_pipe_press1, _monitor_id_pipe_flow1,
                _monitor_id_pipe_press2, _monitor_id_pipe_flow2, 79 };
            var monitor_records = new Service.MonitorRecord().GetLastRecord(_corpID, monitor_ids);
            Model.CurrentRecordBundle bundle = new Model.CurrentRecordBundle();
            var water_level = monitor_records.Find(x => x.MonitorPointID == 70);
            var water_level = monitor_records.Find(x => x.MonitorPointID == _montiro_id_water_level);
            if (water_level != null)
            {
                bundle.WaterLevelList = new List<Model.CurrentRecordBundle.RecordValue>();
                bundle.WaterLevelList.Add(new Model.CurrentRecordBundle.RecordValue("进水液位", water_level, 2));
            }
            
            var pipe_press1 = monitor_records.Find(x => x.MonitorPointID == 72);
            var pipe_press2 = monitor_records.Find(x => x.MonitorPointID == 76);
            var pipe_press1 = monitor_records.Find(x => x.MonitorPointID == _monitor_id_pipe_press1);
            var pipe_press2 = monitor_records.Find(x => x.MonitorPointID == _monitor_id_pipe_press2);
            if (pipe_press1 != null && pipe_press2 != null)
            {
                bundle.PressList = new List<Model.CurrentRecordBundle.RecordValue>();
@@ -46,15 +47,15 @@
                bundle.PressList.Add(new Model.CurrentRecordBundle.RecordValue("二号管", pipe_press2, 4));
            }
            var pipe_flow1 = monitor_records.Find(x => x.MonitorPointID == 73);
            var pipe_flow2 = monitor_records.Find(x => x.MonitorPointID == 77);
            var pipe_flow1 = monitor_records.Find(x => x.MonitorPointID == _monitor_id_pipe_flow1);
            var pipe_flow2 = monitor_records.Find(x => x.MonitorPointID == _monitor_id_pipe_flow2);
            if (pipe_flow1 != null && pipe_flow2 != null)
            {
                bundle.FlowList = new List<Model.CurrentRecordBundle.RecordValue>();
                bundle.FlowList.Add(new Model.CurrentRecordBundle.RecordValue("一号管", pipe_flow1, 0));
                bundle.FlowList.Add(new Model.CurrentRecordBundle.RecordValue("二号管", pipe_flow2, 0));
                var middle_valve = monitor_records.Find(x => x.MonitorPointID == 71);
                var middle_valve = monitor_records.Find(x => x.MonitorPointID == _monitor_id_中间阀门状态);
                if (middle_valve != null)
                {
                    bundle.VavleOpenList = new List<Model.CurrentRecordBundle.RecordValue>();