src/api/iot/thingmodel/index.ts

@@ -186,7 +186,7 @@ export const ThingModelApi = {
 
   // 新增产品物模型
   createThingModel: async (data: ThingModelData) => {
-    return await request.post({ url: `/iot/thing-model-common/create`, data })
+    return await request.post({ url: `/iot/thing-model/create`, data })
   },
 
   // 修改产品物模型

src/views/iot/commonThing/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <ContentWrap>
+    <el-form
+      ref="queryFormRef"
+      :model="queryParams"
+      :inline="true"
+      class="-mb-15px"
+      label-width="80px">
+      <el-form-item label="功能标识" prop="identifier">
+        <el-input
+          v-model="queryParams.identifier"
+          class="!w-150px"
+          clearable
+          placeholder="请输入功能标识"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="功能名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-150px"
+          clearable
+          placeholder="请输入功能名称"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="功能类型" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          class="!w-150px"
+          clearable
+          placeholder="请选择功能类型">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.IOT_THING_MODEL_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button plain type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <ContentWrap>
+    <zm-table :loading="loading" :data="list">
+      <zm-table-column align="center" label="功能标识" prop="identifier" min-width="160" />
+      <zm-table-column align="center" label="功能名称" prop="name" min-width="160" />
+      <zm-table-column align="center" label="功能描述" prop="description" min-width="180" />
+      <zm-table-column align="center" label="功能类型" prop="type" width="120">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.IOT_THING_MODEL_TYPE" :value="row.type" />
+        </template>
+      </zm-table-column>
+      <zm-table-column align="left" label="属性 JSON" min-width="220">
+        <template #default="{ row }">
+          <JsonPreview :value="row.property" />
+        </template>
+      </zm-table-column>
+      <zm-table-column align="left" label="事件 JSON" min-width="220">
+        <template #default="{ row }">
+          <JsonPreview :value="row.event" />
+        </template>
+      </zm-table-column>
+      <zm-table-column align="left" label="服务 JSON" min-width="220">
+        <template #default="{ row }">
+          <JsonPreview :value="row.service" />
+        </template>
+      </zm-table-column>
+      <zm-table-column align="center" label="操作" fixed="right" width="140">
+        <template #default="{ row }">
+          <el-button link type="primary" @click="openForm('update', row.id)"> 编辑 </el-button>
+          <el-button link type="danger" @click="handleDelete(row.id)"> 删除 </el-button>
+        </template>
+      </zm-table-column>
+    </zm-table>
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList" />
+  </ContentWrap>
+
+  <ThingModelForm ref="formRef" mode="common" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { h } from 'vue'
+import { CommonThingModelData, ThingModelCommon } from '@/api/iot/thingmodel'
+import ThingModelForm from '@/views/iot/thingmodel/ThingModelFormCommon.vue'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'IoTCommonThingModel' })
+
+const { t } = useI18n()
+const message = useMessage()
+
+const loading = ref(false)
+const total = ref(0)
+const list = ref<CommonThingModelData[]>([])
+const queryFormRef = ref()
+const formRef = ref()
+
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  identifier: '',
+  name: '',
+  type: undefined as number | undefined
+})
+
+const formatJsonText = (value: unknown) => {
+  if (!value) {
+    return '-'
+  }
+  if (typeof value === 'string') {
+    return value
+  }
+  try {
+    return JSON.stringify(value, null, 2)
+  } catch {
+    return String(value)
+  }
+}
+
+const JsonPreview = (props: { value?: unknown }) =>
+  h(
+    'div',
+    {
+      style: {
+        whiteSpace: 'pre-wrap',
+        wordBreak: 'break-all',
+        lineHeight: '20px',
+        maxHeight: '120px',
+        overflow: 'auto'
+      }
+    },
+    formatJsonText(props.value)
+  )
+
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ThingModelCommon.getCommonThingModelPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+const resetQuery = () => {
+  queryFormRef.value?.resetFields()
+  handleQuery()
+}
+
+const openForm = (type: string, id?: number) => {
+  formRef.value?.open(type, id)
+}
+
+const handleDelete = async (id?: number) => {
+  if (!id) {
+    return
+  }
+  try {
+    await message.delConfirm()
+    await ThingModelCommon.deleteCommonThingModel(id)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+onMounted(() => {
+  getList()
+})
+</script>

src/views/iot/thingmodel/ThingModelForm.vue

@@ -137,8 +137,8 @@ const submitForm = async () => {
   try {
     const data = cloneDeep(formData.value) as ThingModelData
     // 信息补全
-    // data.productId = product!.value.id
-    // data.productKey = product!.value.productKey
+    data.productId = product!.value.id
+    data.productKey = product!.value.productKey
     fillExtraAttributes(data)
     if (formType.value === 'create') {
       await ThingModelApi.createThingModel(data)

src/views/iot/thingmodel/ThingModelFormCommon.vue

@@ -0,0 +1,215 @@
+<!-- 产品的物模型表单 -->
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="ThingModelFormRules"
+      label-width="100px">
+      <el-form-item label="功能类型" prop="type">
+        <el-radio-group v-model="formData.type">
+          <el-radio-button
+            v-for="dict in getIntDictOptions(DICT_TYPE.IOT_THING_MODEL_TYPE)"
+            :key="dict.value"
+            :value="dict.value">
+            {{ dict.label }}
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="功能名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入功能名称" />
+      </el-form-item>
+      <el-form-item label="标识符" prop="identifier">
+        <el-input v-model="formData.identifier" placeholder="请输入标识符" />
+      </el-form-item>
+      <!-- 属性配置 -->
+      <ThingModelProperty
+        v-if="formData.type === IoTThingModelTypeEnum.PROPERTY"
+        v-model="formData.property" />
+      <!-- 服务配置 -->
+      <ThingModelService
+        v-if="formData.type === IoTThingModelTypeEnum.SERVICE"
+        v-model="formData.service" />
+      <!-- 事件配置 -->
+      <ThingModelEvent
+        v-if="formData.type === IoTThingModelTypeEnum.EVENT"
+        v-model="formData.event" />
+      <el-form-item label="描述" prop="description">
+        <el-input
+          v-model="formData.description"
+          :maxlength="200"
+          :rows="3"
+          placeholder="请输入属性描述"
+          type="textarea" />
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ProductVO } from '@/api/iot/product/product'
+import ThingModelProperty from './ThingModelProperty.vue'
+import ThingModelService from './ThingModelService.vue'
+import ThingModelEvent from './ThingModelEvent.vue'
+import { ThingModelCommon, ThingModelData, ThingModelFormRules } from '@/api/iot/thingmodel'
+import {
+  IOT_PROVIDE_KEY,
+  IoTDataSpecsDataTypeEnum,
+  IoTThingModelTypeEnum
+} from '@/views/iot/utils/constants'
+import { cloneDeep } from 'lodash-es'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { isEmpty } from '@/utils/is'
+
+/** IoT 物模型数据表单 */
+defineOptions({ name: 'IoTThingModelForm' })
+
+const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref<ThingModelData>({
+  type: IoTThingModelTypeEnum.PROPERTY,
+  dataType: IoTDataSpecsDataTypeEnum.INT,
+  property: {
+    dataType: IoTDataSpecsDataTypeEnum.INT,
+    dataSpecs: {
+      dataType: IoTDataSpecsDataTypeEnum.INT
+    }
+  },
+  service: {},
+  event: {}
+})
+
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ThingModelCommon.getCommonThingModel(id)
+      // 情况一：属性初始化
+      if (isEmpty(formData.value.property)) {
+        formData.value.dataType = IoTDataSpecsDataTypeEnum.INT
+        formData.value.property = {
+          dataType: IoTDataSpecsDataTypeEnum.INT,
+          dataSpecs: {
+            dataType: IoTDataSpecsDataTypeEnum.INT
+          }
+        }
+      }
+      // 情况二：服务初始化
+      if (isEmpty(formData.value.service)) {
+        formData.value.service = {}
+      }
+      // 情况三：事件初始化
+      if (isEmpty(formData.value.event)) {
+        formData.value.event = {}
+      }
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open, close: () => (dialogVisible.value = false) })
+
+/** 提交表单 */
+const emit = defineEmits(['success'])
+const submitForm = async () => {
+  await formRef.value.validate()
+  formLoading.value = true
+  try {
+    const data = cloneDeep(formData.value) as ThingModelData
+    // // 信息补全
+    // data.productId = product!.value.id
+    // data.productKey = product!.value.productKey
+    fillExtraAttributes(data)
+    if (formType.value === 'create') {
+      await ThingModelCommon.createCommonThingModel(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ThingModelCommon.updateCommonThingModel(data)
+      message.success(t('common.updateSuccess'))
+    }
+    // 关闭弹窗
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 填写额外的属性（处理不同类型的情况） */
+const fillExtraAttributes = (data: any) => {
+  // 属性
+  if (data.type === IoTThingModelTypeEnum.PROPERTY) {
+    removeDataSpecs(data.property)
+    data.dataType = data.property.dataType
+    data.property.identifier = data.identifier
+    data.property.name = data.name
+    delete data.service
+    delete data.event
+  }
+  // 服务
+  if (data.type === IoTThingModelTypeEnum.SERVICE) {
+    removeDataSpecs(data.service)
+    data.dataType = data.service.dataType
+    data.service.identifier = data.identifier
+    data.service.name = data.name
+    delete data.property
+    delete data.event
+  }
+  // 事件
+  if (data.type === IoTThingModelTypeEnum.EVENT) {
+    removeDataSpecs(data.event)
+    data.dataType = data.event.dataType
+    data.event.identifier = data.identifier
+    data.event.name = data.name
+    delete data.property
+    delete data.service
+  }
+}
+
+/** 处理 dataSpecs 为空的情况 */
+const removeDataSpecs = (val: any) => {
+  if (isEmpty(val.dataSpecs)) {
+    delete val.dataSpecs
+  }
+  if (isEmpty(val.dataSpecsList)) {
+    delete val.dataSpecsList
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    type: IoTThingModelTypeEnum.PROPERTY,
+    dataType: IoTDataSpecsDataTypeEnum.INT,
+    property: {
+      dataType: IoTDataSpecsDataTypeEnum.INT,
+      dataSpecs: {
+        dataType: IoTDataSpecsDataTypeEnum.INT
+      }
+    },
+    service: {},
+    event: {}
+  }
+  formRef.value?.resetFields()
+}
+</script>