From 36f4f8abdeb9d7d3dfedf61e7c750550353918a0 Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Thu, 6 Mar 2025 17:28:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(iot):=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=8E=A7=E5=88=B6=E6=8C=87=E4=BB=A4=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将设备信息获取方式改为使用 detail 方法，提高代码复用性
-增加对参数为空的校验，避免发送空命令
-
---
 .../modules/iot/device/service/impl/DeviceServiceImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
index a20f79b..3ba466a 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java
@@ -195,7 +195,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
 
     @Override
     public String send(Long deviceId, Integer qos, JSONObject paras) throws JSONException {
-        Device device = deviceRepo.selectOne(new LambdaQueryWrapper<Device>().eq(Device::getId, deviceId));
+        DeviceVo device = detail(deviceId);
         JSONObject payloadJson = new JSONObject();
         payloadJson.put("mid", 641);
         payloadJson.put("serviceId", "runParamsCommand");
@@ -205,6 +205,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceRepository, Device> imp
         payloadJson.put("msgType", "cloudReq");
         String payload = payloadJson.toString();
         String topic = "/r1/devices/" + device.getClientId() + "/datas";
+        if (paras.isEmpty()) {
+            throw new JSONException("参数不能为空");
+        }
         try {
             mqttSender.sendMsg(topic, qos, payload);
         } catch (Exception e) {