From d5a3d08601fa59498edc092cec23c7ca166a0d15 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 02 九月 2022 09:44:48 +0800 Subject: [PATCH] 同步代码 --- Application/IStation.Application.Run/monitor_general_day_record/mgr/MonitorGeneralDayRecord_MgrController.cs | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Application/IStation.Application.Run/monitor_general_day_record/mgr/MonitorGeneralDayRecord_MgrController.cs b/Application/IStation.Application.Run/monitor_general_day_record/mgr/MonitorGeneralDayRecord_MgrController.cs index 8d701a1..b9db7c0 100644 --- a/Application/IStation.Application.Run/monitor_general_day_record/mgr/MonitorGeneralDayRecord_MgrController.cs +++ b/Application/IStation.Application.Run/monitor_general_day_record/mgr/MonitorGeneralDayRecord_MgrController.cs @@ -64,30 +64,33 @@ throw Oops.Oh(ErrorCodes.D002, $"娴嬬偣:{monitorId}", "鏈厤缃叕寮忓弬鏁�"); } - var getMonitorPoint = new Func<long, Model.MonitorPoint_Signal_SignalType>(x => { + var getMonitorPoint = new Func<long, Model.MonitorPoint_Signal_SignalType>(x => + { return new Service.MonitorPoint().GetExSignalWithSignalTypeByID(corpId, x); }); - var getLastRecord = new Func<long, long, Model.MonitorBasicRecord>((x, y) => { + var getLastRecord = new Func<long, long, Model.MonitorBasicRecord>((x, y) => + { return new Service.MonitorDayRecord().GetBySignalIDOfDay(corpId, x, y, startDay.AddDays(-1)); }); - var getRecordList = new Func<long, long,Model.Monitor.eCronType, DateTime,DateTime, List<Model.MonitorBasicRecord>>((x, y,cy, st,et) => { + var getRecordList = new Func<long, long, Model.Monitor.eCronType, DateTime, DateTime, List<Model.MonitorBasicRecord>>((x, y, cy, st, et) => + { switch (cy) { case Model.Monitor.eCronType.Real: { return new Service.MonitorRealRecord() - .GetBySignalIDOfTimeRange(corpId,x,y,st,et)?.Select(x=>x as Model.MonitorBasicRecord).ToList(); + .GetBySignalIDOfTimeRange(corpId, x, y, st, et)?.Select(x => x as Model.MonitorBasicRecord).ToList(); } case Model.Monitor.eCronType.EachHour: { return new Service.MonitorHourRecord().GetBySignalIDOfHourRange - (monitor.CorpID, x, y, st.Date, st.Hour + 1, et.AddHours(-1).Date, et.AddHours(-1).Hour + 1)?.Select(x=>x as Model.MonitorBasicRecord).ToList(); + (monitor.CorpID, x, y, st.Date, st.Hour + 1, et.AddHours(-1).Date, et.AddHours(-1).Hour + 1)?.Select(x => x as Model.MonitorBasicRecord).ToList(); } - default:return default; + default: return default; } }); - List<Model.MonitorDayRecordPure> recordList = null; + List<Model.MonitorDayRecordPure> recordList = null; string msg = string.Empty; switch (analyModel.FormulaType) { @@ -130,10 +133,7 @@ } var bol = new Service.MonitorDayRecord().InsertsAgain(recordList); return new AnalyAgainMonitorGeneralDayRecordOfDayRangeResultDto(bol, msg); - } - - - + } } } -- Gitblit v1.9.3