Prechádzať zdrojové kódy

2020/04/25 Jessica
Actions:
1. 修正StatusNotification 同支槍沒有刪除舊的紀錄問題
2. 無法解析Message錯誤 列出ActionName

Jessica.Tseng 4 rokov pred
rodič
commit
1815a9d691

+ 1 - 1
EVCB_OCPP.WSServer/Message/BasicMessageHandler.cs

@@ -265,7 +265,7 @@ namespace EVCB_OCPP.WSServer.Message
             catch (Exception ex)
             {
                 result.Exception = ex;
-                logger.Error(string.Format("UnPackPayloadbyCall Ex: {0}", ex.ToString()), "UnPack");
+                logger.Error(string.Format("[{0}]UnPackPayloadbyCall Ex: {1}", action, ex.Message), "UnPack");
                
             }
 

+ 6 - 4
EVCB_OCPP.WSServer/Message/CoreProfileHandler.cs

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

BIN
TestTool.RemoteTriggerAPP/DLL/EVCB_OCPP.Domain.dll


+ 1 - 1
TestTool.RemoteTriggerAPP/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TestTool.RemoteTriggerAPP"      
         mc:Ignorable="d"
-        Title="下發測試用工具(公司內網) V1.1.9(20200417)" Height="450" Width="670">
+        Title="下發測試用工具(公司內網) V1.1.10(20200423)" Height="450" Width="670">
     <Grid Margin="0,2,0,-2">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="109*"/>