1、上报接口增加停用拦截功能

2、设备列表增加停用/启用操作
2021-10-12 15:26:06 +08:00 · 2021-10-12 15:26:06 +08:00 · d905211c24
parent 7aa07954dc
commit d905211c24
9 changed files with 96 additions and 10 deletions
--- a/Waste.Application/Device/DeviceAppService.cs
+++ b/Waste.Application/Device/DeviceAppService.cs
@ -49,6 +49,17 @@ namespace Waste.Application
        {
            return await _deviceService.BatchSetAsync(deviceBatchModel);
        }
-
+        /// <summary>
+        /// 设备状态修改
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+        /// <returns></returns>
+        [HttpGet]
+        [QueryParameters]
+        public async Task<ResultInfo> SetStatusAsync(Guid id, int status)
+        {
+            return await _deviceService.SetStatusAsync(id, status);
+        }
    }
 }
--- a/Waste.Application/Device/DeviceService.cs
+++ b/Waste.Application/Device/DeviceService.cs
@ -185,7 +185,7 @@ namespace Waste.Application.Device
                temquery = temquery.Where(x => SqlFunc.Subqueryable<W_Business>().Where(sql).Any());
            }
            string sorts = string.Format("{0} {1}", param.sort, param.order);
-            var query = await temquery.OrderBy(sorts)
+            var query = await temquery.OrderBy(x=>x.LastHeartTime,OrderByType.Desc)
                .Select(x => new DeviceList
                {
                    Id = x.Id,
@ -261,6 +261,25 @@ namespace Waste.Application.Device
                limit = param.limit
            };
        }
+
+        /// <summary>
+        /// 设备状态修改
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+        /// <returns></returns>
+        public async Task<ResultInfo> SetStatusAsync(Guid id,int status)
+        {
+            if(!await dbClient.Queryable<W_Device>().AnyAsync(x=>x.Id == id))
+            {
+                return new ResultInfo(ResultState.FAIL, "设备未找到");
+            }
+            await dbClient.Updateable<W_Device>().SetColumns(x => new W_Device { 
+                Status = status
+            }).Where(x => x.Id == id).ExecuteCommandAsync();
+            return new ResultInfo(ResultState.SUCCESS, "设备状态已更新");
+        }
+
        /// <summary>
        /// 信息提交
        /// </summary>
--- a/Waste.Application/Device/IDeviceService.cs
+++ b/Waste.Application/Device/IDeviceService.cs
@ -44,5 +44,12 @@ namespace Waste.Application
        /// <param name="id"></param>
        /// <returns></returns>
        Task<DeviceDetailS2Dto> DeviceDetailAsync(Guid id);
+        /// <summary>
+        /// 设备状态修改
+        /// </summary>
+        /// <param name="id">设备ID</param>
+        /// <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+        /// <returns></returns>
+        Task<ResultInfo> SetStatusAsync(Guid id,int status);
    }
 }
--- a/Waste.Application/ThirdApiInfo/OpenService.cs
+++ b/Waste.Application/ThirdApiInfo/OpenService.cs
@ -61,6 +61,10 @@ namespace Waste.Application.ThirdApiInfo
            {
                return new ResultInfo(ResultState.FAIL, "设备未找到");
            }
+            if(device.Status == (int)DeviceStatus.Error)
+            {
+                return new ResultInfo(ResultState.FAIL, "设备已停止运行");
+            }
            var returndata = new GetDevInfoResponseDto
            {
                ResultId = IDGen.NextID(),
--- a/Waste.Application/Waste.Application.xml
+++ b/Waste.Application/Waste.Application.xml
@ -574,6 +574,14 @@
            <param name="deviceBatchModel"></param>
            <returns></returns>
        </member>
+        <member name="M:Waste.Application.DeviceAppService.SetStatusAsync(System.Guid,System.Int32)">
+            <summary>
+            设备状态修改
+            </summary>
+            <param name="id">设备ID</param>
+            <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+            <returns></returns>
+        </member>
        <member name="T:Waste.Application.Device.DeviceService">
            <summary>
            设备管理
@ -607,6 +615,14 @@
            <param name="param"></param>
            <returns></returns>
        </member>
+        <member name="M:Waste.Application.Device.DeviceService.SetStatusAsync(System.Guid,System.Int32)">
+            <summary>
+            设备状态修改
+            </summary>
+            <param name="id">设备ID</param>
+            <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+            <returns></returns>
+        </member>
        <member name="M:Waste.Application.Device.DeviceService.SubmitFormAsync(Waste.Application.DeviceSubmit)">
            <summary>
            信息提交
@ -789,6 +805,14 @@
            <param name="id"></param>
            <returns></returns>
        </member>
+        <member name="M:Waste.Application.IDeviceService.SetStatusAsync(System.Guid,System.Int32)">
+            <summary>
+            设备状态修改
+            </summary>
+            <param name="id">设备ID</param>
+            <param name="status">设备状态,0-停用,1-正常,2-激活</param>
+            <returns></returns>
+        </member>
        <member name="T:Waste.Application.JobWorkder">
            <summary>
            定时任务
--- a/Waste.Web.Entry/Pages/Device/Index.cshtml
+++ b/Waste.Web.Entry/Pages/Device/Index.cshtml
@ -34,7 +34,12 @@
 </div>
 <script type="text/html" id="optpl">
    <a href="#" class="js-edit" title="编辑" data-id="{{d.id}}">编辑</a>&nbsp;
-    <a href="#" class="js-detail" title="详情" data-id="{{d.id}}">详情</a>
+    @*<a href="#" class="js-detail" title="详情" data-id="{{d.id}}">详情</a>&nbsp;*@
+    {{#if (d.status == 1){ }}
+    <a href="#" class="js-stop" title="设备停用" data-id="{{d.id}}">停用</a>
+    {{# } else if (d.status == 0){ }}
+        <a href="#" class="js-start" title="设备启用" data-id="{{d.id}}">启用</a>
+    {{#} }}
 </script>
 <script type="text/html" id="lefttoolbar">
    <button class="btn btn-primary btn-lg" lay-event="js-fenpei">分配</button>
@ -261,6 +266,22 @@
                    content:"/Device/Detail?id="+id
                });
            });
+            $("body").on("click", ".js-stop", function () {
+                var id = $(this).data('id');
+                common.confirm("确定停用?", function () {
+                    common.uajax({
+                        url: "/api/device/setstatus?id=" + id+"&status=0"
+                    });
+                });
+            });
+            $("body").on("click", ".js-start", function () {
+                var id = $(this).data('id');
+                common.confirm("确定启用?", function () {
+                    common.uajax({
+                        url: "/api/device/setstatus?id=" + id + "&status=1"
+                    });
+                });
+            });
    });
    </script>
 }
--- a/Waste.Web.Entry/Properties/PublishProfiles/waste.ybhdmob.com.pubxml.user
+++ b/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-10-12T03:25:18.7098128Z;True|2021-09-18T15:34:20.7386778+08:00;True|2021-09-15T11:09:28.0068993+08:00;True|2021-09-07T12:19:33.4635211+08:00;True|2021-09-07T11:36:13.4563799+08:00;True|2021-09-03T15:41:46.2819586+08:00;True|2021-08-31T17:16:16.0336390+08:00;True|2021-08-31T16:05:30.7224440+08:00;True|2021-08-23T09:44:46.2114418+08:00;True|2021-08-19T20:32:56.2854974+08:00;True|2021-08-18T14:01:33.0411246+08:00;True|2021-08-17T10:05:15.4299188+08:00;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;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>
+    <History>True|2021-10-12T07:18:06.6012215Z;True|2021-10-12T15:11:17.7752651+08:00;True|2021-10-12T14:54:39.0578509+08:00;True|2021-10-12T11:25:18.7098128+08:00;True|2021-09-18T15:34:20.7386778+08:00;True|2021-09-15T11:09:28.0068993+08:00;True|2021-09-07T12:19:33.4635211+08:00;True|2021-09-07T11:36:13.4563799+08:00;True|2021-09-03T15:41:46.2819586+08:00;True|2021-08-31T17:16:16.0336390+08:00;True|2021-08-31T16:05:30.7224440+08:00;True|2021-08-23T09:44:46.2114418+08:00;True|2021-08-19T20:32:56.2854974+08:00;True|2021-08-18T14:01:33.0411246+08:00;True|2021-08-17T10:05:15.4299188+08:00;True|2021-08-13T19:32:53.6307075+08:00;True|2021-08-13T19:29:50.5876782+08:00;True|2021-08-13T19:14:14.2545106+08:00;True|2021-08-13T15:24:09.4521125+08:00;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>
--- a/Waste.Web.Entry/wwwroot/js/lay/modules/common.js
+++ b/Waste.Web.Entry/wwwroot/js/lay/modules/common.js
@ -662,11 +662,11 @@
            if (typeof id === "undefined") {
                id = 'list';
            }
-            if (options) {
-                options["page"] = {
-                    curr: 1
-                };
-            }
+            //if (options) {
+            //    options["page"] = {
+            //        curr: 1
+            //    };
+            //}
            table.reload(id, options);
        },
        dialog: function (options) {
--- a/Waste.Web.Entry/wwwroot/js/page.min.js
+++ b/Waste.Web.Entry/wwwroot/js/page.min.js