Browse Source

1. Fix 回傳客戶端時間格式

Jessica Tseng 2 years ago
parent
commit
a8c4cf6048

+ 8 - 2
EVCB_OCPP.TaskScheduler/DefaultSetting.cs

@@ -11,12 +11,18 @@ namespace EVCB_OCPP.TaskScheduler
     {
 
         public static readonly int DB_DefaultConnectionTimeout = 60;
-        public static readonly string UTC_DATETIMEFORMAT = "yyyy/MM/dd'T'HH':'mm':'ss'Z'";
+        public static readonly string UTC_DATETIMEFORMAT = "yyyy-MM-dd'T'HH':'mm':'ss'Z'";
+
         /// <summary>
         /// 預設 Null的 DateTime 
         /// </summary>
         public static DateTime DefaultNullTime = new DateTime(1991, 1, 1);
 
-        public static JsonSerializerSettings JSONSERIALIZER_FORMAT = new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore, Formatting = Formatting.None };
+        public static JsonSerializerSettings JSONSERIALIZER_FORMAT = new JsonSerializerSettings()
+        {
+            NullValueHandling = NullValueHandling.Ignore,
+            Formatting = Formatting.None,
+            DateFormatString = UTC_DATETIMEFORMAT
+        };
     }
 }

+ 3 - 3
EVCB_OCPP.TaskScheduler/Services/CommonCustomerService.cs

@@ -119,7 +119,7 @@ namespace EVCB_OCPP.TaskScheduler.Services
                                 SessionId = r.Id,
                                 MeterStart = r.MeterStart,
                                 IdTag = r.StartIdTag,
-                                StartTime = r.StartTime.ToString(DefaultSetting.UTC_DATETIMEFORMAT),
+                                StartTime = r.StartTime,
                                 ReservationId = r.ReservationId
                             };
 
@@ -243,8 +243,8 @@ namespace EVCB_OCPP.TaskScheduler.Services
                                     MeterStart = r.MeterStart,
                                     MeterStop = r.MeterStop,
                                     IdTag = r.StartIdTag,
-                                    StartTime = r.StartTime.ToString(DefaultSetting.UTC_DATETIMEFORMAT),
-                                    StopTime = r.StopTime.ToString(DefaultSetting.UTC_DATETIMEFORMAT),
+                                    StartTime = r.StartTime,
+                                    StopTime = r.StopTime,
                                     StopReason = r.StopReasonId < 1 ? "Unknown" : (r.StopReasonId > 12 ? "Unknown" : ((Reason)r.StopReasonId).ToString()),
                                     ReservationId=r.ReservationId,
                                     Receipt = r.Receipt,