增加上传状态监控

Waste.Application/ResultInfos/Dtos/ResultDto.cs

@@ -29,6 +29,10 @@ namespace Waste.Application
         /// 设备编号
         /// </summary>
         public string DeviceEcode { get; set; }
+        /// <summary>
+        /// 上报是否成功,1-成功,0-失败
+        /// </summary>
+        public int PostStatus { get; set; }
     }
     /// <summary>
     /// 上传的数据包体

Waste.Application/ResultInfos/ResultService.cs

@@ -92,20 +92,21 @@ namespace Waste.Application
                     GrossWeight = x.GrossWeight,
                     NetWeight = x.NetWeight,
                     Registration = x.Registration,
-                    CreateTime = x.CreateTime
+                    CreateTime = x.CreateTime,
+                    PostStatus= -1
                 })
                 .Mapper((it, cache) =>
                 {
                     var allbus = cache.Get(list =>
                     {
                         var ids = list.Where(e => e.BusinessId != Guid.Empty).Select(e => e.BusinessId).ToList();
-                        return repository.Change<W_Business>().Context.Queryable<W_Business>().Where(e => ids.Contains(e.Id)).ToList();
+                        return dbClient.Queryable<W_Business>().Where(e => ids.Contains(e.Id)).ToList();
                     });
                     it.BusinessName = allbus.FirstOrDefault(e => e.Id == it.BusinessId)?.Name;
                     var alldev = cache.Get(list =>
                     {
                         var ids = list.Where(e => e.DeviceId != Guid.Empty).Select(e => e.DeviceId).ToList();
-                        return repository.Change<W_Device>().Context.Queryable<W_Device>().Where(e => ids.Contains(e.Id)).ToList();
+                        return dbClient.Queryable<W_Device>().Where(e => ids.Contains(e.Id)).ToList();
                     });
                     var dev = alldev.FirstOrDefault(e => e.Id == it.DeviceId);
                     if (dev != null)
@@ -115,6 +116,16 @@ namespace Waste.Application
                         it.DeviceEcode = dev.Ecode;
                         it.DeviceAddress = dev.Address;
                     }
+                    var allres  = cache.Get(list =>
+                    {
+                        var ids = list.Select(e => e.Id).ToList();
+                        return dbClient.Queryable<W_ResultExt>().Where(e => ids.Contains(e.ResultId)).ToList();
+                    });
+                    var res = allres.FirstOrDefault(e => e.ResultId == it.Id);
+                    if(res != null)
+                    {
+                        it.PostStatus = res.Status;
+                    }
                 })
                  .ToPageListAsync(param.offset, param.limit, totalnum);
             return new PageParms<ResultList>

Waste.Application/ThirdApiInfo/OpenService.cs

@@ -41,7 +41,7 @@ namespace Waste.Application.ThirdApiInfo
             Guid resultid=Guid.Empty;
             if (!string.IsNullOrEmpty(data.ResultId) && Guid.TryParse(data.ResultId,out resultid))
             {
-                int status = data.data.ToInt();//0-成功,1-失败
+                int status = data.data.ToInt();//1-成功,0-失败
                 if (await dbClient.Queryable<W_ResultExt>().AnyAsync(x => x.ResultId == resultid))
                 {
                     await dbClient.Updateable<W_ResultExt>().SetColumns(x => new W_ResultExt
@@ -87,7 +87,7 @@ namespace Waste.Application.ThirdApiInfo
                     SecretHash = devicesecret.SecretHash,
                     UserId = UserId,
                     PostUrl = ApiUrl,
-                    ScanningTime = GetTimestamp(DateTime.Now),
+                    ScanningTime = timestamp,
                     ResultId = IDGen.NextID()
                 };
                 //解析协议,IC卡数据@垃圾桶编号@厨余垃圾@7.91
@@ -284,7 +284,7 @@ namespace Waste.Application.ThirdApiInfo
                 && !string.IsNullOrEmpty(devicesecret.SecretHash)
                 && !string.IsNullOrEmpty(devicesecret.DevId))
             {
-                data.timestamp = _suZhouService.GetTimestamp();
+                data.timestamp = _suZhouService.GetUTCTimestamp();
                 data.noncestr = _suZhouService.GetNonce();
                 data.UserId = UserId;
                 data.Secret = devicesecret.Secret;

Waste.Application/Waste.Application.xml

@@ -1118,6 +1118,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Waste.Application.ISuZhouService.GetUTCTimestamp">
+            <summary>
+            获取UTC时间戳
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Waste.Application.ISuZhouService.GetUserApiSign(System.String,System.String[])">
             <summary>
             获取签名
@@ -1181,6 +1187,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Waste.Application.SuZhouService.GetUTCTimestamp">
+            <summary>
+            获取UTC时间戳
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Waste.Application.SuZhouService.GetNonce">
             <summary>
             获取随机数
@@ -1467,6 +1479,11 @@
             设备编号
             </summary>
         </member>
+        <member name="P:Waste.Application.ResultList.PostStatus">
+            <summary>
+            上报是否成功,1-成功,0-失败
+            </summary>
+        </member>
         <member name="T:Waste.Application.MyPackage">
             <summary>
             上传的数据包体

Waste.Domain/DataModel/W_ResultExt.cs

@@ -17,7 +17,7 @@ namespace Waste.Domain
         /// </summary>
         public Guid ResultId { get; set; }
         /// <summary>
-        /// 状态,0-成功,1-失败
+        /// 状态,1-成功,0-失败
         /// </summary>
         public int Status { get; set; }
         /// <summary>

Waste.Web.Entry/Pages/Result/Index.cshtml

@@ -36,6 +36,15 @@
     <a href="#" class="js-edit" title="编辑" data-id="{{d.id}}">编辑</a>&nbsp;
     @*<a href="#" class="js-delete" title="删除" data-id="{{d.id}}">删除</a>&nbsp;*@
 </script>
+<script type="text/html" id="netstatustpl">
+    {{#if (d.poststatus == 0){ }}
+    <span style="color:red;">上报失败</span>
+    {{# } else if(d.poststatus == 1){ }}
+    <span style="color: #19be6b;">上报成功</span>
+    {{# }else{ }}
+    <span style="color: #b3b3b3;">未上报</span>
+    {{#} }}
+</script>
 @section Scripts
 {
     <script type="text/javascript">
@@ -100,6 +109,10 @@
                     field: 'deviceaddress', title: '地址'
                 }
                 ,
+                {
+                    field: 'poststatus', title: '状态', templet:'#netstatustpl'
+                }
+                ,
                 {
                     field: 'createtime', title: '回收时间'
                 }

Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user

@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\webpublish\waste.ybhdmob.com</_PublishTargetUrl>
-    <History>True|2021-08-12T12:11:21.5851106Z;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
+    <History>True|2021-08-13T07:24:09.4521125Z;True|2021-08-13T14:59:40.4579407+08:00;True|2021-08-13T10:02:29.7650246+08:00;True|2021-08-13T09:45:10.6245894+08:00;True|2021-08-12T20:11:21.5851106+08:00;True|2021-08-12T20:00:42.4820498+08:00;True|2021-08-12T18:44:08.3079650+08:00;True|2021-08-12T18:35:47.4730766+08:00;True|2021-08-12T18:32:10.9361388+08:00;True|2021-08-12T18:30:21.4006961+08:00;True|2021-08-12T18:13:00.9624470+08:00;True|2021-08-12T18:10:12.3459311+08:00;True|2021-08-12T18:09:18.8656414+08:00;True|2021-08-12T17:35:24.7213607+08:00;True|2021-08-11T07:54:57.1322848+08:00;True|2021-08-10T10:16:40.7495389+08:00;True|2021-08-03T11:16:02.7897282+08:00;True|2021-08-02T16:39:27.2332369+08:00;True|2021-08-02T15:07:40.7995318+08:00;True|2021-08-02T14:32:29.6885424+08:00;True|2021-08-02T14:31:18.6578543+08:00;True|2021-08-02T14:27:57.1301002+08:00;True|2021-08-02T10:55:40.3542370+08:00;True|2021-08-02T09:44:28.0994056+08:00;True|2021-08-01T13:49:38.4071985+08:00;True|2021-08-01T13:36:45.5372120+08:00;True|2021-08-01T11:00:19.6165520+08:00;True|2021-08-01T10:38:51.4029710+08:00;True|2021-07-31T20:27:53.6583811+08:00;True|2021-07-31T18:35:23.4214441+08:00;True|2021-07-31T17:34:14.0712243+08:00;True|2021-07-31T14:50:43.2065556+08:00;True|2021-07-30T17:59:30.2223340+08:00;True|2021-07-30T17:57:35.9412910+08:00;True|2021-07-30T17:07:58.3305971+08:00;True|2021-07-30T17:04:10.9244859+08:00;True|2021-07-30T17:02:12.1943634+08:00;True|2021-07-30T16:16:22.2838331+08:00;True|2021-07-30T15:05:26.5664155+08:00;True|2021-07-30T14:57:59.1966108+08:00;True|2021-07-30T14:54:25.8172908+08:00;True|2021-07-30T14:52:20.9209995+08:00;True|2021-07-30T14:35:29.5239463+08:00;True|2021-07-30T09:32:38.2676032+08:00;True|2021-07-30T09:14:42.6170851+08:00;True|2021-07-29T19:06:09.1449349+08:00;True|2021-06-11T08:16:29.9542894+08:00;True|2021-06-04T14:46:02.2707457+08:00;True|2021-06-02T15:08:52.8245632+08:00;True|2021-06-02T15:05:50.3614099+08:00;True|2021-06-02T14:59:32.3690948+08:00;True|2021-06-02T14:10:25.1182836+08:00;True|2021-06-02T14:09:54.9215833+08:00;True|2021-06-01T10:41:54.9488501+08:00;True|2021-06-01T10:38:56.0283198+08:00;True|2021-05-28T13:59:02.2308877+08:00;True|2021-05-28T11:56:26.6796406+08:00;True|2021-05-28T11:28:00.4087907+08:00;True|2021-05-27T16:18:09.5993838+08:00;True|2021-05-27T16:07:31.3484951+08:00;True|2021-05-27T11:30:37.9119310+08:00;True|2021-05-27T11:28:35.5374674+08:00;True|2021-05-27T08:00:09.1625592+08:00;True|2021-05-26T20:42:17.0852150+08:00;True|2021-05-26T20:36:49.7527415+08:00;True|2021-05-25T17:57:31.8791293+08:00;True|2021-05-25T13:49:29.6488978+08:00;True|2021-05-25T13:48:24.6686105+08:00;True|2021-05-25T13:25:41.2512493+08:00;True|2021-05-24T17:55:33.3800078+08:00;True|2021-05-20T14:35:30.6957985+08:00;True|2021-05-20T13:17:22.6192995+08:00;True|2021-05-20T10:51:38.1268169+08:00;True|2021-05-19T19:50:03.7000224+08:00;True|2021-05-19T19:44:27.2518811+08:00;True|2021-05-19T19:43:26.5916681+08:00;True|2021-05-19T19:36:29.3197365+08:00;True|2021-05-19T19:30:00.3802430+08:00;True|2021-05-19T17:55:23.7939835+08:00;True|2021-05-19T11:05:17.9043392+08:00;True|2021-05-19T10:19:38.4839988+08:00;True|2021-05-19T10:17:19.7430612+08:00;True|2021-05-19T10:13:23.0031721+08:00;True|2021-05-19T10:06:03.9881599+08:00;True|2021-05-18T14:39:03.8876574+08:00;True|2021-05-18T14:23:46.9818836+08:00;True|2021-05-18T14:19:56.2382079+08:00;True|2021-05-18T11:29:53.5497590+08:00;True|2021-05-18T11:16:18.0123853+08:00;True|2021-05-17T18:59:52.4159105+08:00;True|2021-05-17T18:53:37.9438984+08:00;True|2021-05-17T18:48:14.9625161+08:00;True|2021-05-17T17:46:03.7723404+08:00;True|2021-05-17T17:14:20.2312990+08:00;True|2021-05-17T16:44:34.5837616+08:00;True|2021-05-17T16:25:20.1087804+08:00;True|2021-05-17T11:35:27.9388562+08:00;</History>
   </PropertyGroup>
 </Project>