【功能新增】IOT: 产品物模型，20%

2024-12-11 13:14:47 +08:00
parent 1ce8233159
commit fdc971dd03
7 changed files with 778 additions and 73 deletions
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@ -0,0 +1,98 @@
+<template>
+  <el-select
+    v-model="formData.property.dataType.type"
+    :disabled="!!formData.id"
+    placeholder="请选择数据类型"
+  >
+    <el-option key="int" label="int32 (整数型)" value="int" />
+    <el-option key="float" label="float (单精度浮点型)" value="float" />
+    <el-option key="double" label="double (双精度浮点型)" value="double" />
+    <el-option key="enum" label="enum(枚举型)" value="enum" />
+    <el-option key="bool" label="bool (布尔型)" value="bool" />
+    <el-option key="text" label="text (文本型)" value="text" />
+    <el-option key="date" label="date (时间型)" value="date" />
+    <el-option key="struct" label="struct (结构体)" value="struct" />
+    <el-option key="array" label="array (数组)" value="array" />
+  </el-select>
+  <!-- 情况一：数值型 -->
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+
+/** 物模型数据类型 */
+defineOptions({ name: 'ThingModelDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits)
+
+// dataType为INT的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "custom": true,
+//       "dataType": "INT",
+//       "defaultValue": "30",
+//       "max": "1440",
+//       "min": "0",
+//       "step": "10",
+//       "unit": "min"
+// }
+// }
+// dataType为TEXT的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "custom": true,
+//       "dataType": "TEXT",
+//       "id": 2412127,
+//       "length": 2048
+// }
+// }
+// dataType为ARRAY的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "childDataType": "INT",
+//       "custom": true,
+//       "dataType": "ARRAY",
+//       "size": 1
+// }
+// }
+// dataType为ENUM的dataSpecsList示例：
+//
+// {
+//   "dataSpecsList": [
+//   {
+//     "custom": false,
+//     "dataType": "ENUM",
+//     "defaultValue": "true",
+//     "name": "打开",
+//     "value": 1
+//   },
+//   {
+//     "custom": false,
+//     "dataType": "ENUM",
+//     "defaultValue": "false",
+//     "name": "关闭",
+//     "value": 0
+//   }
+// ]
+// }
+// dataType为STRUCT的dataSpecsList示例：
+//
+// {
+//   "childDataType": "TEXT",
+//     "childName": "卡编号",
+//     "dataSpecs": {
+//   "custom": true,
+//       "dataType": "TEXT",
+//       "length": 128
+// },
+//   "dataType": "STRUCT",
+//     "identifier": "CardNo",
+//     "name": "NVR所拥有的芯片信息"
+// }
+</script>
+
+<style lang="scss" scoped></style>
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
@ -0,0 +1,29 @@
+<template>
+  <el-select
+    v-model="formData.property.dataType.type"
+    :disabled="!!formData.id"
+    placeholder="请选择数据类型"
+  >
+    <el-option key="int" label="int32 (整数型)" value="int" />
+    <el-option key="float" label="float (单精度浮点型)" value="float" />
+    <el-option key="double" label="double (双精度浮点型)" value="double" />
+    <el-option key="enum" label="enum(枚举型)" value="enum" />
+    <el-option key="bool" label="bool (布尔型)" value="bool" />
+    <el-option key="text" label="text (文本型)" value="text" />
+    <el-option key="date" label="date (时间型)" value="date" />
+    <el-option key="struct" label="struct (结构体)" value="struct" />
+    <el-option key="array" label="array (数组)" value="array" />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+
+/** 物模型数据类型 */
+defineOptions({ name: 'ThingModelDataType' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits)
+</script>
+
+<style lang="scss" scoped></style>
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@ -1,17 +1,17 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
    <el-form
      ref="formRef"
+      v-loading="formLoading"
      :model="formData"
      :rules="formRules"
      label-width="100px"
-      v-loading="formLoading"
    >
      <el-form-item label="功能类型" prop="type">
        <el-radio-group v-model="formData.type">
-          <el-radio-button :value="1"> 属性 </el-radio-button>
-          <el-radio-button :value="2"> 服务 </el-radio-button>
-          <el-radio-button :value="3"> 事件 </el-radio-button>
+          <el-radio-button :value="1"> 属性</el-radio-button>
+          <el-radio-button :value="2"> 服务</el-radio-button>
+          <el-radio-button :value="3"> 事件</el-radio-button>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="功能名称" prop="name">
@ -20,38 +20,14 @@
      <el-form-item label="标识符" prop="identifier">
        <el-input
          v-model="formData.identifier"
-          placeholder="请输入标识符"
          :disabled="formType === 'update'"
+          placeholder="请输入标识符"
        />
      </el-form-item>
      <el-form-item label="数据类型" prop="type">
-        <el-select
-          v-model="formData.property.dataType.type"
-          placeholder="请选择数据类型"
-          :disabled="formType === 'update'"
-        >
-          <el-option key="int" label="int32 (整数型)" value="int" />
-          <el-option key="float" label="float (单精度浮点型)" value="float" />
-          <el-option key="double" label="double (双精度浮点型)" value="double" />
-          <!--          <el-option key="text" label="text (文本型)" value="text" />-->
-          <!--          <el-option key="date" label="date (日期型)" value="date" />-->
-          <!--          <el-option key="bool" label="bool (布尔型)" value="bool" />-->
-          <!--          <el-option key="enum" label="enum (枚举型)" value="enum" />-->
-          <!--          <el-option key="struct" label="struct (结构体)" value="struct" />-->
-          <!--          <el-option key="array" label="array (数组)" value="array" />-->
-        </el-select>
-      </el-form-item>
-      <el-form-item label="取值范围" prop="max">
-        <el-input v-model="formData.property.dataType.specs.min" placeholder="请输入最小值" />
-        <span class="mx-2">~</span>
-        <el-input v-model="formData.property.dataType.specs.max" placeholder="请输入最大值" />
-      </el-form-item>
-      <el-form-item label="步长" prop="step">
-        <el-input v-model="formData.property.dataType.specs.step" placeholder="请输入步长" />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="formData.property.dataType.specs.unit" placeholder="请输入单位" />
+        <ThingModelDataType v-model="formData" />
      </el-form-item>
+      <ThingModelNumberTypeDataSpecs v-model="formData" />
      <el-form-item label="读写类型" prop="accessMode">
        <el-radio-group v-model="formData.property.accessMode">
          <el-radio label="rw">读写</el-radio>
@ -60,21 +36,22 @@
      </el-form-item>
      <el-form-item label="属性描述" prop="property.description">
        <el-input
-          type="textarea"
          v-model="formData.property.description"
          placeholder="请输入属性描述"
+          type="textarea"
        />
      </el-form-item>
    </el-form>

    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>

-<script setup lang="ts">
+<script lang="ts" setup>
+import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
 import { ProductVO } from '@/api/iot/product/product'
 import {
  ProductFunctionAccessModeEnum,
@ -82,10 +59,11 @@ import {
  ThinkModelFunctionApi,
  ThinkModelFunctionVO
 } from '@/api/iot/thinkmodelfunction'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'

-const props = defineProps<{ product: ProductVO }>()
+defineOptions({ name: 'IoTProductThingModelForm' })

-defineOptions({ name: 'ThinkModelFunctionForm' })
+const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息

 const { t } = useI18n()
 const message = useMessage()
@ -184,8 +162,8 @@ const submitForm = async () => {
  formLoading.value = true
  try {
    const data = formData.value as unknown as ThinkModelFunctionVO
-    data.productId = props.product.id
-    data.productKey = props.product.productKey
+    data.productId = product!.value.id
+    data.productKey = product!.value.productKey
    if (formType.value === 'create') {
      await ThinkModelFunctionApi.createThinkModelFunction(data)
      message.success(t('common.createSuccess'))
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
@ -0,0 +1,59 @@
+<template>
+  <el-form-item label="取值范围" prop="max">
+    <div class="flex items-center justify-between">
+      <el-input v-model="formData.min" placeholder="请输入最小值" />
+      <span class="mx-2">~</span>
+      <el-input v-model="formData.max" placeholder="请输入最大值" />
+    </div>
+  </el-form-item>
+  <el-form-item label="步长" prop="step">
+    <el-input v-model="formData.step" placeholder="请输入步长" />
+  </el-form-item>
+  <el-form-item label="单位" prop="unit">
+    <el-select
+      :model-value="formData.unit ? formData.unitName + '-' + formData.unit : ''"
+      filterable
+      placeholder="请选择单位"
+      style="width: 240px"
+      @change="unitChange"
+    >
+      <el-option
+        v-for="(item, index) in UnifyUnitSpecsDTO"
+        :key="index"
+        :label="item.Name + '-' + item.Symbol"
+        :value="item.Name + '-' + item.Symbol"
+      />
+    </el-select>
+  </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+import { UnifyUnitSpecsDTO } from '@/views/iot/utils/constants'
+
+defineOptions({ name: 'ThingModelNumberTypeDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits) as Ref<DataConfig>
+type DataType = 'INT' | 'FLOAT' | 'DOUBLE'
+
+interface DataConfig {
+  dataType: DataType // 数据类型，取值为 INT、FLOAT 或 DOUBLE
+  max: string // 最大值，必须与 dataType 设置一致，且为 STRING 类型
+  min: string // 最小值，必须与 dataType 设置一致，且为 STRING 类型
+  step: string // 步长，必须与 dataType 设置一致，且为 STRING 类型
+  precise?: string // 精度，当 dataType 为 FLOAT 或 DOUBLE 时可选
+  defaultValue?: string // 默认值，可选
+  unit: string // 单位的符号
+  unitName: string // 单位的名称
+}
+
+/** 单位发生变化时触发 */
+const unitChange = (UnitSpecs: string) => {
+  const [unitName, unit] = UnitSpecs.split('-')
+  formData.value.unitName = unitName
+  formData.value.unit = unit
+}
+</script>
+
+<style lang="scss" scoped></style>
--- a/src/views/iot/product/product/detail/ThinkModelFunction.vue
+++ b/src/views/iot/product/product/detail/ThinkModelFunction.vue
@ -2,18 +2,18 @@
  <ContentWrap>
    <!-- 搜索工作栏 -->
    <el-form
-      class="-mb-15px"
-      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
      label-width="68px"
    >
      <el-form-item label="功能类型" prop="name">
        <el-select
          v-model="queryParams.type"
-          placeholder="请选择功能类型"
-          clearable
          class="!w-240px"
+          clearable
+          placeholder="请选择功能类型"
        >
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.IOT_PRODUCT_FUNCTION_TYPE)"
@ -24,46 +24,48 @@
        </el-select>
      </el-form-item>
      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['iot:think-model-function:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 添加功能
+        <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>
    <el-tabs>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-        <el-table-column label="功能类型" align="center" prop="type">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+        <el-table-column align="center" label="功能类型" prop="type">
          <template #default="scope">
            <dict-tag :type="DICT_TYPE.IOT_PRODUCT_FUNCTION_TYPE" :value="scope.row.type" />
          </template>
        </el-table-column>
-        <el-table-column label="功能名称" align="center" prop="name" />
-        <el-table-column label="标识符" align="center" prop="identifier" />
-        <el-table-column label="数据类型" align="center" prop="identifier" />
-        <el-table-column label="数据定义" align="center" prop="identifier" />
-        <el-table-column label="操作" align="center">
+        <el-table-column align="center" label="功能名称" prop="name" />
+        <el-table-column align="center" label="标识符" prop="identifier" />
+        <el-table-column align="center" label="数据类型" prop="identifier" />
+        <el-table-column align="center" label="数据定义" prop="identifier" />
+        <el-table-column align="center" label="操作">
          <template #default="scope">
            <el-button
+              v-hasPermi="[`iot:think-model-function:update`]"
              link
              type="primary"
              @click="openForm('update', scope.row.id)"
-              v-hasPermi="[`iot:think-model-function:update`]"
            >
              编辑
            </el-button>
            <el-button
+              v-hasPermi="['iot:think-model-function:delete']"
              link
              type="danger"
              @click="handleDelete(scope.row.id)"
-              v-hasPermi="['iot:think-model-function:delete']"
            >
              删除
            </el-button>
@ -72,23 +74,24 @@
      </el-table>
      <!-- 分页 -->
      <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNo"
+        :total="total"
        @pagination="getList"
      />
    </el-tabs>
  </ContentWrap>
  <!-- 表单弹窗：添加/修改 -->
-  <ThinkModelFunctionForm ref="formRef" :product="product" @success="getList" />
+  <ThingModelForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts">
-import { ProductVO } from '@/api/iot/product/product'
+<script lang="ts" setup>
 import { ThinkModelFunctionApi, ThinkModelFunctionVO } from '@/api/iot/thinkmodelfunction'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import ThinkModelFunctionForm from './ThinkModelFunctionForm.vue'
+import ThingModelForm from './ThingModelForm.vue'
+import { ProductVO } from '@/api/iot/product/product'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'

-const props = defineProps<{ product: ProductVO }>()
+defineOptions({ name: 'IoTProductThingModel' })

 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@ -104,12 +107,12 @@ const queryParams = reactive({
 })

 const queryFormRef = ref() // 搜索的表单
-
+const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
 /** 查询列表 */
 const getList = async () => {
  loading.value = true
  try {
-    queryParams.productId = props.product.id
+    queryParams.productId = product?.value?.id || -1
    const data = await ThinkModelFunctionApi.getThinkModelFunctionPage(queryParams)
    list.value = data.list
    total.value = data.total
--- a/src/views/iot/product/product/detail/index.vue
+++ b/src/views/iot/product/product/detail/index.vue
@ -8,8 +8,8 @@
      <el-tab-pane label="Topic 类列表" name="topic">
        <ProductTopic v-if="activeTab === 'topic'" :product="product" />
      </el-tab-pane>
-      <el-tab-pane label="功能定义" name="function">
-        <ThinkModelFunction v-if="activeTab === 'function'" :product="product" />
+      <el-tab-pane label="功能定义" lazy name="function">
+        <IoTProductThingModel ref="thingModelRef" />
      </el-tab-pane>
      <el-tab-pane label="消息解析" name="message" />
      <el-tab-pane label="服务端订阅" name="subscription" />
@ -22,9 +22,10 @@ import { DeviceApi } from '@/api/iot/device'
 import ProductDetailsHeader from './ProductDetailsHeader.vue'
 import ProductDetailsInfo from './ProductDetailsInfo.vue'
 import ProductTopic from './ProductTopic.vue'
-import ThinkModelFunction from './ThinkModelFunction.vue'
+import IoTProductThingModel from './ThingModel/index.vue'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useRouter } from 'vue-router'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'

 defineOptions({ name: 'IoTProductDetail' })

@ -38,6 +39,8 @@ const loading = ref(true) // 加载中
 const product = ref<ProductVO>({} as ProductVO) // 详情
 const activeTab = ref('info') // 默认激活的标签页

+provide(IOT_PROVIDE_KEY.PRODUCT, product) // 提供产品信息给产品信息详情页的所有子组件
+
 /** 获取详情 */
 const getProductData = async (id: number) => {
  loading.value = true