diff --git a/langguanApi/Model/Dto/ReceiveDto.cs b/langguanApi/Model/Dto/ReceiveDto.cs index 7f6678a..9b53402 100644 --- a/langguanApi/Model/Dto/ReceiveDto.cs +++ b/langguanApi/Model/Dto/ReceiveDto.cs @@ -6,7 +6,7 @@ public class ReceiveDto { /// - /// 数据类型,1 门禁 2台账,3 运输 4 地磅, + /// 数据类型,1 门禁 ,2,tsp,3 地磅, /// public int dataType { get; set; } /// diff --git a/langguanApi/Service/Hj212Service.cs b/langguanApi/Service/Hj212Service.cs index b62c5b9..9c6399e 100644 --- a/langguanApi/Service/Hj212Service.cs +++ b/langguanApi/Service/Hj212Service.cs @@ -165,7 +165,7 @@ namespace langguanApi.Service /// /// /// - public async Task Add(Model.HJ212 hJ212, string deviceIp) + public async Task Add(Model.HJ212 hJ212) { ////判断设备类型 tsp 会有经纬度数据 // int deviceType = 1;//设备类型为1 =voc diff --git a/langguanApi/Service/ReceiveDataService.cs b/langguanApi/Service/ReceiveDataService.cs index e7c246a..dc17018 100644 --- a/langguanApi/Service/ReceiveDataService.cs +++ b/langguanApi/Service/ReceiveDataService.cs @@ -26,29 +26,28 @@ namespace langguanApi.Service { try { - //TODO: 接收到数据后处理 + //TODO: 接收到数据后处理数据类型,1 门禁 ,2,tsp,3 地磅, switch (jsonData.dataType) { case 1: //TODO: 1门禁 - //var accessData = JsonConvert.DeserializeObject(jsonData.content); - //var _service = ServiceLocator.Instance.GetService(); + var accessData = JsonConvert.DeserializeObject(jsonData.content); + var _transportservice = ServiceLocator.Instance.GetService(); + await _transportservice.addTransport(accessData); break; case 2: - //TODO: 2 台账 - var LedgerData = JsonConvert.DeserializeObject(jsonData.content); - var _service = ServiceLocator.Instance.GetService(); + //TODO: 2 tsp + var LedgerData = JsonConvert.DeserializeObject(jsonData.content); + var _service = ServiceLocator.Instance.GetService(); + await _service.Add(LedgerData); break; case 3: - //TODO: 3 运输 - var TransportData = JsonConvert.DeserializeObject(jsonData.content); - var _Transporservice = ServiceLocator.Instance.GetService(); - await _Transporservice.addTransport(TransportData); - break; - case 4: + //TODO: 3 地磅 var truckScalesData = JsonConvert.DeserializeObject(jsonData.content); var _TruckScalesService = ServiceLocator.Instance.GetService(); await _TruckScalesService.AddTruckScales(truckScalesData); + break; + case 4: //TODO: 4 地磅 break; }