Merge branch 'feature/iot' of https://gitee.com/alwayssuper/yudao-ui-admin-vue3 into feature/iot

# Conflicts:
#	pnpm-lock.yaml

.vscode/settings.json

@@ -87,7 +87,7 @@
     "source.fixAll.stylelint": "explicit"
   },
   "[vue]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "octref.vetur"
   },
   "i18n-ally.localesPaths": ["src/locales"],
   "i18n-ally.keystyle": "nested",

src/api/iot/device/device/index.ts

@@ -63,6 +63,16 @@ export enum DeviceStatusEnum {
   DISABLED = 3  // 已禁用
 }
 
+// IoT 模拟设备数据
+export interface SimulatorDataVO {
+  productKey: string
+  deviceKey: string
+  type: string
+  subType: string
+  reportTime: number // 时间戳
+  content: string  // 存储 JSON 字符串
+}
+
 // 设备 API
 export const DeviceApi = {
   // 查询设备分页
@@ -136,5 +146,14 @@ export const DeviceApi = {
   // 获取导入模板
   importDeviceTemplate: async () => {
     return await request.download({ url: `/iot/device/get-import-template` })
+  },
+
+  // 模拟设备
+  simulatorDevice: async (data: SimulatorDataVO) => {
+    return await request.post({ url: `/iot/device/data/simulator`, data })
+  },
+  //查询设备日志分页
+  getDeviceLogPage: async (params: any) => {
+    return await request.get({ url: `/iot/device/data/log/page`, params })
   }
 }

src/api/iot/thingmodel/index.ts

@@ -18,6 +18,13 @@ export interface ThingModelData {
 }
 
 /**
+ * IoT 模拟设备
+ */
+export interface SimulatorData extends ThingModelData {
+  simulateValue?: string | number // 用于存储模拟值
+}
+
+/**
  * ThingModelProperty 类型
  */
 export interface ThingModelProperty {
@@ -45,6 +52,11 @@ export const ThingModelApi = {
     return await request.get({ url: `/iot/thing-model/page`, params })
   },
 
+  // 获得产品物模型列表
+  getThingModelList: async (params: any) => {
+    return await request.get({ url: `/iot/thing-model/list`, params })
+  },
+
   // 获得产品物模型
   getThingModelListByProductId: async (params: any) => {
     return await request.get({

src/views/iot/device/device/detail/DeviceDetailsLog.vue

+<template>
+  <ContentWrap>
+    <!-- 搜索区域 -->
+    <el-form :model="queryParams" inline>
+      <el-form-item>
+        <el-select v-model="queryParams.type" placeholder="所有" class="!w-120px">
+          <el-option label="所有" value="" />
+          <el-option label="状态" value="state" />
+          <el-option label="事件" value="event" />
+          <el-option label="属性" value="property" />
+          <el-option label="服务" value="service" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="queryParams.keyword" placeholder="日志识符" class="!w-200px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-switch v-model="autoRefresh" class="ml-10px" /> 定时刷新
+      </el-form-item>
+    </el-form>
+
+    <!-- 日志列表 -->
+    <el-table v-loading="loading" :data="logList" :stripe="true" class="whitespace-nowrap">
+      <el-table-column label="时间" align="center" prop="time" width="180">
+        <template #default="scope">
+          {{ formatDate(scope.row.time) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="type" width="120" />
+      <el-table-column label="名称(标识符)" align="center" prop="subType" width="120" />
+      <el-table-column label="内容" align="center" prop="content" :show-overflow-tooltip="true" />
+    </el-table>
+
+    <!-- 分页 -->
+    <div class="mt-10px flex justify-end">
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getLogList"
+      />
+    </div>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { DeviceApi } from '@/api/iot/device/device'
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+
+const props = defineProps<{
+  deviceKey: number
+}>()
+
+//TODO:后续看看使用什么查询条件  目前后端是留了时间范围  type  subType
+// 查询参数 
+const queryParams = reactive({
+  deviceKey: props.deviceKey,
+  // type: '',
+  // keyword: '',
+  pageNo: 1,
+  pageSize: 10
+})
+
+// 列表数据
+const loading = ref(false)
+const total = ref(0)
+const logList = ref([])
+const autoRefresh = ref(false)
+let timer: any = null
+
+// 类型映射
+const typeMap = {
+  lifetime: '生命周期',
+  state: '设备状态',
+  property: '属性',
+  event: '事件',
+  service: '服务'
+}
+
+/** 查询日志列表 */
+const getLogList = async () => {
+  if (!props.deviceKey) return
+  loading.value = true
+  try {
+    const res = await DeviceApi.getDeviceLogPage(queryParams)
+    total.value = res.total
+    logList.value = res.list.map((item: any) => {
+      const log = {
+        time: item.reportTime,
+        type: item.type,
+        subType: item.subType,
+        content: item.content
+      }
+      return log
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 获取日志名称 */
+const getLogName = (log: any) => {
+  const { type, identifier } = log
+  let name = '未知'
+
+  if (type === 'property') {
+    if (identifier === 'set_reply') name = '设置回复'
+    else if (identifier === 'report') name = '上报'
+    else if (identifier === 'set') name = '设置'
+  } else if (type === 'state') {
+    name = identifier === 'online' ? '上线' : '下线'
+  } else if (type === 'lifetime') {
+    name = identifier === 'register' ? '注册' : name
+  }
+
+  return `${name}(${identifier})`
+}
+
+/** 搜索操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getLogList()
+}
+
+/** 监听自动刷新 */
+watch(autoRefresh, (newValue) => {
+  if (newValue) {
+    timer = setInterval(() => {
+      getLogList()
+    }, 5000)
+  } else {
+    clearInterval(timer)
+    timer = null
+  }
+})
+
+/** 监听设备ID变化 */
+watch(
+  () => props.deviceKey,
+  (newValue) => {
+    if (newValue) {
+      handleQuery()
+    }
+  }
+)
+
+/** 组件卸载时清除定时器 */
+onBeforeUnmount(() => {
+  if (timer) {
+    clearInterval(timer)
+  }
+})
+
+/** 初始化 */
+onMounted(() => {
+  if (props.deviceKey) {
+    getLogList()
+  }
+})
+</script>

src/views/iot/device/device/detail/index.vue

@@ -16,6 +16,12 @@
       </el-tab-pane>
       <el-tab-pane label="子设备管理" v-if="product.deviceType === DeviceTypeEnum.GATEWAY" />
       <el-tab-pane label="设备影子" />
+      <el-tab-pane label="设备日志" name="log">
+        <DeviceDetailsLog v-if="activeTab === 'log'"  :deviceKey="device.deviceKey" />
+      </el-tab-pane>
+      <el-tab-pane label="模拟设备" name="simulator">
+        <DeviceDetailsSimulator v-if="activeTab === 'simulator'" :product="product" :device="device" />
+     </el-tab-pane>
     </el-tabs>
   </el-col>
 </template>
@@ -26,7 +32,8 @@ import { DeviceTypeEnum, ProductApi, ProductVO } from '@/api/iot/product/product
 import DeviceDetailsHeader from './DeviceDetailsHeader.vue'
 import DeviceDetailsInfo from './DeviceDetailsInfo.vue'
 import DeviceDetailsModel from './DeviceDetailsModel.vue'
-
+import DeviceDetailsLog from './DeviceDetailsLog.vue'
+import DeviceDetailsSimulator from './DeviceDetailsSimulator.vue'
 defineOptions({ name: 'IoTDeviceDetail' })
 
 const route = useRoute()