diff --git a/Waste.Application/ThirdApiInfo/OpenService.cs b/Waste.Application/ThirdApiInfo/OpenService.cs index a6fd3e5..dcf621d 100644 --- a/Waste.Application/ThirdApiInfo/OpenService.cs +++ b/Waste.Application/ThirdApiInfo/OpenService.cs @@ -125,10 +125,11 @@ namespace Waste.Application.ThirdApiInfo { return new ResultInfo(ResultState.FAIL, "设备未找到"); } - var returndata = new GetDevInfoResponseDto { - ResultId= IDGen.NextID(), + var returndata = new GetDevInfoResponseDto + { + ResultId = IDGen.NextID(), UserId = UserId, - PostUrl= ApiUrl + PostUrl = ApiUrl }; //解析协议,IC卡数据@垃圾桶编号@厨余垃圾@7.91 // 00000000003031 40 0F00010009 40 C6E4CBFBC0ACBBF8 40 31352E39 @@ -156,7 +157,7 @@ namespace Waste.Application.ThirdApiInfo } //检查是否为15分钟内第一次上报 var time15 = DateTime.Now.AddMinutes(-15); - if(await dbClient.Queryable().AnyAsync(x=>x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15)) + if (await dbClient.Queryable().AnyAsync(x => x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15)) { _loggerService.AddLogger($"重复垃圾桶编号的数据:{returndata.ToJson()}", 1); return new ResultInfo(ResultState.FAIL, "15分钟内同一垃圾桶编号上报"); @@ -218,7 +219,7 @@ namespace Waste.Application.ThirdApiInfo returndata.ScanningTime = timestamp; string[] paramlist = new string[] { returndata.Weight.ToString(),returndata.trash,returndata.type.ToString(),returndata.ScanningTime.ToString(),returndata.status.ToString() - }; + }; returndata.sign = _suZhouService.GetUserApiSign(returndata.Secret, paramlist); _loggerService.AddLogger($"发送的数据:{returndata.ToJson()}", 1); return new ResultInfo(ResultState.SUCCESS, "success", returndata); diff --git a/Waste.Application/Waste.Application.csproj b/Waste.Application/Waste.Application.csproj index 639af29..269313c 100644 --- a/Waste.Application/Waste.Application.csproj +++ b/Waste.Application/Waste.Application.csproj @@ -15,7 +15,7 @@ - + diff --git a/Waste.Core/Waste.Core.csproj b/Waste.Core/Waste.Core.csproj index 836b069..2da47b9 100644 --- a/Waste.Core/Waste.Core.csproj +++ b/Waste.Core/Waste.Core.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/Waste.Web.Entry/wwwroot/favicon.ico b/Waste.Web.Entry/wwwroot/favicon.ico index 63e859b..c252a00 100644 Binary files a/Waste.Web.Entry/wwwroot/favicon.ico and b/Waste.Web.Entry/wwwroot/favicon.ico differ