理论功率曲线

.idea/workspace.xml

@@ -19,7 +19,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="310b6a4c-4135-449b-afd6-517c645bb1a2" name="Default Changelist" comment="" />
+    <list default="true" id="310b6a4c-4135-449b-afd6-517c645bb1a2" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/NEIntelligentControl2/Service/AGC/AGCManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/NEIntelligentControl2/Service/AGC/AGCManager.cs" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -55,6 +58,8 @@
       <workItem from="1698153787270" duration="1219000" />
       <workItem from="1698386696735" duration="2000" />
       <workItem from="1698387035263" duration="7820000" />
+      <workItem from="1698406449847" duration="45000" />
+      <workItem from="1699332715969" duration="27000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1698154296073</created>
@@ -77,7 +82,14 @@
       <option name="project" value="LOCAL" />
       <updated>1698399631728</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="3">
+      <created>1698406481325</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1698406481325</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -93,22 +105,24 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="1" />
     <MESSAGE value="ackages" />
     <MESSAGE value="2" />
-    <option name="LAST_COMMIT_MESSAGE" value="2" />
+    <MESSAGE value="3" />
+    <option name="LAST_COMMIT_MESSAGE" value="3" />
   </component>
   <component name="WindowStateProjectService">
     <state x="740" y="256" key="FileChooserDialogImpl" timestamp="1698153965183">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
     <state x="740" y="256" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1698153965183" />
-    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1698399634151">
+    <state x="552" y="248" key="Vcs.Push.Dialog.v2" timestamp="1698406483674">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>
-    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1698399634151" />
+    <state x="552" y="248" key="Vcs.Push.Dialog.v2/0.0.1920.1032@0.0.1920.1032" timestamp="1698406483674" />
     <state x="761" y="422" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1698154200207">
       <screen x="0" y="0" width="1920" height="1032" />
     </state>

NEIntelligentControl2/Models/AGC/TagType.cs

@@ -23,6 +23,10 @@ namespace NEIntelligentControl2.Models.AGC
         /// <summary>
         /// 实发有功
         /// </summary>
-        ActualPower
+        ActualPower,
+        /// <summary>
+        /// 理论功率
+        /// </summary>
+        IdeaPower
     }
 }

NEIntelligentControl2/Models/AGC/ViewModel.cs

@@ -19,10 +19,13 @@ namespace NEIntelligentControl2.Models.AGC
         public List<TsData> ActPower { get => _ActPower; }
         private List<TsData> _PowerSet;// 有功设定数据
         public List<TsData> PowerSet { get => _PowerSet; }
+        private List<TsData> _IdeaPower;// 理论功率数据
+        public List<TsData> IdeaPower { get => _IdeaPower; }
 
 
         private LineSeries ls1;
         private LineSeries ls2;
+        private LineSeries ls3;
 
         public DateTimeAxis AxisX;
 
@@ -65,8 +68,11 @@ namespace NEIntelligentControl2.Models.AGC
             ls1.LegendKey = "power";
             ls2 = new LineSeries() { Title = "有功设定", Color = OxyColor.Parse("#FF31B9FB"), StrokeThickness = 1.5 };
             ls2.LegendKey = "power";
+            ls3 = new LineSeries() { Title = "理论功率", Color = OxyColor.Parse("#FFED937F"), StrokeThickness = 1.5 };
+            ls3.LegendKey = "power";
             Series.Add(ls1);
             Series.Add(ls2);
+            Series.Add(ls3);
         }
 
         /// <summary>
@@ -90,11 +96,16 @@ namespace NEIntelligentControl2.Models.AGC
                 _PowerSet = arg2;
                 AddData(ls2, arg2);
             }
-            else
+            else if(arg1.Type == TagType.ActualPower)
             {
                 _ActPower = arg2;
                 AddData(ls1, arg2);
             }
+            else
+            {
+                _IdeaPower = arg2;
+                AddData(ls3, arg2);
+            }
             var dt = DateTime.Now;
 
             AxisX.AbsoluteMinimum = DateTimeAxis.ToDouble(dt.AddHours(-8));

NEIntelligentControl2/Service/AGC/AGCManager.cs

@@ -177,7 +177,7 @@ namespace NEIntelligentControl2.Service.AGC
             }
             catch (Exception ex)
             {
-                log.Error("曲线上面" + ex.Message);
+                log.Error("曲线上面" + ex.Message+ _DataUrl);
             }
         }