01-api/Application/IStation.Application/01-open-api/01-schedule/Schedule_Controller.cs
@@ -188,8 +188,9 @@ }; schedule_pump_list1 = new List<Model.SchedulePump>(); output.objects["1输水总流量"] = optimal_combine1.TotalFlow; output.objects["1输水总压力"] = Math.Round(Curve.PumpCalculateHelper.M2Mpa(optimal_combine1.TotalPressure), 4); // 20250422 修改原因,水中心直接拿我的理论值套到调度上了，我返回原值给他们 output.objects["1输水总流量"] = target_flow1; output.objects["1输水总压力"] = target_mpa_pressure1; output.objects["1输水总功率"] = optimal_combine1.TotalPower; output.objects["1输水总效率"] = optimal_combine1.TotalEfficiency; output.objects["1输水总千吨能耗"] = optimal_combine1.WP; @@ -270,6 +271,8 @@ } else { output.objects["1输水总流量"] = target_flow1; output.objects["1输水总压力"] = target_mpa_pressure1; msg += $" 1输水调度计算失败，无法满足目标流量:{target_flow1},目标压力:{target_mpa_pressure1}!"; } @@ -292,8 +295,8 @@ }; schedule_pump_list2 = new List<Model.SchedulePump>(); output.objects["2输水总流量"] = optimal_combine2.TotalFlow; output.objects["2输水总压力"] = Math.Round(Curve.PumpCalculateHelper.M2Mpa(optimal_combine2.TotalPressure), 4); output.objects["2输水总流量"] = target_flow2; output.objects["2输水总压力"] = target_mpa_pressure2; output.objects["2输水总功率"] = optimal_combine2.TotalPower; output.objects["2输水总效率"] = optimal_combine2.TotalEfficiency; output.objects["2输水总千吨能耗"] = optimal_combine2.WP; @@ -369,6 +372,8 @@ } else { output.objects["2输水总流量"] = target_flow2; output.objects["2输水总压力"] = target_mpa_pressure2; msg += $" 2输水调度计算失败，无法满足目标流量:{target_flow2},目标压力:{target_mpa_pressure2}!"; } } 01-api/Entry/IStation.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ <Project> <PropertyGroup> <_PublishTargetUrl>D:\WorkCode\Project\ChDt1\Schedule.Ch.V1.0\01-api\Entry\IStation.Entry\bin\Release\net6.0\publish\</_PublishTargetUrl> <History>True|2025-04-17T02:17:40.2265253Z||;True|2025-03-06T12:22:24.3024074+08:00||;True|2025-02-19T13:26:43.5272277+08:00||;True|2025-02-19T13:25:05.8482250+08:00||;True|2025-02-11T12:56:06.0150407+08:00||;True|2025-02-11T12:53:25.2984928+08:00||;True|2025-02-11T12:53:07.8461804+08:00||;True|2025-02-11T12:25:40.4739526+08:00||;True|2025-02-11T12:15:43.0779684+08:00||;True|2025-02-11T11:24:38.9435901+08:00||;True|2025-02-11T10:07:09.9907346+08:00||;True|2025-02-11T10:06:24.2854311+08:00||;True|2024-12-05T13:41:38.8531031+08:00||;True|2024-11-09T09:37:13.3682027+08:00||;True|2024-11-06T17:38:55.4076801+08:00||;True|2024-11-06T17:09:19.3816798+08:00||;True|2024-11-05T13:14:01.6952365+08:00||;True|2024-10-29T17:47:24.1461492+08:00||;True|2024-10-29T17:44:54.7943890+08:00||;True|2024-10-29T14:23:21.2176559+08:00||;True|2024-10-28T13:23:34.4772009+08:00||;True|2024-10-28T09:52:02.6105686+08:00||;True|2024-10-21T13:45:41.4184337+08:00||;False|2024-10-21T13:45:28.6526687+08:00||;True|2024-10-21T13:44:32.5042437+08:00||;True|2024-10-21T13:43:41.9121028+08:00||;True|2024-10-21T12:21:54.3858141+08:00||;True|2024-10-21T12:21:49.0790357+08:00||;True|2024-10-21T12:21:38.3606377+08:00||;True|2024-10-21T10:41:49.7087919+08:00||;True|2024-10-21T10:22:56.7510287+08:00||;True|2024-10-21T10:20:14.9765083+08:00||;True|2024-09-04T12:23:06.8396065+08:00||;True|2024-09-04T12:21:53.1509115+08:00||;True|2024-09-04T12:03:26.9628398+08:00||;True|2024-09-04T11:57:24.6077432+08:00||;True|2024-09-04T10:44:08.5232129+08:00||;True|2024-09-04T10:31:08.0493769+08:00||;True|2024-08-27T10:39:49.3050134+08:00||;True|2024-08-15T10:51:00.0736675+08:00||;True|2024-08-07T10:34:56.6363692+08:00||;True|2024-08-07T10:23:23.5959249+08:00||;True|2024-08-07T10:18:55.3553323+08:00||;True|2024-08-05T10:03:03.1020499+08:00||;True|2024-08-05T10:00:42.1282571+08:00||;True|2024-08-01T17:23:11.3983389+08:00||;True|2024-08-01T17:22:31.0342192+08:00||;True|2024-08-01T17:20:38.4331763+08:00||;True|2024-07-25T13:35:25.1478492+08:00||;True|2024-07-16T17:39:33.3835168+08:00||;True|2024-07-16T17:14:00.9398568+08:00||;False|2024-07-16T17:13:27.9996953+08:00||;True|2024-07-16T13:09:16.9500768+08:00||;True|2024-07-15T12:48:47.2966278+08:00||;False|2024-07-15T12:48:32.1828646+08:00||;True|2024-07-12T16:40:50.3694799+08:00||;True|2024-07-12T10:40:34.0007726+08:00||;True|2024-07-12T10:36:32.4601011+08:00||;True|2024-07-12T10:33:14.3243625+08:00||;True|2024-07-11T14:10:11.4665289+08:00||;True|2024-07-11T14:08:13.0064903+08:00||;True|2024-07-11T14:06:32.4662645+08:00||;True|2024-07-09T09:51:25.7986637+08:00||;False|2024-07-09T09:50:56.5778877+08:00||;False|2024-07-09T09:50:23.0123211+08:00||;True|2024-06-26T16:20:21.3981649+08:00||;False|2024-06-26T16:19:59.2162840+08:00||;True|2024-06-26T15:20:17.9242271+08:00||;True|2024-06-19T15:01:43.3271769+08:00||;True|2024-06-18T09:51:50.4178295+08:00||;True|2024-06-18T09:41:19.5989782+08:00||;True|2024-06-18T09:41:10.7867036+08:00||;True|2024-06-18T09:38:57.0128861+08:00||;True|2024-06-17T15:22:17.6153518+08:00||;False|2024-06-17T15:22:01.3404718+08:00||;True|2024-06-13T11:15:55.4873247+08:00||;True|2024-06-13T11:14:52.9075916+08:00||;True|2024-06-13T10:09:13.5966875+08:00||;True|2024-06-13T09:58:26.1880685+08:00||;True|2024-06-13T09:49:29.6928004+08:00||;True|2024-06-13T09:46:16.2707476+08:00||;True|2024-05-30T14:57:39.3412922+08:00||;True|2024-05-30T11:59:44.7664433+08:00||;True|2024-05-30T11:53:59.9799057+08:00||;True|2024-05-30T11:21:35.4761141+08:00||;True|2024-05-30T11:16:55.6157765+08:00||;True|2024-05-30T11:07:45.8336241+08:00||;True|2024-05-30T10:59:58.8877118+08:00||;True|2024-05-30T10:36:09.0290592+08:00||;True|2024-05-30T10:35:17.5448779+08:00||;True|2024-05-27T17:06:29.6833574+08:00||;False|2024-05-27T17:06:07.6398727+08:00||;False|2024-05-27T17:05:20.1523960+08:00||;False|2024-05-27T17:05:04.1140399+08:00||;False|2024-05-27T17:04:44.5872009+08:00||;True|2024-05-11T15:21:00.4779174+08:00||;True|2024-04-23T10:14:25.7074885+08:00||;True|2024-04-22T16:37:12.5852855+08:00||;True|2024-04-22T16:34:52.0894541+08:00||;True|2024-04-19T10:53:01.1630050+08:00||;</History> <History>True|2025-04-22T06:15:41.9098260Z||;True|2025-04-22T14:08:13.4006900+08:00||;True|2025-04-17T10:17:40.2265253+08:00||;True|2025-03-06T12:22:24.3024074+08:00||;True|2025-02-19T13:26:43.5272277+08:00||;True|2025-02-19T13:25:05.8482250+08:00||;True|2025-02-11T12:56:06.0150407+08:00||;True|2025-02-11T12:53:25.2984928+08:00||;True|2025-02-11T12:53:07.8461804+08:00||;True|2025-02-11T12:25:40.4739526+08:00||;True|2025-02-11T12:15:43.0779684+08:00||;True|2025-02-11T11:24:38.9435901+08:00||;True|2025-02-11T10:07:09.9907346+08:00||;True|2025-02-11T10:06:24.2854311+08:00||;True|2024-12-05T13:41:38.8531031+08:00||;True|2024-11-09T09:37:13.3682027+08:00||;True|2024-11-06T17:38:55.4076801+08:00||;True|2024-11-06T17:09:19.3816798+08:00||;True|2024-11-05T13:14:01.6952365+08:00||;True|2024-10-29T17:47:24.1461492+08:00||;True|2024-10-29T17:44:54.7943890+08:00||;True|2024-10-29T14:23:21.2176559+08:00||;True|2024-10-28T13:23:34.4772009+08:00||;True|2024-10-28T09:52:02.6105686+08:00||;True|2024-10-21T13:45:41.4184337+08:00||;False|2024-10-21T13:45:28.6526687+08:00||;True|2024-10-21T13:44:32.5042437+08:00||;True|2024-10-21T13:43:41.9121028+08:00||;True|2024-10-21T12:21:54.3858141+08:00||;True|2024-10-21T12:21:49.0790357+08:00||;True|2024-10-21T12:21:38.3606377+08:00||;True|2024-10-21T10:41:49.7087919+08:00||;True|2024-10-21T10:22:56.7510287+08:00||;True|2024-10-21T10:20:14.9765083+08:00||;True|2024-09-04T12:23:06.8396065+08:00||;True|2024-09-04T12:21:53.1509115+08:00||;True|2024-09-04T12:03:26.9628398+08:00||;True|2024-09-04T11:57:24.6077432+08:00||;True|2024-09-04T10:44:08.5232129+08:00||;True|2024-09-04T10:31:08.0493769+08:00||;True|2024-08-27T10:39:49.3050134+08:00||;True|2024-08-15T10:51:00.0736675+08:00||;True|2024-08-07T10:34:56.6363692+08:00||;True|2024-08-07T10:23:23.5959249+08:00||;True|2024-08-07T10:18:55.3553323+08:00||;True|2024-08-05T10:03:03.1020499+08:00||;True|2024-08-05T10:00:42.1282571+08:00||;True|2024-08-01T17:23:11.3983389+08:00||;True|2024-08-01T17:22:31.0342192+08:00||;True|2024-08-01T17:20:38.4331763+08:00||;True|2024-07-25T13:35:25.1478492+08:00||;True|2024-07-16T17:39:33.3835168+08:00||;True|2024-07-16T17:14:00.9398568+08:00||;False|2024-07-16T17:13:27.9996953+08:00||;True|2024-07-16T13:09:16.9500768+08:00||;True|2024-07-15T12:48:47.2966278+08:00||;False|2024-07-15T12:48:32.1828646+08:00||;True|2024-07-12T16:40:50.3694799+08:00||;True|2024-07-12T10:40:34.0007726+08:00||;True|2024-07-12T10:36:32.4601011+08:00||;True|2024-07-12T10:33:14.3243625+08:00||;True|2024-07-11T14:10:11.4665289+08:00||;True|2024-07-11T14:08:13.0064903+08:00||;True|2024-07-11T14:06:32.4662645+08:00||;True|2024-07-09T09:51:25.7986637+08:00||;False|2024-07-09T09:50:56.5778877+08:00||;False|2024-07-09T09:50:23.0123211+08:00||;True|2024-06-26T16:20:21.3981649+08:00||;False|2024-06-26T16:19:59.2162840+08:00||;True|2024-06-26T15:20:17.9242271+08:00||;True|2024-06-19T15:01:43.3271769+08:00||;True|2024-06-18T09:51:50.4178295+08:00||;True|2024-06-18T09:41:19.5989782+08:00||;True|2024-06-18T09:41:10.7867036+08:00||;True|2024-06-18T09:38:57.0128861+08:00||;True|2024-06-17T15:22:17.6153518+08:00||;False|2024-06-17T15:22:01.3404718+08:00||;True|2024-06-13T11:15:55.4873247+08:00||;True|2024-06-13T11:14:52.9075916+08:00||;True|2024-06-13T10:09:13.5966875+08:00||;True|2024-06-13T09:58:26.1880685+08:00||;True|2024-06-13T09:49:29.6928004+08:00||;True|2024-06-13T09:46:16.2707476+08:00||;True|2024-05-30T14:57:39.3412922+08:00||;True|2024-05-30T11:59:44.7664433+08:00||;True|2024-05-30T11:53:59.9799057+08:00||;True|2024-05-30T11:21:35.4761141+08:00||;True|2024-05-30T11:16:55.6157765+08:00||;True|2024-05-30T11:07:45.8336241+08:00||;True|2024-05-30T10:59:58.8877118+08:00||;True|2024-05-30T10:36:09.0290592+08:00||;True|2024-05-30T10:35:17.5448779+08:00||;True|2024-05-27T17:06:29.6833574+08:00||;False|2024-05-27T17:06:07.6398727+08:00||;False|2024-05-27T17:05:20.1523960+08:00||;False|2024-05-27T17:05:04.1140399+08:00||;False|2024-05-27T17:04:44.5872009+08:00||;True|2024-05-11T15:21:00.4779174+08:00||;True|2024-04-23T10:14:25.7074885+08:00||;True|2024-04-22T16:37:12.5852855+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> 01-api/Service/IStation.Service/07-helper/02-schedule/ScheduleHelper.cs
@@ -90,7 +90,7 @@ _frequency_limit_list = schedule_config.FrequencyLimitList; _flag_cumulative_runtime_dict = schedule_config.FlagCumulativeRuntimeDict; _priority_open_flag_list = schedule_config.PriorityOpenFlagList; _maintenance_flag_list = schedule_config.MaintenanceFlagList; _maintenance_flag_list = schedule_config.MaintenanceFlagList; } _analysis_deviation_list = analysis_deviation_list; @@ -117,7 +117,7 @@ ) { //获取方案时用补差的流量，供水限制用目标流量判断 var target_flow_compensation = target_flow + _station_target_flow_diff; var target_flow_compensation = target_flow + _station_target_flow_diff; #region 初始化参数 if (pump_list == null || !pump_list.Any()) { @@ -283,7 +283,7 @@ target_flow_compensation, target_pressure ); if (opt_ana_combine != null) if (opt_ana_combine != null) return opt_ana_combine; } }
