diff --git a/Waste.Application/PostInfo/SuZhou/SuZhouService.cs b/Waste.Application/PostInfo/SuZhou/SuZhouService.cs index 7a5bc66..b91db0c 100644 --- a/Waste.Application/PostInfo/SuZhou/SuZhouService.cs +++ b/Waste.Application/PostInfo/SuZhou/SuZhouService.cs @@ -126,20 +126,21 @@ namespace Waste.Application public async Task PostGarbagesAsync(GarbageC2SDto garbageC2SDto) { var url = $"{ApiUrl}/api/garbages"; + garbageC2SDto.ScanningTime = GetTimestamp(); string[] paramlist = new string[] { garbageC2SDto.Weight.ToString(),garbageC2SDto.Trash,garbageC2SDto.Type.ToString(),garbageC2SDto.ScanningTime.ToString(),garbageC2SDto.DStatus.ToString() }; int timestamp = GetTimestamp(); int nonce = GetNonce(); - string sign = GetUserApiSign("8137VxS0S01eooVc", paramlist); + string sign = GetUserApiSign("lsBThmYBYUMrmwkl", paramlist); var c2s_dto = new SuZhouPostApiBaseDto { Data = garbageC2SDto, - SecretHash = "1eca5f6af7d84fb3", + SecretHash = "bfbaf98fb5b343b2", Nonce = nonce, Signature = sign, TimeStamp = timestamp, - DeviceId = "08d92039-6b06-4650-8691-f71d4aa52f0a" + DeviceId = "08d9588d-4796-48f9-8c5b-f28f271b51d0" }; var request = new HttpRequestMessage(HttpMethod.Post, url); var bytes = MessagePackSerializer.Serialize(c2s_dto); diff --git a/Waste.Doc/1_附件三硬件标准(1).docx b/Waste.Doc/1_附件三硬件标准(1).docx new file mode 100644 index 0000000..33fdcb6 --- /dev/null +++ b/Waste.Doc/1_附件三硬件标准(1).docx @@ -0,0 +1,34 @@ +附件三:关于读卡器、垃圾桶芯片编码标准、设备编号标准 +1、由于垃圾桶在收运过程中存在流转现象,为规避读卡器不兼容的情况,建议读卡器的频率重点选择ISM915MHZ频段;并对垃圾桶芯片采用统一格式编码,要求如下: +(1)垃圾种类数据定义: +其它垃圾:30(16进制,1个字节) +厨余垃圾:31 +可回收垃圾:32 +有害垃圾:33 +(2)垃圾桶数据定义: +小桶:30(16进制,1个字节) +大桶:31 +编号:XX XX XX XX XX(16进制,5个字节,最大为FFFFFFFFFF=1099511627775即1万多亿) +一张卡片的卡片有效信息为:垃圾种类+桶种类+编号。如厨余垃圾小桶100号,数据格式为:31 30 00 00 00 00 64 +卡片数据完整为: +垃圾桶编号 +垃圾桶编号 +厂家预留 +厂家预留 +桶大小 +桶大小 +垃圾种类 +垃圾种类 +00 00 00 00 00 31 30 00 00 00 00 64 + + +厂家预留(红字),其中后二位由平台服务商提供,前二位厂商使用需与平台服务商沟通,确认之后使用,避免重复。 + +2、为直观区分各厂家设备,对全市设备实行统一编码,编码规则如下: +格式:十进制,总长度9位,其中前两位为字母,并以H开头,由平台服务商提供厂家的字母编号,其余7位由设备厂商自行编码,厂商完成设备编码后,返回平台服务商进行备案。 + +HA 0000 170 +设备编号 +设备编号 +厂家编码 +厂家编码 diff --git a/Waste.Doc/昆山市1153个小区名单编码表.xlsx b/Waste.Doc/昆山市1153个小区名单编码表.xlsx new file mode 100644 index 0000000..6e1eace Binary files /dev/null and b/Waste.Doc/昆山市1153个小区名单编码表.xlsx differ diff --git a/Waste.Doc/说明.txt b/Waste.Doc/说明.txt new file mode 100644 index 0000000..4556f40 --- /dev/null +++ b/Waste.Doc/说明.txt @@ -0,0 +1 @@ +https://www.yuque.com/books/share/66e81f53-2084-4fc6-8ddc-740fc63dac91/yqpkhw#cf3e2664 \ No newline at end of file diff --git a/Waste.Web.Entry/Pages/Socket/Test.cshtml b/Waste.Web.Entry/Pages/Socket/Test.cshtml new file mode 100644 index 0000000..74f67f4 --- /dev/null +++ b/Waste.Web.Entry/Pages/Socket/Test.cshtml @@ -0,0 +1,102 @@ +@page +@model Waste.Web.Entry.Pages.Socket.TestModel +@{ +} +
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+@section Scripts{ + +} \ No newline at end of file diff --git a/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs b/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs new file mode 100644 index 0000000..392a162 --- /dev/null +++ b/Waste.Web.Entry/Pages/Socket/Test.cshtml.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Waste.Web.Entry.Pages.Socket +{ + public class TestModel : PageModel + { + public void OnGet() + { + } + } +}