2020/05/06 Jessica

Actions:
1.後台驗證邏輯(不透過ThirdParty)
2.Server 移除2分鐘沒有訊息傳遞的電樁

EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

@@ -141,7 +141,7 @@ namespace EVCB_OCPP.WSServer.Message
 
                         if (_request.status == Packet.Messages.SubTypes.ChargePointStatus.Faulted)
                         {
-                            var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString(), false);
+                            var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString());
                             businessService.NotifyFaultStatus(new ErrorDetails()
                             {
                                 ChargeBoxId = session.ChargeBoxId,
@@ -232,7 +232,7 @@ namespace EVCB_OCPP.WSServer.Message
                         int _transactionId = -1;
                         if (DateTime.Compare(DateTime.UtcNow.AddSeconds(-10), _request.timestamp.ToUniversalTime()) >= 0)
                         {
-                            var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString(), true);
+                            var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString());
                             _idTagInfo = businessService.Authorize(session.ChargeBoxId, _request.idTag);
 
                         }
@@ -297,7 +297,7 @@ namespace EVCB_OCPP.WSServer.Message
                         List<TransactionDataRecord> _TransactionDatas = new List<TransactionDataRecord>();
                         int _ConnectorId = 0;
 
-                        var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString(), true);
+                        var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString());
                         var _idTagInfo = businessService.Authorize(session.ChargeBoxId, _request.idTag);
 
                         using (var db = new MainDBContext())
@@ -380,7 +380,7 @@ namespace EVCB_OCPP.WSServer.Message
                 case Actions.Authorize:
                     {
                         AuthorizeRequest _request = request as AuthorizeRequest;
-                        var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString(), true);
+                        var businessService = BusinessServiceFactory.CreateBusinessService(session.CustomerId.ToString());
                         var confirm = new AuthorizeConfirmation()
                         {
                             idTagInfo = businessService.Authorize(session.ChargeBoxId, _request.idTag)

EVCB_OCPP.WSServer/ProtalServer.cs

@@ -113,8 +113,8 @@ namespace EVCB_OCPP.WSServer
             serverUpdateTask.Start();
 
 
-            //  Task serverHealthTask = new Task(HealthAlarmTrigger, _ct);
-            // serverHealthTask.Start();
+            Task serverHealthTask = new Task(HealthAlarmTrigger, _ct);
+            serverHealthTask.Start();
 
             while (true)
             {
@@ -327,6 +327,7 @@ namespace EVCB_OCPP.WSServer
             appServer.NewSessionConnected += AppServer_NewSessionConnected;
             appServer.SessionClosed += AppServer_SessionClosed;
 
+
             //Try to start the appServer
             if (!appServer.Start())
             {
@@ -371,7 +372,7 @@ namespace EVCB_OCPP.WSServer
 
                     clientDic.Add(session.ChargeBoxId, session);
                     session.m_ReceiveData += new ClientData.OCPPClientDataEventHandler<ClientData, String>(ReceivedMessage);
-                   // logger.Debug("------------New " + (session == null ? "Oops" : session.ChargeBoxId));
+                    // logger.Debug("------------New " + (session == null ? "Oops" : session.ChargeBoxId));
                     WriteMachineLog(session, "NewSessionConnected", "Connection", "");
 
                     using (var db = new MainDBContext())
@@ -999,7 +1000,38 @@ namespace EVCB_OCPP.WSServer
 
         async private void HealthAlarmTrigger()
         {
+            for (; ; )
+            {
+                if (_ct.IsCancellationRequested)
+                {
+                    break;
+                }
 
+                try
+                {
+                    Dictionary<string, ClientData> _copyClientDic = null;
+                    lock (_lockClientDic)
+                    {
+                        _copyClientDic = new Dictionary<string, ClientData>(clientDic);
+                    }
+
+                   var removeClients= _copyClientDic.Where(x => x.Value.LastActiveTime < DateTime.Now.AddSeconds(-120)).Select(x => x.Value).ToList();
+
+                    foreach(var session in removeClients)
+                    {
+
+                        Console.WriteLine(string.Format("Server forced to shut down ChargeBox ({0}: LastActiveTime{1})", session.ChargeBoxId, session.LastActiveTime));
+                        RemoveClient(session);
+                    }
+                  
+                    await Task.Delay(60000);
+                }
+                catch (Exception ex)
+                {
+                    logger.Error(string.Format("HealthAlarmTrigger  Ex:{0}", ex.ToString()));
+                }
+
+            }
         }
 
 
@@ -1101,6 +1133,10 @@ namespace EVCB_OCPP.WSServer
             {
 
                 logger.Trace("RemoveClient[" + session.ChargeBoxId + "]");
+                if(session.Connected)
+                {
+                    session.Close(CloseReason.ServerShutdown);
+                }
                 RemoveClientDic(session);
                 try
                 {

EVCB_OCPP.WSServer/Service/BusinessServiceFactory.cs

@@ -1,4 +1,5 @@
-using EVCB_OCPP.Packet.Messages.SubTypes;
+using EVCB_OCPP.Domain;
+using EVCB_OCPP.Packet.Messages.SubTypes;
 using EVCB_OCPP.WSServer.Dto;
 using System;
 using System.Collections.Generic;
@@ -11,19 +12,24 @@ namespace EVCB_OCPP.WSServer.Service
 
     public interface IBusinessService
     {
-        IdTagInfo Authorize(string chargeBoxId,string idTag);
+        IdTagInfo Authorize(string chargeBoxId, string idTag);
 
-        void NotifyFaultStatus( ErrorDetails details);
+        void NotifyFaultStatus(ErrorDetails details);
 
     }
 
     static public class BusinessServiceFactory
     {
 
-        static public IBusinessService CreateBusinessService(string customerId, bool isLocalHandle)
-        {
-
-            return new OuterBusinessService(customerId);
+        static public IBusinessService CreateBusinessService(string customerId)
+        {          
+            bool isCallOut = false;
+            using (var db = new MainDBContext())
+            {
+                isCallOut = db.Customer.Where(x => x.Id == new Guid(customerId)).Select(x => x.CallPartnerApiOnSchedule).SingleOrDefault();
+            }
+           
+            return isCallOut ? new OuterBusinessService(customerId) : (IBusinessService)new LocalBusinessService(customerId);
         }
 
     }

EVCB_OCPP.WSServer/Service/LocalBusinessService.cs

@@ -9,9 +9,7 @@ using EVCB_OCPP.WSServer.Dto;
 namespace EVCB_OCPP.WSServer.Service
 {
     public class LocalBusinessService : IBusinessService
-    {
-
-       
+    {       
       
         string customerId = string.Empty;
 
@@ -22,7 +20,6 @@ namespace EVCB_OCPP.WSServer.Service
 
         public IdTagInfo Authorize(string chargeBoxId, string idTag)
         {
-
             return new IdTagInfo() { status = AuthorizationStatus.Accepted };
 
         }