فهرست منبع

1. 新增ID_ReaderStatus DataTransfer
2. 關掉 氣象Trigger debuglog

Jessica Tseng 3 سال پیش
والد
کامیت
0f7be57015

+ 31 - 7
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -40,6 +40,22 @@ namespace EVCB_OCPP.WSServer.Message
 
         public string approvalNo { set; get; }
 
+    }
+
+    public class ID_ReaderStatus
+    {
+        public int ConnectorId { set; get; }
+
+        public string creditNo { set; get; }
+
+
+        public string SerialNo { set; get; }
+
+        public int readerStatus { set; get; }
+
+
+
+
     }
 
     internal partial class ProfileHandler
@@ -63,10 +79,12 @@ namespace EVCB_OCPP.WSServer.Message
                     case Actions.DataTransfer:
                         {
                             DataTransferRequest _request = request as DataTransferRequest;
-                            var creditDeductResult = JsonConvert.DeserializeObject<ID_CreditDeductResult>(_request.data);
-                            var confirm = new DataTransferConfirmation() { status = DataTransferStatus.Accepted };
+                            var confirm = new DataTransferConfirmation() { status = DataTransferStatus.UnknownMessageId };
+
                             if (_request.messageId == "ID_CreditDeductResult")
                             {
+                               
+                                var creditDeductResult = JsonConvert.DeserializeObject<ID_CreditDeductResult>(_request.data);
                                 if (session.CustomerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8"))
                                 {
                                     var report = new
@@ -76,7 +94,7 @@ namespace EVCB_OCPP.WSServer.Message
                                         CreditNo = creditDeductResult.creditNo,
                                         DeductResult = creditDeductResult.deductResult,
                                         SessionId = creditDeductResult.txId,
-                                        ApprovalNo= creditDeductResult.approvalNo,
+                                        ApprovalNo = creditDeductResult.approvalNo,
                                         TotalCost = creditDeductResult.amount,
 
                                     };
@@ -92,12 +110,18 @@ namespace EVCB_OCPP.WSServer.Message
                                 }
 
 
-
+                                confirm.status = DataTransferStatus.Accepted;
                                 confirm.data = JsonConvert.SerializeObject(new { txId = creditDeductResult.txId, creditNo = creditDeductResult.creditNo, msgId = _request.messageId });
                             }
-
-
-
+                            if (_request.messageId == "ID_ReaderStatus")
+                            {
+                                if (session.CustomerId == new Guid("009E603C-79CD-4620-A2B8-D9349C0E8AD8"))
+                                {                                   
+                                    var creditDeductResult = JsonConvert.DeserializeObject<ID_ReaderStatus>(_request.data);
+                                    logger.Debug(JsonConvert.SerializeObject(creditDeductResult));
+                                    confirm.status = DataTransferStatus.Accepted;
+                                }    
+                            }
                             result.Message = confirm;
                             result.Success = true;
                         }

+ 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("2b889db")]
+[assembly: AssemblyInformationalVersion("defcf52")]

+ 1 - 1
EVCB_OCPP.WSServer/ProtalServer.cs

@@ -1513,7 +1513,7 @@ namespace EVCB_OCPP.WSServer
 
                 if (min_Interval > 30)
                 {
-                    Console.WriteLine("in...............ServerWeatherNotificationTrigger");
+                   // Console.WriteLine("in...............ServerWeatherNotificationTrigger");
                     BasicMessageHandler msgAnalyser = new BasicMessageHandler();
                     Dictionary<string, ClientData> _copyClientDic = null;
                     lock (_lockClientDic)