|
@@ -81,16 +81,18 @@ namespace EVCB_OCPP.WSServer.Message
|
|
|
ErrorInfo = x.ErrorInfo,
|
|
|
VendorId = x.VendorId,
|
|
|
VendorErrorCode = x.VendorErrorCode
|
|
|
- }).FirstOrDefault();
|
|
|
+ }).AsNoTracking().FirstOrDefault();
|
|
|
|
|
|
|
|
|
- if (_request.status != (ChargePointStatus)_oldStatus.Status || _request.status == ChargePointStatus.Faulted)
|
|
|
+ if (_oldStatus!= null && (_request.status != (ChargePointStatus)_oldStatus.Status || _request.status == ChargePointStatus.Faulted))
|
|
|
{
|
|
|
removeIds = oldDB.ConnectorStatus.Where(x => x.ChargeBoxId == session.ChargeBoxId
|
|
|
- && x.ConnectorId == _request.connectorId).Select(x => x.Id).ToList();
|
|
|
+ && x.ConnectorId == _request.connectorId).Select(x => x.Id).AsNoTracking().ToList();
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
|
|
|
using (var db = new MainDBContext())
|
|
|
{
|
|
@@ -126,7 +128,7 @@ namespace EVCB_OCPP.WSServer.Message
|
|
|
ChargeBoxId = session.ChargeBoxId,
|
|
|
ErrorCodeId = (int)_request.errorCode,
|
|
|
ErrorInfo = _request.info,
|
|
|
- PreStatus = _oldStatus.Status,
|
|
|
+ PreStatus = _oldStatus==null ? -1:_oldStatus.Status,
|
|
|
VendorErrorCode = _request.vendorErrorCode,
|
|
|
VendorId = _request.vendorId
|
|
|
});
|