From 28ead10408f61e8ec70bfb8c54dcae0170eb9cf9 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Fri, 20 May 2022 21:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=BB=9F=E8=AE=A1=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/iot/controller/ToolController.java     | 4 ++--
 vue/src/views/iot/device/device-statistic.vue             | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
index 8199bb80..e961cecf 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
@@ -318,7 +318,7 @@ public class ToolController extends BaseController {
                 return;
             }
             String[] clientInfo = model.getClientid().split("&");
-            String deviceNum = clientInfo[0];
+            String deviceNum = clientInfo[1];
             Device device = deviceService.selectShortDeviceBySerialNumber(deviceNum);
             // 设备状态（1-未激活，2-禁用，3-在线，4-离线）
             if (model.getAction().equals("client_disconnected")) {
@@ -326,7 +326,7 @@ public class ToolController extends BaseController {
                 deviceService.updateDeviceStatusAndLocation(device, "");
                 // 发布设备状态
                 emqxService.publishStatus(device.getProductId(), device.getSerialNumber(), 4, device.getIsShadow());
-                // 清空保留消息，上线后发布新的属性功能保留消息
+                // 清空保留消息，上线后发布新的属性功能保留消息 TODO 发布的时候取消保留消息
                 emqxService.publishProperty(device.getProductId(), device.getSerialNumber(), null);
                 emqxService.publishFunction(device.getProductId(), device.getSerialNumber(), null);
             } else if (model.getAction().equals("client_connected")) {
diff --git a/vue/src/views/iot/device/device-statistic.vue b/vue/src/views/iot/device/device-statistic.vue
index 7d673529..c079c046 100644
--- a/vue/src/views/iot/device/device-statistic.vue
+++ b/vue/src/views/iot/device/device-statistic.vue
@@ -3,9 +3,6 @@
     <el-row>
         <el-col :span="24">
             <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="75px" style="">
-                <el-form-item label="最大数量" prop="deviceName">
-                    <el-input v-model="queryParams.params.maxSize" placeholder="请输入设备名称" clearable size="small" />
-                </el-form-item>
                 <el-form-item label="时间范围">
                     <el-date-picker v-model="daterangeTime" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
                 </el-form-item>
@@ -67,9 +64,7 @@ export default {
             queryParams: {
                 deviceId: 0,
                 identity: "",
-                params: {
-                    maxSize:'998'
-                },
+                params: {},
             },
         };
     },
@@ -104,7 +99,6 @@ export default {
                     this.queryParams.params['beginTime'] = this.daterangeTime[0];
                     this.queryParams.params['endTime'] = this.daterangeTime[1];
                 }
-                console.log(this.queryParams);
                 listMonitor(this.queryParams).then(response => {
                     let data = response.rows;
                     // 对象转数组