wenhongquan 2 лет назад
Родитель
Сommit
5cc1a462eb

+ 17 - 0
ruoyi-admin/src/main/java/com/ruoyi/ServerInitCommandLineRunner.java

@@ -0,0 +1,17 @@
+package com.ruoyi;
+
+import com.ruoyi.data.domain.bo.TblMqttBo;
+import com.ruoyi.data.service.MqttService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ServerInitCommandLineRunner implements CommandLineRunner {
+    @Autowired
+    private  MqttService mqttService;
+    @Override
+    public void run(String... args) throws Exception {
+        mqttService.createMqttMain(new TblMqttBo());
+    }
+}

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -269,8 +269,8 @@ management:
       external-file: ./logs/sys-console.log
 
 mqtt:
-  url: tcp://xt.wenhq.top:8581
-  clientid: mqttUser
+  url: tcp://200.200.19.121:31005
+  clientid: iotc_server
   user:
   password:
   topic: /sensor/#

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/data/service/impl/MqttServiceImpl.java

@@ -75,6 +75,7 @@ public class MqttServiceImpl implements MqttService {
         List<MqttObj> mqttObjList = tblEquipmentMqttMapper.selectMqttListByDeviceId(mqttObj);
         TblRecord tblRecord = new TblRecord();
         tblRecord.setEquipmentId(deviceId);
+        tblRecord.setSensorId(sensorId);
         tblRecord.setJson(mqttStr);
         tblRecord.setCreateBy("admin");
         tblRecord.setUpdateBy("admin");

+ 31 - 0
ruoyi-ui-vue3/src/views/device/sensordash/index.vue

@@ -90,6 +90,11 @@
                 <el-table-column label="操作">
                   <template #default="scope">
                     <div>
+                      <el-button link @click="lookdata(scope.row)" >
+                        <el-tooltip effect="dark" content="查看数据" >
+                          <el-icon><PieChart /></el-icon>
+                        </el-tooltip>
+                      </el-button>
 
                       <el-button link @click="goedit(scope.row)">
                         <el-tooltip effect="dark" content="编辑">
@@ -236,6 +241,22 @@
       </div>
 
     </el-dialog>
+
+    <el-dialog
+      title="测点数据查看"
+      v-model="datashow"
+      width="50%"
+      @close="datashow = false"
+    >
+      <div>
+<!--        显示测点实时数据-->
+
+      </div>
+      <div>
+<!--        显示历史数据 折线图-->
+
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -425,6 +446,16 @@ const cdbd = (item) => {
 
 }
 
+const datashow = ref(false);
+const lookdata = (item)=>{
+  //弹窗
+  datashow.value = true;
+  currentsensor.value = item;
+
+  //直接接mqtt 数据
+}
+
+
 const deldatapoint = (index)=>{
   pointdata.value.splice(index,1)
 }