Эх сурвалжийг харах

Fix 自己算Energy Power 條件

Jessica Tseng 3 жил өмнө
parent
commit
d62849bd63

+ 11 - 2
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -206,7 +206,16 @@ namespace EVCB_OCPP.WSServer.Message
                                 {
                                     foreach (var item in _request.meterValue)
                                     {
-                                        int registerCount = item.sampledValue.Where(x => x.measurand == Measurand.Energy_Active_Import_Register).ToList().Count;
+                                        int registerCount = item.sampledValue.Where(x => x.measurand == Measurand.Energy_Active_Import_Interval).ToList().Count;
+                                        if (registerCount > 0)
+                                        {
+                                            registerCount = 0;
+                                        }
+                                        else
+                                        {
+                                            registerCount = item.sampledValue.Where(x => x.measurand == Measurand.Energy_Active_Import_Register).ToList().Count;
+                                        }
+                                       
                                         if (registerCount > 0)
                                         {
                                             string voltage_text = item.sampledValue.Where(x => x.measurand == Measurand.Voltage).Select(x => x.value).FirstOrDefault();
@@ -220,7 +229,7 @@ namespace EVCB_OCPP.WSServer.Message
                                             {
                                                 meterStart = maindb.TransactionRecord.Where(x => x.Id == _request.transactionId.Value).Select(x => x.MeterStart).FirstOrDefault();
                                             }
-                                           
+
                                             item.sampledValue.Add(new SampledValue()
                                             {
                                                 context = ReadingContext.Sample_Periodic,

+ 1 - 1
EVCB_OCPP.WSServer/Properties/AssemblyInfo.cs

@@ -35,4 +35,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("4a3e9b9")]
+[assembly: AssemblyInformationalVersion("62947b8")]