From a1b3d69ff1fb4019f6a7cf08ad8724f17f534730 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Tue, 29 Oct 2024 00:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=AB=AFid?=
 =?UTF-8?q?=E5=8F=8Awifi=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/device/iot/DeviceClientMsgDto.java    | 4 ++++
 .../org/dromara/web/domain/vo/EqEquipmentDetailVo.java    | 5 +++++
 .../src/main/java/org/dromara/web/service/IotService.java | 8 ++++++--
 .../dromara/web/service/impl/EqEquipmentServiceImpl.java  | 2 ++
 ruoyi-admin/src/main/resources/application-dev.yml        | 2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceClientMsgDto.java b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceClientMsgDto.java
index 789522987..896b72cab 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceClientMsgDto.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceClientMsgDto.java
@@ -31,5 +31,9 @@ public class DeviceClientMsgDto implements Serializable {
      * MCU版本
      */
     private String mcuVersion;
+    /**
+     * wifi名称
+     */
+    private String wifiName;
 }
 
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
index 3f2950050..04c602759 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
@@ -159,6 +159,11 @@ public class EqEquipmentDetailVo implements Serializable {
      */
     private String mcuVersion;
 
+    /**
+     * wifi名称
+     */
+    private String wifiName;
+
 
     /**
      * 设备状态
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
index 88686bc41..cd5a61079 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
@@ -151,7 +151,7 @@ public class IotService {
         map.put("entityType","DEVICE");
         map.put("entityId",deviceCode);
         map.put("scope","CLIENT_SCOPE");
-        String send = getSend(CommonYmlConfig.URL_IOT_SCOPE_ATTRIBUTE + "?keys=equipmentType,serializableNum,modelVersion,mcuVersion", map);
+        String send = getSend(CommonYmlConfig.URL_IOT_SCOPE_ATTRIBUTE + "?keys=equipmentType,serializableNum,modelVersion,mcuVersion,ssid", map);
 //        String send = getSend(CommonYmlConfig.URL_IOT_SCOPE_ATTRIBUTE + "?keys=", map);
         log.info("客户端属性获取：设备信息获取成功,设备编号：{}，IOT接口返回：{}", deviceCode, send);
         if (send.startsWith("{")) throw new RuntimeException(MessageUtils.message("message.fault.device.notfound"));
@@ -177,6 +177,8 @@ public class IotService {
                 result.setModelVersion(JSON.parseObject(resultString).getString("value"));
             }else if (key.equals("mcuVersion")){
                 result.setMcuVersion(JSON.parseObject(resultString).getString("value"));
+            }else if (key.equals("ssid")){
+                result.setWifiName(JSON.parseObject(resultString).getString("value"));
             }
         }
         return result;
@@ -239,7 +241,9 @@ public class IotService {
         Map<String, String> map = new HashMap<>();
         map.put("deviceProfileId",deviceProfileId);
         String send = getSend(CommonYmlConfig.URL_IOT_ota_otaPackages, map);
-        List<DeviceOtaPackages> deviceOtaPackages = JSON.parseArray(send, DeviceOtaPackages.class);
+        JSONObject jsonObject = JSONObject.parseObject(send);
+        String data = jsonObject.getString("data");
+        List<DeviceOtaPackages> deviceOtaPackages = JSON.parseArray(data, DeviceOtaPackages.class);
         return deviceOtaPackages;
     }
 
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
index 9432adf8c..9c0fff530 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
@@ -275,6 +275,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         result.setSerializableNum(clientMsg.getSerializableNum());
         result.setModelVersion(clientMsg.getModelVersion());
         result.setMcuVersion(clientMsg.getMcuVersion());
+        result.setWifiName(clientMsg.getWifiName());
 
 
         //获取遥测数据
@@ -420,6 +421,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         DeviceOtaPackages lastOtaPackage = list.get(0);
         DeviceOtaPackages currentOtaPackage = null;
         //设备包版本id
+        if (deviceDto.getFirmwareId()==null) throw new RuntimeException("设备未绑定OTA版本");
         String currentPackageId = deviceDto.getFirmwareId().getId();
         String lastPackageId = lastOtaPackage.getId().getId();
         for (DeviceOtaPackages deviceOtaPackages : list) {
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 261affb58..0b9906b2c 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -97,7 +97,7 @@ spring.data:
     # 数据库索引
     database: 2
     # redis 密码必须配置
-    password: ruoyi123
+#    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl