fix mqtt record

src/api/iot/device/index.ts

@@ -30,6 +30,15 @@ export interface DeviceVO {
   orgId: number // 组织设备id
   remark: string // 备注
   isEnable: boolean // 是否启用
+
+  deviceUseType: string // 数采设备类型
+  apIp: string // ap_ip
+  gateBridgeIp: string // 网桥ip
+  comServerIp: string // 串口服务器IP
+  comServerPort: string // 串口服务器端口
+  plcControllerIp: string // PLC控制器地址
+  plcScreenIp: string // PLC触控屏地址
+  orgMachineId: number // i机台id
 }
 
 // 物联设备 API

src/views/iot/device/DeviceForm.vue

@@ -170,6 +170,38 @@
       <el-form-item label="组织设备id" prop="orgId">
         <el-input v-model="formData.orgId" placeholder="请输入组织设备id" />
       </el-form-item>
+      <el-form-item label="数采设备类型" prop="deviceUseType">
+        <el-radio-group v-model="formData.deviceUseType">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_DEVICE_USE_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="ap_ip" prop="apIp">
+        <el-input v-model="formData.apIp" placeholder="请输入ap_ip" />
+      </el-form-item>
+      <el-form-item label="网桥ip" prop="gateBridgeIp">
+        <el-input v-model="formData.gateBridgeIp" placeholder="请输入网桥ip" />
+      </el-form-item>
+      <el-form-item label="串口服务器IP" prop="comServerIp">
+        <el-input v-model="formData.comServerIp" placeholder="请输入串口服务器IP" />
+      </el-form-item>
+      <el-form-item label="串口服务器端口" prop="comServerPort">
+        <el-input v-model="formData.comServerPort" placeholder="请输入串口服务器端口" />
+      </el-form-item>
+      <el-form-item label="PLC控制器地址" prop="plcControllerIp">
+        <el-input v-model="formData.plcControllerIp" placeholder="请输入PLC控制器地址" />
+      </el-form-item>
+      <el-form-item label="PLC触控屏地址" prop="plcScreenIp">
+        <el-input v-model="formData.plcScreenIp" placeholder="请输入PLC触控屏地址" />
+      </el-form-item>
+      <el-form-item label="i机台id" prop="orgMachineId">
+        <el-input v-model="formData.orgMachineId" placeholder="请输入i机台id" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>

src/views/iot/device/index.vue

@@ -169,6 +169,19 @@
       <el-table-column label="网关id" align="center" prop="gatewayId" />
       <el-table-column label="组织设备id" align="center" prop="orgId" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="数采设备类型" align="center" prop="deviceUseType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.IOT_DEVICE_USE_TYPE" :value="scope.row.deviceUseType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="ap_ip" align="center" prop="apIp" />
+      <el-table-column label="网桥ip" align="center" prop="gateBridgeIp" />
+      <el-table-column label="串口服务器IP" align="center" prop="comServerIp" />
+      <el-table-column label="串口服务器端口" align="center" prop="comServerPort" />
+      <el-table-column label="PLC控制器地址" align="center" prop="plcControllerIp" />
+      <el-table-column label="PLC触控屏地址" align="center" prop="plcScreenIp" />
+      <el-table-column label="i机台id" align="center" prop="orgMachineId" />
+
       <el-table-column label="是否启用" align="center" prop="isEnable" >
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />

src/views/iot/mqttrecord/index.vue

@@ -120,6 +120,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
+      <el-table-column label="时间戳" align="center" prop="deviceDataTimeLong" />
       <el-table-column label="数据" align="center" prop="deviceData" />
       <el-table-column label="设备编码" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />