|
@@ -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;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|