From d6da0cbc467839014945268a4e39163e249a8d84 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 25 Mar 2025 16:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91IoT:=20=E6=95=B0=E6=8D=AE=E6=A1=A5=E6=A2=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/rule/databridge/index.ts          | 24 ++++++++-------
 .../iot/rule/databridge/IoTDataBridgeForm.vue | 29 +++++++++++--------
 .../rule/databridge/config/HttpConfigForm.vue |  2 +-
 .../databridge/config/KafkaMQConfigForm.vue   |  2 +-
 .../rule/databridge/config/MqttConfigForm.vue |  2 +-
 .../databridge/config/RabbitMQConfigForm.vue  |  2 +-
 ...nfigForm.vue => RedisStreamConfigForm.vue} |  3 +-
 .../databridge/config/RocketMQConfigForm.vue  |  2 +-
 src/views/iot/rule/databridge/config/index.ts |  4 +--
 9 files changed, 39 insertions(+), 31 deletions(-)
 rename src/views/iot/rule/databridge/config/{RedisStreamMQConfigForm.vue => RedisStreamConfigForm.vue} (94%)

diff --git a/src/api/iot/rule/databridge/index.ts b/src/api/iot/rule/databridge/index.ts
index d4eb63668..b19b8e8cf 100644
--- a/src/api/iot/rule/databridge/index.ts
+++ b/src/api/iot/rule/databridge/index.ts
@@ -80,17 +80,21 @@ export interface RedisStreamMQConfig extends Config {
 }
 
 /** 数据桥梁类型 */
-// TODO @puhui999：枚举用 number 可以么？
 export const IoTDataBridgeConfigType = {
-  HTTP: '1',
-  TCP: '2',
-  WEBSOCKET: '3',
-  MQTT: '10',
-  DATABASE: '20',
-  REDIS_STREAM: '21',
-  ROCKETMQ: '30',
-  RABBITMQ: '31',
-  KAFKA: '32'
+  HTTP: 1,
+  TCP: 2,
+  WEBSOCKET: 3,
+  MQTT: 10,
+  DATABASE: 20,
+  REDIS_STREAM: 21,
+  ROCKETMQ: 30,
+  RABBITMQ: 31,
+  KAFKA: 32
+} as const
+
+export const IotDataBridgeDirectionEnum = {
+  INPUT: 1, // 输入
+  OUTPUT: 2 // 输出
 } as const
 
 // 数据桥梁 API
diff --git a/src/views/iot/rule/databridge/IoTDataBridgeForm.vue b/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
index 4e69c026f..ccf5d5a9c 100644
--- a/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
+++ b/src/views/iot/rule/databridge/IoTDataBridgeForm.vue
@@ -46,7 +46,7 @@
         v-if="showConfig(IoTDataBridgeConfigType.RABBITMQ)"
         v-model="formData.config"
       />
-      <RedisStreamMQConfigForm
+      <RedisStreamConfigForm
         v-if="showConfig(IoTDataBridgeConfigType.REDIS_STREAM)"
         v-model="formData.config"
       />
@@ -73,13 +73,19 @@
 </template>
 <script lang="ts" setup>
 import { DICT_TYPE, getDictObj, getIntDictOptions } from '@/utils/dict'
-import { DataBridgeApi, DataBridgeVO, IoTDataBridgeConfigType } from '@/api/iot/rule/databridge'
+import { CommonStatusEnum } from '@/utils/constants'
+import {
+  DataBridgeApi,
+  DataBridgeVO,
+  IoTDataBridgeConfigType,
+  IotDataBridgeDirectionEnum
+} from '@/api/iot/rule/databridge'
 import {
   HttpConfigForm,
   KafkaMQConfigForm,
   MqttConfigForm,
   RabbitMQConfigForm,
-  RedisStreamMQConfigForm,
+  RedisStreamConfigForm,
   RocketMQConfigForm
 } from './config'
 
@@ -94,9 +100,9 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<DataBridgeVO>({
-  status: 0,
-  direction: 1, // TODO @puhui999:枚举类
-  type: 1, // TODO @puhui999:枚举类
+  status: CommonStatusEnum.ENABLE,
+  direction: IotDataBridgeDirectionEnum.INPUT,
+  type: IoTDataBridgeConfigType.HTTP,
   config: {} as any
 })
 const formRules = reactive({
@@ -139,9 +145,9 @@ const formRules = reactive({
 })
 
 const formRef = ref() // 表单 Ref
-const showConfig = computed(() => (val: string) => {
+const showConfig = computed(() => (val: number) => {
   const dict = getDictObj(DICT_TYPE.IOT_DATA_BRIDGE_TYPE_ENUM, formData.value.type)
-  return dict && dict.value + '' === val
+  return dict && dict.value + '' === val + ''
 }) // 显示对应的 Config 配置项
 
 /** 打开弹窗 */
@@ -196,10 +202,9 @@ const handleTypeChange = (val: number) => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    // TODO @puhui999：换成枚举值哈
-    status: 0,
-    direction: 1,
-    type: 1,
+    status: CommonStatusEnum.ENABLE,
+    direction: IotDataBridgeDirectionEnum.INPUT,
+    type: IoTDataBridgeConfigType.HTTP,
     config: {} as any
   }
   formRef.value?.resetFields()
diff --git a/src/views/iot/rule/databridge/config/HttpConfigForm.vue b/src/views/iot/rule/databridge/config/HttpConfigForm.vue
index 0dabd97f1..799aed407 100644
--- a/src/views/iot/rule/databridge/config/HttpConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/HttpConfigForm.vue
@@ -73,7 +73,7 @@ onMounted(() => {
   }
 
   config.value = {
-    type: IoTDataBridgeConfigType.HTTP,
+    type: IoTDataBridgeConfigType.HTTP + '', // 序列化成对应类型时使用
     url: '',
     method: 'POST',
     headers: {},
diff --git a/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue b/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
index 91dfe382f..ca2817d06 100644
--- a/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/KafkaMQConfigForm.vue
@@ -34,7 +34,7 @@ onMounted(() => {
     return
   }
   config.value = {
-    type: IoTDataBridgeConfigType.KAFKA,
+    type: IoTDataBridgeConfigType.KAFKA + '', // 序列化成对应类型时使用
     bootstrapServers: '',
     username: '',
     password: '',
diff --git a/src/views/iot/rule/databridge/config/MqttConfigForm.vue b/src/views/iot/rule/databridge/config/MqttConfigForm.vue
index 2aa170110..7ab010b34 100644
--- a/src/views/iot/rule/databridge/config/MqttConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/MqttConfigForm.vue
@@ -34,7 +34,7 @@ onMounted(() => {
     return
   }
   config.value = {
-    type: IoTDataBridgeConfigType.MQTT,
+    type: IoTDataBridgeConfigType.MQTT + '', // 序列化成对应类型时使用
     url: '',
     username: '',
     password: '',
diff --git a/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue b/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
index b7ee5bb49..c61e35684 100644
--- a/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RabbitMQConfigForm.vue
@@ -49,7 +49,7 @@ onMounted(() => {
     return
   }
   config.value = {
-    type: IoTDataBridgeConfigType.RABBITMQ,
+    type: IoTDataBridgeConfigType.RABBITMQ + '', // 序列化成对应类型时使用
     host: '',
     port: 5672,
     virtualHost: '/',
diff --git a/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue b/src/views/iot/rule/databridge/config/RedisStreamConfigForm.vue
similarity index 94%
rename from src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue
rename to src/views/iot/rule/databridge/config/RedisStreamConfigForm.vue
index 415ceb90f..5f6dbe2c3 100644
--- a/src/views/iot/rule/databridge/config/RedisStreamMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RedisStreamConfigForm.vue
@@ -1,4 +1,3 @@
-<!-- TODO @puhui999：去掉 MQ 关键字哈 -->
 <template>
   <el-form-item label="主机地址" prop="config.host">
     <el-input v-model="config.host" placeholder="请输入主机地址，如：localhost" />
@@ -47,7 +46,7 @@ onMounted(() => {
     return
   }
   config.value = {
-    type: IoTDataBridgeConfigType.REDIS_STREAM,
+    type: IoTDataBridgeConfigType.REDIS_STREAM + '', // 序列化成对应类型时使用
     host: '',
     port: 6379,
     password: '',
diff --git a/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue b/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
index c1f4c1027..d78ddcb99 100644
--- a/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
+++ b/src/views/iot/rule/databridge/config/RocketMQConfigForm.vue
@@ -45,7 +45,7 @@ onMounted(() => {
     return
   }
   config.value = {
-    type: IoTDataBridgeConfigType.ROCKETMQ,
+    type: IoTDataBridgeConfigType.ROCKETMQ + '', // 序列化成对应类型时使用
     nameServer: '',
     accessKey: '',
     secretKey: '',
diff --git a/src/views/iot/rule/databridge/config/index.ts b/src/views/iot/rule/databridge/config/index.ts
index 77f3315a4..b3927dc94 100644
--- a/src/views/iot/rule/databridge/config/index.ts
+++ b/src/views/iot/rule/databridge/config/index.ts
@@ -3,7 +3,7 @@ import MqttConfigForm from './MqttConfigForm.vue'
 import RocketMQConfigForm from './RocketMQConfigForm.vue'
 import KafkaMQConfigForm from './KafkaMQConfigForm.vue'
 import RabbitMQConfigForm from './RabbitMQConfigForm.vue'
-import RedisStreamMQConfigForm from './RedisStreamMQConfigForm.vue'
+import RedisStreamConfigForm from './RedisStreamConfigForm.vue'
 
 export {
   HttpConfigForm,
@@ -11,5 +11,5 @@ export {
   RocketMQConfigForm,
   KafkaMQConfigForm,
   RabbitMQConfigForm,
-  RedisStreamMQConfigForm
+  RedisStreamConfigForm
 }