From d979c9025acbeb3761f2cd7da4223a2d9a4e2383 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Tue, 1 Apr 2025 12:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BF=A1=E6=81=AF=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=92=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/model/DeviceMqttConnectVO.java        | 10 ++++
 .../iot/service/impl/DeviceServiceImpl.java   |  2 +
 vue/src/views/iot/device/device-edit.vue      | 46 +++++++++++++------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceMqttConnectVO.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceMqttConnectVO.java
index 484c7c21..63790df3 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceMqttConnectVO.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceMqttConnectVO.java
@@ -27,6 +27,16 @@ public class DeviceMqttConnectVO {
      */
     private String passwd;
 
+    /**
+     * 订阅主题
+     */
+    private String subscribeTopic;
+
+    /**
+     * 下发主题
+     */
+    private String reportTopic;
+
     /**
      * 连接端口号
      */
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
index 1014f63b..f62adeb5 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
@@ -1174,6 +1174,8 @@ public class DeviceServiceImpl implements IDeviceService {
         String clientId = ProductAuthConstant.CLIENT_ID_AUTH_TYPE_SIMPLE + "&" + deviceMqttVO.getSerialNumber() + "&" + deviceMqttVO.getProductId() + "&" + deviceMqttVO.getUserId();
         // 组装返回结果
         connectVO.setClientId(clientId).setUsername(deviceMqttVO.getMqttAccount()).setPasswd(password).setPort(brokerPort);
+        connectVO.setSubscribeTopic("/" + deviceMqttVO.getProductId() + "/" + deviceMqttVO.getSerialNumber() + "/function/get");
+        connectVO.setReportTopic("/" + deviceMqttVO.getProductId() + "/" + deviceMqttVO.getSerialNumber() + "/property/post");
         return connectVO;
     }
 
diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index d717709e..46bd6435 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -45,9 +45,6 @@
                                     <template slot="prepend">Version</template>
                                 </el-input>
                             </el-form-item>
-                            <el-form-item label="模拟设备" prop="isSimulate">
-                                <el-switch v-model="form.isSimulate" active-text="" inactive-text="" :active-value="1" :inactive-value="0" :disabled="form.deviceType === 3"></el-switch>
-                            </el-form-item>
                             <el-form-item label="设备影子" prop="isShadow">
                                 <el-switch v-model="form.isShadow" active-text="" inactive-text="" :active-value="1" :inactive-value="0" :disabled="form.deviceType === 3"></el-switch>
                             </el-form-item>
@@ -63,7 +60,7 @@
                                 ></el-switch>
                             </el-form-item>
                             <el-form-item label="备注信息" prop="remark">
-                                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="1" />
+                                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" />
                             </el-form-item>
                         </el-col>
                         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
@@ -192,19 +189,25 @@
                 <div style="padding-bottom: 10px">设备二维码</div>
             </div>
         </el-dialog>
-        <el-dialog title="Mqtt连接参数" :visible.sync="openViewMqtt" width="600px" append-to-body>
+        <el-dialog title="Mqtt连接参数" :visible.sync="openViewMqtt" width="600px" show-close="true" append-to-body :close-on-click-modal="false">
             <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="150px">
-                <el-form-item label="clientId" prop="clientId">
-                    <el-input v-model="listQuery.clientId" disabled style="width: 80%" />
+                <el-form-item label="客户端ID" prop="clientId">
+                    <el-input v-model="listQuery.clientId" readonly style="width: 80%" />
                 </el-form-item>
-                <el-form-item label="username" prop="username">
-                    <el-input v-model="listQuery.username" disabled style="width: 80%" />
+                <el-form-item label="MQ账号" prop="username">
+                    <el-input v-model="listQuery.username" readonly style="width: 80%" />
                 </el-form-item>
-                <el-form-item label="passwd" prop="passwd">
-                    <el-input clearable v-model="listQuery.passwd" disabled style="width: 80%"></el-input>
+                <el-form-item label="MQ密码" prop="passwd">
+                    <el-input clearable v-model="listQuery.passwd" readonly style="width: 80%"></el-input>
                 </el-form-item>
-                <el-form-item label="port" prop="port">
-                    <el-input clearable v-model="listQuery.port" disabled style="width: 80%"></el-input>
+                <el-form-item label="订阅主题" prop="subscribeTopic">
+                    <el-input clearable v-model="listQuery.subscribeTopic" readonly style="width: 400px"></el-input>
+                </el-form-item>
+                <el-form-item label="发布主题" prop="reportTopic">
+                    <el-input clearable v-model="listQuery.reportTopic" readonly style="width: 400px"></el-input>
+                </el-form-item>
+                <el-form-item label="连接端口" prop="port">
+                    <el-input clearable v-model="listQuery.port" readonly style="width: 80%"></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -317,6 +320,8 @@ export default {
                 clientId: 0,
                 username: '',
                 passwd: '',
+                subscribeTopic: '',
+                reportTopic: '',
                 port: '',
             },
             openTip: false,
@@ -896,7 +901,20 @@ export default {
         doCopy(type) {
             if (type == 2) {
                 const input = document.createElement('input');
-                input.value = '{clientId:' + this.listQuery.clientId + ',username:' + this.listQuery.username + ',passwd:' + this.listQuery.passwd + ',port:' + this.listQuery.port + '}';
+                input.value =
+                    '{"clientId":"' +
+                    this.listQuery.clientId +
+                    '","username":"' +
+                    this.listQuery.username +
+                    '","passwd":"' +
+                    this.listQuery.passwd +
+                    '","subscribeTopic":"' +
+                    this.listQuery.subscribeTopic +
+                    '","reportTopic":"' +
+                    this.listQuery.reportTopic +
+                    '","port":"' +
+                    this.listQuery.port +
+                    '"}';
                 document.body.appendChild(input);
                 input.select(); //选中输入框
                 document.execCommand('Copy'); //复制当前选中文本到前切板