Browse Source

Fix Bug 查詢 Basic Information of EVSEs limit issue

Jessica Tseng 3 năm trước cách đây
mục cha
commit
24948367ac

+ 15 - 5
EVCB_OCPP.WEBAPI/Controllers/Version1/CPOController.cs

@@ -78,7 +78,7 @@ namespace EVCB_OCPP.WEBAPI.Controllers.Version1
         [Route("information")]
         [ResponseType(typeof(CPOOuterResponse))]
         [HttpGet]
-        public HttpResponseMessage BasicInformationofEVSEs(int StationId = -1, string ChargeBoxId = "", DateTime? DateFrom = null, DateTime? DateTo = null, int? Offset = 0, int? Limit = 1)
+        public HttpResponseMessage BasicInformationofEVSEs(int? Limit=-1, int StationId = -1, string ChargeBoxId = "", DateTime? DateFrom = null, DateTime? DateTo = null, int? Offset = 0)
         {
 
             var result = new CPOOuterResponse();
@@ -109,7 +109,7 @@ namespace EVCB_OCPP.WEBAPI.Controllers.Version1
                                     return Request.CreateResponse(statusCode, result);
                                 }
                             }
-                            _innerResponse = new { EVSEs = _stationService.GetEVSEsbyStationId(StationId, DateFrom, DateTo, Offset.Value, Limit.Value) };
+                            _innerResponse = new { EVSEs = _stationService.GetEVSEsbyStationId(StationId, DateFrom, DateTo, Offset.Value, Limit==-1? 1000: Limit.Value) };
 
 
                         }
@@ -289,10 +289,20 @@ namespace EVCB_OCPP.WEBAPI.Controllers.Version1
                 }
                 else
                 {
+                    if(_innerResult.ErrorCode == (int)CPO_StatusCode.UnexpectedError)
+                    {
+                        result.StatusCode = _innerResult.ErrorCode;
+                        result.StatusMessage = CPO_StatusMessage.ERROR_MSG_INNERSERVICE_ERROR;
+                        statusCode = HttpStatusCode.BadRequest;
+                    }
+                    else
+                    {
+                        result.StatusCode = (int)CPO_StatusCode.Success;
+                        result.StatusMessage = CPO_StatusMessage.Success;
+                        statusCode = HttpStatusCode.OK;
+                    }
 
-                    result.StatusCode = _innerResult.ErrorCode;
-                    result.StatusMessage = CPO_StatusMessage.ERROR_MSG_INNERSERVICE_ERROR;
-                    statusCode = HttpStatusCode.BadRequest;
+                   
                 }
 
 

+ 1 - 1
EVCB_OCPP.WEBAPI/Services/ChargePointService.cs

@@ -336,7 +336,7 @@ namespace EVCB_OCPP.WEBAPI.Services
                     {
                         parameters.Add(string.IsNullOrEmpty(sessionId) ? "@StartIdTag" : "@TransactionId", string.IsNullOrEmpty(sessionId) ? idTag : sessionId, DbType.String, ParameterDirection.Input);
 
-                        strSql = "Select Id, ConnectorId, StartTime, StartIdTag from TransactionRecord" +
+                        strSql = "Select Id, ConnectorId, StartTime, StartIdTag from TransactionRecord " +
                           "where StopTime = '1991-01-01 00:00:00.000' and ChargeBoxId = @ChargeBoxId and StartTime in (select  max(StartTime) from [TransactionRecord] where  " + (string.IsNullOrEmpty(sessionId) ? "StartIdTag=@StartIdTag" : "Id=@TransactionId") + " and StopTime = '1991-01-01 00:00:00.000' and ChargeBoxId = @ChargeBoxId group by ConnectorId )";
 
                     }

+ 1 - 1
EVCB_OCPP.WEBAPI/Services/ChargingStationService.cs

@@ -66,7 +66,7 @@ namespace EVCB_OCPP.WEBAPI.Services
         }
 
 
-        public List<EVSE> GetEVSEsbyStationId(int stationId, DateTime? dateFrom, DateTime? dateTo, int offset = -1, int limit = 10)
+        public List<EVSE> GetEVSEsbyStationId(int stationId, DateTime? dateFrom, DateTime? dateTo, int offset = -1, int limit = 1000)
         {
             List<EVSE> _chargePoints = new List<EVSE>();
             var parameters = new DynamicParameters();