liuzl
/
Waste
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
Hinse 2021-09-29 08:53:06 +08:00
parent bf5e351c8a
commit 2c3752fcd4
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Waste.Application/ThirdApiInfo/OpenService.cs
View File

@ -125,10 +125,11 @@ namespace Waste.Application.ThirdApiInfo
{ {
return new ResultInfo(ResultState.FAIL, "设备未找到"); return new ResultInfo(ResultState.FAIL, "设备未找到");
} }
var returndata = new GetDevInfoResponseDto { var returndata = new GetDevInfoResponseDto
ResultId= IDGen.NextID(), {
ResultId = IDGen.NextID(),
UserId = UserId, UserId = UserId,
PostUrl= ApiUrl PostUrl = ApiUrl
}; };
//解析协议,IC卡数据@垃圾桶编号@厨余垃圾@7.91 //解析协议,IC卡数据@垃圾桶编号@厨余垃圾@7.91
// 00000000003031 40 0F00010009 40 C6E4CBFBC0ACBBF8 40 31352E39 // 00000000003031 40 0F00010009 40 C6E4CBFBC0ACBBF8 40 31352E39
@ -156,7 +157,7 @@ namespace Waste.Application.ThirdApiInfo
} }
//检查是否为15分钟内第一次上报 //检查是否为15分钟内第一次上报
var time15 = DateTime.Now.AddMinutes(-15); var time15 = DateTime.Now.AddMinutes(-15);
if(await dbClient.Queryable<W_Result>().AnyAsync(x=>x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15)) if (await dbClient.Queryable<W_Result>().AnyAsync(x => x.DeviceId == device.Id && x.Registration == returndata.trash && x.CreateTime > time15))
{ {
_loggerService.AddLogger($"重复垃圾桶编号的数据:{returndata.ToJson()}", 1); _loggerService.AddLogger($"重复垃圾桶编号的数据:{returndata.ToJson()}", 1);
return new ResultInfo(ResultState.FAIL, "15分钟内同一垃圾桶编号上报"); return new ResultInfo(ResultState.FAIL, "15分钟内同一垃圾桶编号上报");

2
Waste.Application/Waste.Application.csproj
View File

@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MessagePack" Version="2.2.85" /> <PackageReference Include="MessagePack" Version="2.3.85" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
Waste.Core/Waste.Core.csproj
View File

@ -15,11 +15,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Furion" Version="2.15.10" /> <PackageReference Include="Furion" Version="2.18.7" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.15.10" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.18.7" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.15.10" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.18.7" />
<PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.15.10" /> <PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.18.7" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.15.10" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.18.7" />
</ItemGroup> </ItemGroup>
</Project> </Project>

BIN
Waste.Web.Entry/wwwroot/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB