add main commit 815344dcff66bedef0679dae4a340188e1435b11

Commit 815344dc: 1. Completed Session Search add SessionId 欄位
2. Fix Trigger Mesage 一定會傳ConnectorId 給電樁問題

EVCB_OCPP.WEBAPI/Controllers/Version1/InternalController.cs

@@ -1575,7 +1575,7 @@ namespace EVCB_OCPP.WEBAPI.Controllers.Version1
 
                 var request = new TriggerMessageRequest()
                 {
-                    connectorId = triggerMessage.ConnectorId == -1 ? (int?)null : triggerMessage.ConnectorId,
+                    connectorId = triggerMessage.ConnectorId,
                     requestedMessage = (MessageTrigger)triggerMessage.TriggerType
                 };
 

EVCB_OCPP.WEBAPI/Controllers/Version2/ocpp201/OCPP201_InternalController.cs

@@ -980,7 +980,7 @@ namespace EVCB_OCPP.WEBAPI.Controllers.Version2.ocpp201
 
                 var request = new TriggerMessageRequest()
                 {
-                    Evse = triggerMessage.ConnectorId == -1 ? null : new EVSEType() { Id = triggerMessage.ConnectorId, ConnectorId = triggerMessage.ConnectorId },
+                    Evse = triggerMessage.ConnectorId is null ? null : new EVSEType() { Id = triggerMessage.ConnectorId.Value, ConnectorId = triggerMessage.ConnectorId },
                     RequestedMessage = (EVCB_OCPP20.Packet.DataTypes.EnumTypes.MessageTriggerEnumType)triggerMessage.TriggerType
                 };
 

EVCB_OCPP.WEBAPI/Models/WebAPI/TriggerMessageRequest.cs

@@ -7,7 +7,7 @@ namespace EVCB_OCPP.WEBAPI.Models.WebAPI
 {
     public class TriggerRequest
     {
-        public int ConnectorId { set; get; }
+        public int? ConnectorId { set; get; }
 
         [Required]
         public int TriggerType { set; get; }

EVCB_OCPP.WEBAPI/Services/ChargePointService.cs

@@ -688,6 +688,7 @@ namespace EVCB_OCPP.WEBAPI.Services
                 {
                     detail.Add(new SessionDetail()
                     {
+                        SessionId = item.Id.ToString(),
                         ChargeBoxId = item.ChargeBoxId,
                         ConnectorId = (int)item.ConnectorId,
                         IdTag = item.StartIdTag,