冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/04-set/SetHydroWorkingViewModel.cs

@@ -15,14 +15,29 @@
        }

        /// <summary>
        /// 
        /// </summary>
        public SetHydroWorkingViewModel(Yw.Model.HydroModelInfo hydroInfo, List<HydroWorkingVmo> allWorkingList, List<HydroMonitorValueViewModel> allMonitorValueList)
        {
            this.ModelID = hydroInfo.ID;
            var workingNames = allWorkingList?.Select(x => x.Name).Distinct().ToList();
            this.Name = Yw.Untity.UniqueHelper.CreateFromFirst("工况", workingNames);
            this.WorkingInfo = new HydroWorkingInfoViewModel();
            this.MonitorInfo = new List<HydroWorkingMonitorViewModel>();
            allMonitorValueList?.ForEach(x => this.MonitorInfo.Add(new HydroWorkingMonitorViewModel(x)));
            this.SortCode = allWorkingList == null || allWorkingList.Count < 1 ? 1 : allWorkingList.Max(x => x.SortCode) + 1;
            this.Description = string.Empty;
        }

        /// <summary>
        /// 模型id
        /// </summary>
        public long ModelID { get; set; }

        /// <summary>
        /// 名称
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// 说明
        /// </summary>
        public string Description { get; set; }

        /// <summary>
        /// 工况信息
@@ -30,9 +45,23 @@
        public HydroWorkingInfoViewModel WorkingInfo { get; set; }

        /// <summary>
        /// 
        /// 监测信息
        /// </summary>
        public List<HydroWorkingMonitorViewModel> MonitorInfo { get; set; }

        /// <summary>
        /// 排序码
        /// </summary>
        public int SortCode { get; set; }

        /// <summary>
        /// 说明
        /// </summary>
        public string Description { get; set; }





    }
}