diff --git a/src/api/things/otaPackage.ts b/src/api/things/otaPackage.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8e4fe6f42b1455f464160dc0c3c6b171dd729f07
--- /dev/null
+++ b/src/api/things/otaPackage.ts
@@ -0,0 +1,89 @@
+import { BasicModel, BasicQuery, Page } from "../model/baseModel";
+import { EntityId } from "/#/store";
+import { EntityType } from "/@/enums/entityTypeEnum";
+import { ContentTypeEnum } from "/@/enums/httpEnum";
+import { defHttp } from "/@/utils/http/axios";
+import { AxiosProgressEvent } from 'axios';
+
+export interface OtaPackageInfo extends BasicModel<EntityType.OTA_PACKAGE> {
+    tenantId: EntityId<EntityType.TENANT>;
+    deviceProfileId: EntityId<EntityType.DEVICE_PROFILE>;
+    title?: string;
+    type?: 'FIRMWARE' | 'SOFTWARE';
+    version?: string;
+    tag?: string;
+    url?: string;
+    hasData?: boolean;
+    fileName?: string;
+    contentType?: string;
+    checksum?: string;
+    dataSize?: number;
+    checksumAlgorithm?: 'MD5' | 'SHA256' | 'SHA384' | 'SHA512' | 'CRC32' | 'MURMUR3_32' | 'MURMUR3_128';
+}
+
+export interface otaPackage extends OtaPackageInfo {
+    data?: Recordable;
+}
+
+export interface OtaPackageUploadParam {
+    otaPackageId: string,
+    file: File | Blob,
+    checksumAlgorithm?: string,
+    checksum?: string,
+}
+
+export function downloadOtaPackage(otaPackageId: string) {
+    return defHttp.get(
+        { url: `/api/otaPackage/${otaPackageId}/download`, responseType: 'blob' },
+        { isReturnNativeResponse: true, joinPrefix: false }
+    );
+}
+
+export function getOtaPackageInfoById(otaPackageId: string) {
+    return defHttp.get<OtaPackageInfo>({
+        url: `/api/otaPackage/info/${otaPackageId}`,
+    })
+}
+
+export function getOtaPackageById(otaPackageId: string) {
+    return defHttp.get<otaPackage>({
+        url: `/api/otaPackage/${otaPackageId}`,
+    })
+}
+
+export function saveOtaPackageInfo(data: { otaPackageInfo: OtaPackageInfo, usesUrl: boolean } | any) {
+    return defHttp.postJson<OtaPackageInfo>({
+        url: '/api/otaPackage',
+        data
+    })
+}
+
+export function saveOtaPackageData(params: OtaPackageUploadParam, onUploadProgress?: (progressEvent: AxiosProgressEvent) => void) {
+    return defHttp.post<OtaPackageInfo>({
+        url: `/api/otaPackage/${params.otaPackageId}`,
+        params: { checksum: params.checksum, checksumAlgorithm: params.checksumAlgorithm },
+        data: { file: params.file },
+        headers: { 'Content-type': ContentTypeEnum.FORM_DATA, },
+        onUploadProgress
+    })
+}
+
+export function getOtaPackageList(params: BasicQuery) {
+    return defHttp.get<Page<OtaPackageInfo>>({
+        url: '/api/otaPackages',
+        params,
+    });
+}
+
+export function getOtaPackageListByDeviceProfile(deviceProfileId: string, type: string, params: BasicQuery) {
+    return defHttp.get<Page<OtaPackageInfo>>({
+        url: `/api/otaPackages/${deviceProfileId}/${type}`,
+        params,
+    });
+}
+
+export function deleteOtaPackage(otaPackageId: string) {
+    return defHttp.delete<void>({
+        url: `/api/otaPackage/${otaPackageId}`,
+    });
+}
\ No newline at end of file
diff --git a/src/enums/otaPackageEnum.ts b/src/enums/otaPackageEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4b39b0927927d8487f651c3bb103509730cae5cf
--- /dev/null
+++ b/src/enums/otaPackageEnum.ts
@@ -0,0 +1,19 @@
+export enum CHECK_SUM_ALGORITHM {
+    MD5 = 'MD5',
+    SHA256 = 'SHA256',
+    SHA384 = 'SHA384',
+    SHA512 = 'SHA512',
+    CRC32 = 'CRC32',
+    MURMUR3_32 = 'MURMUR3_32',
+    MURMUR3_128 = 'MURMUR3_128',
+}
+
+export const CHECK_SUM_ALGORITHM_OPTIONS = [
+    { value: CHECK_SUM_ALGORITHM.MD5, label: 'MD5' },
+    { value: CHECK_SUM_ALGORITHM.CRC32, label: 'CRC-32' },
+    { value: CHECK_SUM_ALGORITHM.SHA256, label: 'SHA-256' },
+    { value: CHECK_SUM_ALGORITHM.SHA384, label: 'SHA-384' },
+    { value: CHECK_SUM_ALGORITHM.SHA512, label: 'SHA-512' },
+    { value: CHECK_SUM_ALGORITHM.MURMUR3_32, label: 'MURMUR3-32' },
+    { value: CHECK_SUM_ALGORITHM.MURMUR3_128, label: 'MURMUR3-128' },
+]
\ No newline at end of file
diff --git a/src/locales/lang/en/things.ts b/src/locales/lang/en/things.ts
index c04a789d8cb58ced659b8b43f2d3f695bab6cdf6..dbef3ee9b527e98a039bdc7f9511f15f12573582 100644
--- a/src/locales/lang/en/things.ts
+++ b/src/locales/lang/en/things.ts
@@ -27,4 +27,5 @@ export default {
   entity: 'Entity',
   asset: 'Asset',
   entityView: 'Entity View',
+  ota: 'OTA Update',
 }
\ No newline at end of file
diff --git a/src/locales/lang/zh-CN/things.ts b/src/locales/lang/zh-CN/things.ts
index 9bd154cb4185f690c347a596bb78b59b48334fd1..944c98e005b226a05d3a8cb49914cec08bcd497f 100644
--- a/src/locales/lang/zh-CN/things.ts
+++ b/src/locales/lang/zh-CN/things.ts
@@ -27,4 +27,5 @@ export default {
   entity: '实体',
   asset: '资产',
   entityView: '实体视图',
+  ota: 'OTA升级',
 }
\ No newline at end of file
diff --git a/src/router/routes/modules/things.ts b/src/router/routes/modules/things.ts
index 73a5b9816b8a2655e2cfe4af744b8e2a50ff062f..6ad52f6bbe833acda4c0d8d5de444a37c1c81f03 100644
--- a/src/router/routes/modules/things.ts
+++ b/src/router/routes/modules/things.ts
@@ -91,51 +91,28 @@ const things: AppRouteModule = {
       },
     },
     {
-      path: 'entity',
-      name: 'Entity',
-      component: LAYOUT,
-      redirect: '/entity/index',
+      path: '/asset/list',
+      name: 'AssetList',
+      component: () => import('/@/views/things/asset/list.vue'),
       meta: {
         orderNo: 50,
-        single: true,
         icon: 'ant-design:desktop-outlined',
         tabIcon: 'ant-design:desktop-outlined',
-        title: t('things.entity'),
+        title: t('things.asset'),
+        useAuthority: [Authority.TENANT_ADMIN, Authority.CUSTOMER_USER]
+      },
+    },
+    {
+      path: '/entity-view/list',
+      name: 'EntityViewList',
+      component: () => import('/@/views/things/entityView/list.vue'),
+      meta: {
+        orderNo: 60,
+        icon: 'ant-design:windows-outlined',
+        tabIcon: 'ant-design:windows-outlined',
+        title: t('things.entityView'),
         useAuthority: [Authority.TENANT_ADMIN, Authority.CUSTOMER_USER]
       },
-      children: [
-        {
-          path: '/entity/index',
-          name: 'EntityIndex',
-          component: () => import('/@/views/things/entityIndex.vue'),
-          meta: {
-            icon: 'ant-design:desktop-outlined',
-            tabIcon: 'ant-design:desktop-outlined',
-            title: t('things.entity'),
-            useAuthority: [Authority.TENANT_ADMIN, Authority.CUSTOMER_USER]
-          }
-        }, {
-          path: '/asset/list',
-          name: 'AssetList',
-          component: () => import('/@/views/things/asset/list.vue'),
-          meta: {
-            icon: 'ant-design:desktop-outlined',
-            tabIcon: 'ant-design:desktop-outlined',
-            title: t('things.asset'),
-            useAuthority: [Authority.TENANT_ADMIN, Authority.CUSTOMER_USER]
-          },
-        },
-        {
-          path: '/entity-view/list',
-          name: 'EntityViewList',
-          component: () => import('/@/views/things/entityView/list.vue'),
-          meta: {
-            icon: 'ant-design:right-circle-outlined',
-            tabIcon: 'ant-design:right-circle-outlined',
-            title: t('things.entityView'),
-            useAuthority: [Authority.TENANT_ADMIN, Authority.CUSTOMER_USER]
-          },
-        }]
     },
     {
       path: 'profile',
@@ -229,7 +206,7 @@ const things: AppRouteModule = {
       component: LAYOUT,
       redirect: '/rule-chain/list',
       meta: {
-        orderNo: 130,
+        orderNo: 120,
         icon: 'ant-design:subnode-outlined',
         tabIcon: 'ant-design:subnode-outlined',
         title: t('things.ruleChain'),
@@ -262,6 +239,18 @@ const things: AppRouteModule = {
         },
       ]
     },
+    {
+      path: '/otaPackage/list',
+      name: 'OtaPackage',
+      component: () => import('/@/views/things/otaPackage/list.vue'),
+      meta: {
+        orderNo: 130,
+        icon: 'ant-design:paper-clip-outlined',
+        tabIcon: 'ant-design:paper-clip-outlined',
+        title: t('things.ota'),
+        useAuthority: [Authority.TENANT_ADMIN]
+      },
+    },
     {
       path: 'resources',
       name: 'Resource',
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 2a553d730e8c1024f59bc55e70dfcff4be67edd7..cf0c83ad0caf5599a53daae2f87ef4ca5ecf56f9 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -113,3 +113,10 @@ export function copyToClipboard(value: string, msg: string | undefined = '复制
 export const sleep = (time: number) => {
   return new Promise(resolve => setTimeout(resolve, time));
 }
+
+export function convertBytesToSize(bytes: number) {
+  const sizes = ['b', 'Kb', 'Mb', 'Gb', 'Tb']; // 存储单位的数组
+  if (bytes === 0) { return '0 b' };
+  const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
+  return Number(bytes / Math.pow(1024, i)).toFixed(2) + ' ' + sizes[i];
+}
diff --git a/src/views/things/desktop/sysadmin/index.vue b/src/views/things/desktop/sysadmin/index.vue
index 192582ae25a01cdfab7519580c55bd2b1d9022ee..65516bee3ccef69be60802550af9c9923c78f603 100644
--- a/src/views/things/desktop/sysadmin/index.vue
+++ b/src/views/things/desktop/sysadmin/index.vue
@@ -122,13 +122,13 @@
         </Row>
         </Col>
       </Row>
-      <Row :gutter="[16, 16]">
+      <!-- <Row :gutter="[16, 16]">
         <Col span="24">
         <Card size="small">
           <GeoMap height="600px" />
         </Card>
         </Col>
-      </Row>
+      </Row> -->
       </Col>
       <Col span="6">
       <GetStarted />
@@ -150,6 +150,7 @@ import CpuStateLine from '../components/chart/CpuStateLine.vue';
 import { ref, onMounted, onBeforeUnmount } from 'vue';
 import { EntityType } from '/@/enums/entityTypeEnum';
 import { isArray } from 'lodash';
+import { convertBytesToSize } from '/@/utils';
 const go = useGo();
 const { getAndIncrementCmdId, send, unsubscribe } = useWebsocketStore();
 
@@ -331,12 +332,7 @@ function initCmdId() {
   CPU_STATUS_CMD_ID.value = getAndIncrementCmdId();
 }
 
-function convertBytesToSize(bytes: number) {
-  const sizes = ['b', 'Kb', 'Mb', 'Gb', 'Tb']; // 存储单位的数组
-  if (bytes === 0) { return '0 b' };
-  const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
-  return Number(bytes / Math.pow(1024, i)).toFixed(2) + ' ' + sizes[i];
-}
+
 
 onBeforeUnmount(() => {
   unsubscribeEntityCount();
diff --git a/src/views/things/desktop/tenant/index.vue b/src/views/things/desktop/tenant/index.vue
index d0edbbcc79de725baa21281d1d5ad63d8862a318..d64bbd3a13aee56feb1550103e311041fba5ca00 100644
--- a/src/views/things/desktop/tenant/index.vue
+++ b/src/views/things/desktop/tenant/index.vue
@@ -15,9 +15,9 @@
         <Col span="6">
         <CustomerCountCard />
         </Col>
-        <Col span="24">
+        <!-- <Col span="24">
         <GeoMap :height="mapHeight + 'px'" :center="mapCity" />
-        </Col>
+        </Col> -->
         <Col span="24">
         <Card :tab-list="tabListTitle" :active-tab-key="activeKey" @tabChange="onTabChange">
           <p v-if="activeKey === 'tab1'">
diff --git a/src/views/things/otaPackage/detail.vue b/src/views/things/otaPackage/detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9212c4bcb658ada59c3d29dc9e866c73733800ca
--- /dev/null
+++ b/src/views/things/otaPackage/detail.vue
@@ -0,0 +1,132 @@
+<template>
+    <BasicDrawer v-bind="$attrs" :showFooter="false" @register="registerDrawer" width="60%">
+        <template #title>
+            <div class="flex flex-row items-center">
+                <Icon :icon="getTitle.icon" class="pr-3 m-1 drawer-title-icon" />
+                <div class="flex flex-col">
+                    <span class="text-lg font-bold">{{ getTitle.value || '· · · ·' }}</span>
+                    <span class="text-sm">OTA 升级详情</span>
+                </div>
+            </div>
+        </template>
+        <Space size="middle" class="mb-3">
+            <!-- <a-button type="primary success" @click="handleEditOtaPackage">
+                <Icon :icon="'clarity:note-edit-line'" />编辑包
+            </a-button> -->
+            <a-button type="primary" @click="handleDownload" :disabled="!record.dataSize">
+                <Icon :icon="'ant-design:download-outlined'" />下载包
+            </a-button>
+            <a-button type="primary" danger @click="handleDeleteOtaPackage">
+                <Icon :icon="'ant-design:delete-outlined'" />删除包
+            </a-button>
+        </Space>
+        <br />
+        <Space size="middle" class="mb-3">
+            <a-button @click="handleCopyOtaPackageInfoId">
+                <Icon :icon="'ant-design:copy-filled'" />
+                复制包ID
+            </a-button>
+            <a-button @click="handleCopyChecksum" v-if="!isEmpty(record.checksum)">
+                <Icon :icon="'ant-design:copy-filled'" />
+                复制校验和
+            </a-button>
+        </Space>
+        <Descriptions bordered>
+            <Descriptions.Item label="标题" :span="2">{{ record.title }}</Descriptions.Item>
+            <Descriptions.Item label="版本">{{ record.version }}</Descriptions.Item>
+            <Descriptions.Item label="版本标签" :span="3">{{ record.tag }}</Descriptions.Item>
+            <Descriptions.Item label="包类型">{{ record.type == 'SOFTWARE' ? '软件' : '固件' }}</Descriptions.Item>
+            <Descriptions.Item label="设备配置" :span="2">{{ deviceProfile?.name }}</Descriptions.Item>
+            <template v-if="!isEmpty(record.checksum)">
+                <Descriptions.Item label="校验和算法">{{ record.checksumAlgorithm }}</Descriptions.Item>
+                <Descriptions.Item label="校验和" :span="2">{{ record.checksum }}</Descriptions.Item>
+            </template>
+            <template v-if="!isEmpty(record.fileName)">
+                <Descriptions.Item label="文件名">{{ record.fileName }}</Descriptions.Item>
+                <Descriptions.Item label="文件大小（以字节为单位）">{{ record.dataSize }}</Descriptions.Item>
+                <Descriptions.Item label="内容类型">{{ record.contentType }}</Descriptions.Item>
+            </template>
+
+            <Descriptions.Item label="说明" :span="3">{{ record.additionalInfo?.description }}</Descriptions.Item>
+
+        </Descriptions>
+
+    </BasicDrawer>
+</template>
+<script lang="ts" setup name="OtaPackageDetail">
+import { ref, unref, computed } from 'vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { router } from '/@/router';
+import { copyToClipboard } from '/@/utils';
+import { Icon } from '/@/components/Icon';
+import { isEmpty } from 'lodash';
+import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+import { OtaPackageInfo, getOtaPackageInfoById } from '/@/api/things/otaPackage';
+import { getDeviceProfileInfoById, DeviceProfileInfo } from '/@/api/things/deviceProfile';
+import { Space, Descriptions } from 'ant-design-vue';
+
+
+const emit = defineEmits(['edit', 'delete', 'download', 'register',]);
+
+const { t } = useI18n('things');
+const { showMessage } = useMessage();
+const { meta } = unref(router.currentRoute);
+const record = ref<OtaPackageInfo>({} as OtaPackageInfo);
+
+const deviceProfile = ref<DeviceProfileInfo>();
+
+const getTitle = computed(() => ({
+    icon: meta.icon || 'ant-design:book-outlined',
+    value: record.value.title,
+}));
+
+
+const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    try {
+        setDrawerProps({ loading: true });
+        await clear();
+        record.value = await getOtaPackageInfoById(data.id.id);
+        if (record.value.deviceProfileId?.id) {
+            deviceProfile.value = await getDeviceProfileInfoById(record.value.deviceProfileId.id);
+        }
+    } catch (error: any) {
+        if (error.message) {
+            showMessage(error.message, 'error')
+        }
+        console.log('error', error);
+    } finally {
+        setDrawerProps({ loading: false });
+    }
+});
+
+async function clear() {
+    record.value = {} as OtaPackageInfo;
+}
+
+function handleCopyOtaPackageInfoId() {
+    copyToClipboard(record.value.id.id, '复制OTA包ID成功！')
+}
+
+function handleCopyChecksum() {
+    if (record.value.checksum) {
+        copyToClipboard(record.value.checksum, '复制校验和成功！')
+    }
+
+}
+
+function handleDeleteOtaPackage() {
+    emit('delete', record.value);
+    closeDrawer();
+}
+
+function handleEditOtaPackage() {
+    emit('edit', record.value);
+    closeDrawer();
+}
+
+function handleDownload() {
+    emit('download', record.value);
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/things/otaPackage/form.vue b/src/views/things/otaPackage/form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..51f0f850bc8e79db5cda42edf7d6e7446fbd4128
--- /dev/null
+++ b/src/views/things/otaPackage/form.vue
@@ -0,0 +1,222 @@
+<template>
+    <BasicModal v-bind="$attrs" :showFooter="true" @register="registerModal" @ok="handleSubmit" width="50%">
+        <template #title>
+            <Icon :icon="getTitle.icon" class="pr-1 m-1" />
+            <span> {{ getTitle.value }} </span>
+        </template>
+        <Form ref="formRef" :model="formState" layout="vertical">
+            <Row :gutter="20">
+                <Col :span="12">
+                <Form.Item label="标题" name="title" :rules="[{ required: true, message: '请输入标题!' }]">
+                    <Input v-model:value="formState.title" placeholder="请输入标题" />
+                </Form.Item>
+                </Col>
+                <Col :span="12">
+                <Form.Item label="版本" name="version" :rules="[{ required: true, message: '请输入版本!' }]">
+                    <Input v-model:value="formState.version" placeholder="请输入版本" />
+                </Form.Item>
+                </Col>
+            </Row>
+            <Form.Item label="版本标签" name="tag" help="自定义标签应与您设备报告的软件包版本相匹配。">
+                <Input v-model:value="formState.tag" placeholder="请输入版本标签" />
+            </Form.Item>
+            <Form.Item :name="['deviceProfileId', 'entityType']" v-show="false">
+                <Input v-model:value="formState.deviceProfileId.entityType" />
+            </Form.Item>
+            <Form.Item label="设备配置" :name="['deviceProfileId', 'id']" :rules="[{ required: true, message: '请选择设备配置' }]"
+                help="上传的包仅适用于具有所选配置的设备。">
+                <Select v-model:value="formState.deviceProfileId.id" :options="deviceProfileOptions" placeholder="请选择设备配置">
+                </Select>
+            </Form.Item>
+            <Form.Item label="包类型" name="type" :rules="[{ required: true, message: '请选择包类型' }]"
+                help="上传包后，您将无法修改标题、版本、设备配置和包类型">
+                <Select v-model:value="formState.type" :defaultValue="'FIRMWARE'" placeholder="请选择包类型">
+                    <Select.Option value="FIRMWARE">固件</Select.Option>
+                    <Select.Option value="SOFTWARE">软件</Select.Option>
+                </Select>
+            </Form.Item>
+            <Form.Item name="isURL">
+                <RadioGroup v-model:value="formState.isURL" :options="[
+                    { label: '上传二进制文件', value: false },
+                    { label: '使用外部URL', value: true }
+                ]">
+                </RadioGroup>
+
+            </Form.Item>
+            <template v-if="formState.isURL == true">
+                <Form.Item label="直接URL" name="url" :rules="[{ required: true, message: '请输入直接URL' }]">
+                    <Input v-model:value="formState.url" placeholder="请输入直接URL" />
+                </Form.Item>
+            </template>
+            <template v-else>
+                <Form.Item name="fileList" :rules="[{ validator: validatorFile }]">
+                    <Upload.Dragger v-model:fileList="fileList" :before-upload="beforeUpload">
+                        <p class="ant-upload-drag-icon">
+                            <Icon :icon="'ant-design:upload-outlined'" />
+                        </p>
+                        <p class="ant-upload-text">拖放或者点击选择一个文件</p>
+                    </Upload.Dragger>
+                </Form.Item>
+
+                <Form.Item name="autoCheck">
+                    <Checkbox v-model:checked="formState.autoCheck" @change="handleAutoCheckChange">自动生成校验和</Checkbox>
+                </Form.Item>
+                <template v-if="formState.autoCheck == false">
+                    <Row :gutter="20">
+                        <Col :span="10">
+                        <Form.Item label="校验和算法" name="checksumAlgorithm">
+                            <Select v-model:value="formState.checksumAlgorithm" :options="CHECK_SUM_ALGORITHM_OPTIONS">
+                            </Select>
+                        </Form.Item>
+                        </Col>
+                        <Col :span="14">
+                        <Form.Item label="校验和" name="checksum" help="如果校验和为空，会自动生成">
+                            <Input v-model:value="formState.checksum" placeholder="请输入校验和" />
+                        </Form.Item>
+                        </Col>
+                    </Row>
+                </template>
+            </template>
+
+            <Form.Item label="说明" :name="['additionalInfo', 'description']">
+                <Textarea v-model:value="formState.additionalInfo.description" />
+            </Form.Item>
+        </Form>
+    </BasicModal>
+</template>
+<script lang="ts" setup name="OtaPackageForm">
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { computed, reactive, ref, unref, watch } from 'vue';
+import { getDeviceProfileInfoList } from '/@/api/things/deviceProfile';
+import { Checkbox, Col, Form, Input, RadioGroup, Row, Select, Textarea, Upload } from 'ant-design-vue';
+import { OtaPackageInfo, getOtaPackageInfoById, saveOtaPackageInfo, saveOtaPackageData } from '/@/api/things/otaPackage';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { EntityType } from '/@/enums/entityTypeEnum';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { router } from '/@/router';
+import { CHECK_SUM_ALGORITHM, CHECK_SUM_ALGORITHM_OPTIONS } from '/@/enums/otaPackageEnum';
+
+const emit = defineEmits(['success', 'register']);
+
+const { t } = useI18n('things');
+const { showMessage } = useMessage();
+const { meta } = unref(router.currentRoute);
+
+const fileList = ref<Array<any>>([]);
+const formRef = ref<FormInstance>();
+
+const record = ref<OtaPackageInfo>({} as OtaPackageInfo);
+
+const getTitle = computed(() => ({
+    icon: meta.icon || 'ant-design:book-outlined',
+    value: record.value.id?.id ? t('编辑OTA包') : t('添加OTA包'),
+}));
+
+const deviceProfileOptions = ref<Array<any>>();
+
+
+const formState = reactive<any>({
+    title: '',
+    version: '',
+    tag: '',
+    type: 'FIRMWARE',
+    deviceProfileId: { entityType: EntityType.DEVICE_PROFILE, id: '' },
+    isURL: false,
+    url: '',
+    autoCheck: true,
+    checksumAlgorithm: CHECK_SUM_ALGORITHM.SHA256,
+    checksum: '',
+    additionalInfo: { description: '' },
+});
+
+watch([() => formState.title, () => formState.version], () => {
+    formState.tag = (formState.title || '') + ' ' + (formState.version || '')
+})
+
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({ loading: true });
+    record.value = { ...data, } as OtaPackageInfo;
+    clear();
+    if (data?.id?.id) {
+        const res = await getOtaPackageInfoById(data.id.id);
+        record.value = (res || {}) as OtaPackageInfo;
+        Object.keys(record.value).forEach(key => {
+            formState[key] = record.value[key];
+        })
+    }
+    await fetchDeviceProfile();
+    setModalProps({ loading: false });
+});
+
+function clear() {
+    formState.title = undefined;
+    formState.version = undefined;
+    formState.tag = undefined;
+    formState.type = 'FIRMWARE';
+    formState.deviceProfileId.if = undefined;
+    formState.isURL = false;
+    formState.url = undefined;
+    formState.autoCheck = true;
+    formState.checksumAlgorithm = CHECK_SUM_ALGORITHM.SHA256;
+    formState.checksum = undefined;
+    formState.additionalInfo = { description: undefined };
+    fileList.value = [];
+
+}
+
+function validatorFile() {
+    if (formState.isURL == false && fileList.value.length < 1) {
+        return Promise.reject('请选择一个软件包！');
+    } else {
+        return Promise.resolve();
+    }
+}
+
+async function fetchDeviceProfile() {
+    const res = await getDeviceProfileInfoList({ pageSize: 2147483647, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+    deviceProfileOptions.value = res.data.map(profile => ({ label: profile.name, value: profile.id?.id }));
+}
+
+function handleAutoCheckChange() {
+    formState.checksumAlgorithm = CHECK_SUM_ALGORITHM.SHA256;
+}
+
+function beforeUpload(file: any) {
+    fileList.value = [file];
+    return false;
+}
+
+async function handleSubmit() {
+    try {
+        const data = await formRef.value?.validate();
+        // const data = await validate();
+        setModalProps({ confirmLoading: true });
+
+        // console.log('submit', params, data, record);
+        const res = await saveOtaPackageInfo({ ...data, id: record.value.id })
+            .then(async (packageInfo) => {
+                if (formState.isURL == false) {
+                    return await saveOtaPackageData({
+                        otaPackageId: packageInfo.id.id,
+                        file: fileList.value[0].originFileObj,
+                        checksumAlgorithm: formState.checksumAlgorithm,
+                        checksum: formState.checksum
+                    })
+                }
+            })
+        showMessage(`${record.value.id?.id ? '修改' : '添加'}OTA包成功！`);
+        setTimeout(closeModal);
+        emit('success', data);
+    } catch (error: any) {
+        if (error && error.errorFields) {
+            showMessage(t('common.validateError'));
+        }
+        console.log('error', error);
+    } finally {
+        setModalProps({ confirmLoading: false });
+    }
+}
+
+</script>
\ No newline at end of file
diff --git a/src/views/things/otaPackage/list.vue b/src/views/things/otaPackage/list.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b984abe8111e7151511220125bfdcdf5b173baa2
--- /dev/null
+++ b/src/views/things/otaPackage/list.vue
@@ -0,0 +1,236 @@
+<template>
+    <div class="ota-list">
+        <BasicTable @register="registerTable">
+            <template #headerTop>
+                {{ t(getTitle.value) }}
+            </template>
+            <template #leftToolbar>
+                <a-button type="primary" @click="handleForm({})">
+                    <Icon icon="fluent:add-12-filled" /> 新增包
+                </a-button>
+                <a-input v-model:value="searchParam.textSearch" placeholder="输入搜索内容" allow-clear @change="reload"
+                    style="width: 240px;">
+                    <template #suffix>
+                        <Icon icon="ant-design:search-outlined" />
+                    </template>
+                </a-input>
+            </template>
+            <template #firstColumn="{ record }">
+                <a @click="handleDetail({ id: record.id, })" :title="record.title">
+                    {{ record.title }}
+                </a>
+            </template>
+            <template #checksum="{ record }">
+                <div v-if="!isEmpty(record.checksum)">
+                    {{ record.checksumAlgorithm }}: {{ record.checksum }}
+                </div>
+            </template>
+            <template #dataSize="{ record }">
+                <div v-if="record.dataSize">
+                    {{ convertBytesToSize(record.dataSize) }}
+                </div>
+            </template>
+
+        </BasicTable>
+        <InputForm @register="registerModal" @success="handleSuccess" />
+        <DetailDrawer @register="registerDrawer" @edit="handleForm" @delete="handleDelete" @download="handleDownload" />
+    </div>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: 'OtaPackageList',
+});
+</script>
+<script lang="ts" setup>
+import { defineComponent, reactive } from 'vue';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { useModal } from '/@/components/Modal';
+import { useDrawer } from '/@/components/Drawer';
+import { Icon } from '/@/components/Icon';
+import { convertBytesToSize } from '/@/utils';
+import { isEmpty } from 'lodash';
+import { downloadByData } from '/@/utils/file/download';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { BasicTable, BasicColumn, useTable } from '/@/components/Table';
+import { getOtaPackageList, deleteOtaPackage, downloadOtaPackage } from '/@/api/things/otaPackage';
+import InputForm from './form.vue';
+import DetailDrawer from './detail.vue';
+
+
+
+const { t } = useI18n('things');
+const { createConfirm, showMessage } = useMessage();
+
+const getTitle = {
+    value: 'OTA包',
+};
+
+const searchParam = reactive({
+    textSearch: '',
+})
+const tableColumns: BasicColumn[] = [
+    {
+        title: t('标题'),
+        dataIndex: 'title',
+        key: 'title',
+        width: 200,
+        sorter: true,
+        align: 'left',
+        fixed: 'left',
+        slot: 'firstColumn',
+    },
+    {
+        title: t('版本'),
+        dataIndex: 'version',
+        key: 'version',
+        width: 100,
+        sorter: true,
+        fixed: 'left',
+        align: 'left',
+    },
+    {
+        title: t('版本标签'),
+        dataIndex: 'tag',
+        key: 'tag',
+        align: 'left',
+    },
+    {
+        title: t('包类型'),
+        dataIndex: 'type',
+        key: 'type',
+        width: 100,
+        sorter: true,
+        align: 'center',
+        format: (text) => text == 'FIRMWARE' ? '固件' : '软件'
+    },
+    {
+        title: t('直接URL'),
+        dataIndex: 'url',
+        key: 'url',
+        sorter: true,
+        align: 'center',
+    },
+    {
+        title: t('文件名'),
+        dataIndex: 'fileName',
+        key: 'fileName',
+        sorter: true,
+        align: 'left',
+    },
+    {
+        title: t('文件大小'),
+        dataIndex: 'dataSize',
+        key: 'dataSize',
+        sorter: true,
+        width: 100,
+        align: 'right',
+        slot: 'dataSize',
+    },
+    {
+        title: t('校验和'),
+        dataIndex: 'checksum',
+        key: 'checksum',
+        align: 'left',
+        slot: 'checksum',
+    },
+
+    {
+        title: t('创建时间'),
+        dataIndex: 'createdTime',
+        key: 'createdTime',
+        format: 'date|YYYY-MM-DD HH:mm:ss',
+        sorter: true,
+        width: 160,
+        align: 'center',
+    },
+]
+
+const actionColumn: BasicColumn = {
+    width: 160,
+    actions: (record: Recordable) => [
+        {
+            icon: 'ant-design:download-outlined',
+            title: t('下载包'),
+            onClick: handleDownload.bind(this, { ...record }),
+            disabled: !record.dataSize,
+        },
+        {
+            icon: 'ant-design:delete-outlined',
+            color: 'error',
+            title: t('删除包'),
+            onClick: handleDelete.bind(this, { ...record }),
+        },
+    ],
+};
+
+const [registerModal, { openModal }] = useModal();
+const [registerDrawer, { openDrawer }] = useDrawer();
+const [registerTable, { reload }] = useTable({
+    api: getOtaPackageList,
+    beforeFetch: wrapFetchParams,
+    defSort: { sortProperty: 'createdTime', sortOrder: 'DESC' },
+    columns: tableColumns,
+    actionColumn: actionColumn,
+    showTableSetting: true,
+    useSearchForm: false,
+    canResize: true,
+});
+
+function wrapFetchParams(fetchParam: any) {
+    const page = fetchParam.page ? fetchParam.page - 1 : 0;
+    return { ...fetchParam, page: page, textSearch: searchParam.textSearch }
+}
+
+
+function handleForm(record: Recordable) {
+    openModal(true, record);
+}
+
+async function handleDelete(record: Recordable) {
+    createConfirm({
+        iconType: 'error',
+        title: `确定删除OTA升级[${record.title}]吗？`,
+        content: '请注意：确认后，OTA升级将不可恢复。',
+        centered: false,
+        okText: '删除',
+        okButtonProps: {
+            type: 'primary',
+            danger: true,
+        },
+        onOk: async () => {
+            try {
+                await deleteOtaPackage(record.id.id);
+                showMessage('删除成功！');
+            } catch (error: any) {
+                console.log(error);
+            } finally {
+                handleSuccess();
+            }
+        }
+
+    })
+}
+
+function handleSuccess() {
+    reload();
+}
+
+function handleDetail(record: Recordable) {
+    openDrawer(true, record);
+}
+
+async function handleDownload(record: Recordable) {
+    if (record.dataSize) {
+        const res = await downloadOtaPackage(record.id.id);
+        let name = res.headers['content-disposition'];
+        name = name && name.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/);
+        name = name && name.length >= 1 && name[1].replace("utf-8'zh_cn'", '');
+        downloadByData(res.data, name);
+    }
+}
+
+
+</script>
+<style lang="less">
+.ota-list {}
+</style>
\ No newline at end of file
diff --git a/src/views/things/ruleChain/flow/index.vue b/src/views/things/ruleChain/flow/index.vue
index f14941df9835857be788c55cbc4c944224984e51..b5e0bedb3f59a4111f33737c576ccf16a5e77340 100644
--- a/src/views/things/ruleChain/flow/index.vue
+++ b/src/views/things/ruleChain/flow/index.vue
@@ -69,8 +69,8 @@ import { isEmpty } from 'lodash';
 import { sleep } from '/@/utils';
 import RuleChainNode from './node.vue';
 import { useI18n } from '/@/hooks/web/useI18n';
-import NodeForm from './nodeComp/nodeForm.vue';
-import NodeDetail from './nodeComp/nodeDetail.vue';
+import NodeForm from './nodeForm.vue';
+import NodeDetail from './nodeDetail.vue';
 import { Loading } from '/@/components/Loading';
 import ConnectTypeForm from './connectTypeForm.vue';
 import { useMessage } from '/@/hooks/web/useMessage';
diff --git a/src/views/things/ruleChain/flow/nodeComp/1.vue b/src/views/things/ruleChain/flow/nodeComp/1.vue
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/views/things/ruleChain/flow/nodeComp/nodeDetail.vue b/src/views/things/ruleChain/flow/nodeDetail.vue
similarity index 83%
rename from src/views/things/ruleChain/flow/nodeComp/nodeDetail.vue
rename to src/views/things/ruleChain/flow/nodeDetail.vue
index dbfd7afe45064fd25521697d48862c19de607898..b0a78610c5618dc5dfabfa80f23cab7797e05438 100644
--- a/src/views/things/ruleChain/flow/nodeComp/nodeDetail.vue
+++ b/src/views/things/ruleChain/flow/nodeDetail.vue
@@ -28,24 +28,17 @@
         </TabPane>
       </Tabs>
     </template>
-    <div class="-translate-x-6 pointer-events-none" v-show="tabActiveKey == 'DETAIL'">
-      <Form layout="vertical">
-        <Row :gutter="16">
-          <Col :span="20">
-          <Form.Item label="节点名称" name="name">
-            <Input :value="record.name" placeholder="请输入节点名称" />
-          </Form.Item>
-          </Col>
-          <Col :span="4">
-          <Form.Item label="&nbsp;" name="debugMode">
+    <div class="-translate-x-6" v-show="tabActiveKey == 'DETAIL'">
+      <Descriptions layout="vertical" bordered :column="1">
+        <Descriptions.Item label="节点名称">
+          {{ record.name }}
+          <span :style="{ float: 'right' }">
             <Switch :checked="record.debugMode" size="small" /><span class="ml-2">调试模式</span>
-          </Form.Item>
-          </Col>
-        </Row>
-        <Form.Item label="描述信息" :name="['additionalInfo', 'description']">
-          <Textarea :value="record.additionalInfo?.description" placeholder="输入节点描述信息" :rows="3" />
-        </Form.Item>
-      </Form>
+          </span>
+        </Descriptions.Item>
+
+        <Descriptions.Item label="描述信息">{{ record.additionalInfo?.description }}</Descriptions.Item>
+      </Descriptions>
 
     </div>
     <div class="-translate-x-6" v-show="tabActiveKey == 'HELP'">
@@ -77,7 +70,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import { router } from '/@/router';
 import { Icon } from '/@/components/Icon';
 import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-import { Tabs, TabPane, Space, Typography, Form, Input, Row, Col, Switch, Textarea } from 'ant-design-vue';
+import { Tabs, TabPane, Space, Typography, Form, Input, Row, Col, Switch, Descriptions, Textarea } from 'ant-design-vue';
 import { RuleNode } from '/@/api/things/ruleChain';
 import { EntityType } from '/@/enums/entityTypeEnum';
 import { ComponentDescriptor } from '/@/api/things/componentDescriptor';
diff --git a/src/views/things/ruleChain/flow/nodeComp/nodeForm.vue b/src/views/things/ruleChain/flow/nodeForm.vue
similarity index 83%
rename from src/views/things/ruleChain/flow/nodeComp/nodeForm.vue
rename to src/views/things/ruleChain/flow/nodeForm.vue
index 6fa43b255261b3adf49884dc5ea7c8559ad6db0d..b180cb3450f56d794d61929367ed1dd247dbfbe6 100644
--- a/src/views/things/ruleChain/flow/nodeComp/nodeForm.vue
+++ b/src/views/things/ruleChain/flow/nodeForm.vue
@@ -19,6 +19,9 @@
         </Form.Item>
         </Col>
       </Row>
+      <component ref="compRef" :is="ruleChainTypes[formState.type]" :configuration="formState.configuration">
+
+      </component>
 
 
       <Form.Item label="描述信息" :name="['additionalInfo', 'description']">
@@ -39,29 +42,45 @@
     </Form>
   </BasicModal>
 </template>
-<script lang="ts" setup name="RuleChainNodeDataForm">
-import { ref, unref, computed, reactive } from 'vue';
-import { useI18n } from '/@/hooks/web/useI18n';
-import { useMessage } from '/@/hooks/web/useMessage';
+
+<script lang="ts">
+export default defineComponent({
+  name: "RuleChainNodeDataForm",
+});
+</script>
+
+<script lang="ts" setup >
+import { ref, unref, computed, defineComponent, reactive, getCurrentInstance } from 'vue';
+import { isEmpty } from 'lodash';
 import { router } from '/@/router';
 import { Icon } from '/@/components/Icon';
-import { useUserStore } from '/@/store/modules/user';
-
+import { useI18n } from '/@/hooks/web/useI18n';
 import { RuleNode } from '/@/api/things/ruleChain';
-import { BasicModal, useModalInner } from '/@/components/Modal';
-import { Form, Row, Col, Textarea, Input, Switch, InputNumber } from 'ant-design-vue';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { EntityType } from '/@/enums/entityTypeEnum';
 import { FormInstance } from 'ant-design-vue/lib/form';
+import { BasicModal, useModalInner } from '/@/components/Modal';
 import { ComponentDescriptor } from '/@/api/things/componentDescriptor';
-import { EntityType } from '/@/enums/entityTypeEnum';
-import { isEmpty } from 'lodash';
+import { Form, Row, Col, Textarea, Input, Switch, InputNumber } from 'ant-design-vue';
+import ruleChainTypes from './nodeTpl/rule-chain-types.json';
+const nodeTemplates = import.meta.glob('./nodeTpl/**/*.vue', { eager: true });
+
+const instance = getCurrentInstance();
+
+Object.keys(nodeTemplates).forEach(fileName => {
+  const comp = nodeTemplates[fileName];
+  if (instance && comp.default && comp.default.name) {
+    instance.appContext.components[comp.default.name] = comp.default
+  }
+})
 
 const emit = defineEmits(['success', 'cancel', 'register']);
 
 const { t } = useI18n('things');
-const userStore = useUserStore();
 const { showMessage } = useMessage();
 const { meta } = unref(router.currentRoute);
 
+const compRef = ref<any>();
 const formRef = ref<FormInstance>();
 
 const nodeId = ref('');
@@ -74,6 +93,7 @@ const getTitle = computed(() => ({
 }));
 
 
+
 const formState = reactive<RuleNode>({
   id: { entityType: EntityType.RULE_NODE, id: '' },
   ruleChainId: { entityType: EntityType.RULE_CHAIN, id: '' },
@@ -103,6 +123,9 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     formState.configuration = descriptor.value?.configurationDescriptor.nodeDefinition.defaultConfiguration || {};
   }
 
+  console.log(descriptor.value);
+
+
   setModalProps({ loading: false });
 });
 
@@ -122,9 +145,11 @@ async function handleSubmit() {
     setModalProps({ confirmLoading: true });
     const data = await formRef.value?.validate();
 
+    const configuration = await compRef.value.getConfiguration();
+
     // console.log('submit', params, data, record);
     setTimeout(closeModal);
-    emit('success', { ...data, id: formState.id, ruleChainId: formState.ruleChainId, });
+    emit('success', { ...data, configuration: configuration, id: formState.id, ruleChainId: formState.ruleChainId, });
   } catch (error: any) {
     if (error && error.errorFields) {
       showMessage(t('common.validateError'));
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a0241f921ca244576e4b3b5247282f04b05fc65b
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/assetProfileSwitch.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "asset-profile-switch",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue
new file mode 100644
index 0000000000000000000000000000000000000000..58fc4d2d177d4628e5cf25513d6af49d8e717084
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkAlarmStatus.vue
@@ -0,0 +1,57 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="报警状态" name="alarmStatusList" :rules="[{ required: true, message: '请选择报警状态!' }]">
+            <Checkbox.Group v-model:value="formState.alarmStatusList" :options="ALARM_SHOW_STATUS_OPTIONS">
+            </Checkbox.Group>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "check-alarm-status",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { ALARM_SHOW_STATUS_OPTIONS } from '/@/enums/alarmEnum';
+
+interface Configuration {
+    alarmStatusList: Array<string>;
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    alarmStatusList: ['ACTIVE_ACK', 'ACTIVE_UNACK'],
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.alarmStatusList = props.configuration.alarmStatusList },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b92b4399e3bbe5a84f988e5bab068ee99d38f5d1
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkFieldsPresence.vue
@@ -0,0 +1,89 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border  border-neutral-400 p-2 rounded">
+            <p class="text-base font-medium">检查字段</p>
+            <div class="p-2">
+                <Form.Item label="消息字段" name="messageNames" :rules="[{ validator: validatorFieldName }]">
+                    <Select v-model:value="formState.messageNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="元数据字段" name="metadataNames" :rules="[{ validator: validatorFieldName }]">
+                    <Select v-model:value="formState.metadataNames" mode="tags">
+                    </Select>
+                </Form.Item>
+            </div>
+
+        </div>
+
+        <Form.Item name="checkAllKeys">
+            <Checkbox v-model:checked="formState.checkAllKeys">
+                检查是否存在所有指定的字段
+            </Checkbox>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "check-fields-presence",
+});
+</script>
+<script lang="ts" setup >
+import { Checkbox, Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+import { defineComponent, reactive, ref, watch } from 'vue';
+
+
+interface Configuration {
+    checkAllKeys: boolean,
+    messageNames: Array<string>,
+    metadataNames: Array<string>,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+});
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    messageNames: [],
+    metadataNames: [],
+    checkAllKeys: true,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.checkAllKeys = props.configuration.checkAllKeys;
+        formState.messageNames = props.configuration.messageNames;
+        formState.metadataNames = props.configuration.metadataNames;
+    },
+    { immediate: true }
+)
+
+function validatorFieldName() {
+    if (!isEmpty(formState.messageNames) || !isEmpty(formState.metadataNames)) {
+        return Promise.resolve();
+    } else {
+        return Promise.reject('检查字段必填！');
+    }
+}
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7a175dbf03f8327c637dbb7e991942684751a061
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/checkRelationPresence.vue
@@ -0,0 +1,200 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border  border-neutral-400 p-2 rounded">
+            <p class="text-base font-medium">关系搜索参数</p>
+            <div class="p-2">
+                <Form.Item label="方向" name="direction">
+                    <Select v-model:value="formState.direction">
+                        <Select.Option value="FROM">从 发起者</Select.Option>
+                        <Select.Option value="TO">到 发起者</Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item label="关联类型" name="relationType" :rules="[{ required: true, message: '请选择关联类型!' }]">
+                    <Select v-model:value="formState.relationType"
+                        :options="relationTypeOptions.map(item => ({ value: item }))">
+                        <template #dropdownRender="{ menuNode: menu }">
+                            <v-nodes :vnodes="menu" />
+                            <Divider style="margin: 4px 0" />
+                            <Space style="padding: 4px 8px">
+                                <Input ref="inputRef" v-model:value="addName" placeholder="请输入关联关系" />
+                                <Button type="text" @click="addRelationType">
+                                    <template #icon>
+                                        <plus-outlined />
+                                    </template>
+                                    添加关联关系
+                                </Button>
+                            </Space>
+                        </template>
+                    </Select>
+                </Form.Item>
+                <Form.Item name="checkAllKeys">
+                    <Checkbox v-model:checked="formState.checkForSingleEntity">
+                        检查与特定实体的关系
+                    </Checkbox>
+                </Form.Item>
+                <Row :gutter="20" v-if="formState.checkForSingleEntity == true">
+                    <Col :span="12">
+                    <Form.Item label="实体类型" name="entityType">
+                        <Select v-model:value="formState.entityType" :options="entityTypeOptions"
+                            @change="handleEntityTypeChange"></Select>
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12" v-if="formState.entityType">
+                    <Form.Item :label="ENTITY_TYPE_OPTIONS.find(type => type.value == formState.entityType)?.label"
+                        name="entityId">
+                        <Select v-model:value="formState.entityId" :options="entityIdOptions"></Select>
+                    </Form.Item>
+                    </Col>
+
+                </Row>
+            </div>
+        </div>
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "check-relation-presence",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { PlusOutlined } from '@ant-design/icons-vue';
+import { Form, Select, Checkbox, Divider, Space, Input, Row, Col, Button } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { useUserStore } from '/@/store/modules/user';
+import { ENTITY_TYPE_OPTIONS, EntityType } from '/@/enums/entityTypeEnum';
+import { tenantById } from '/@/api/things/tenant';
+import { customerList } from '/@/api/things/customer';
+import { userList } from '/@/api/things/user';
+import { currentTenantDashboardList } from '/@/api/things/dashboard';
+import { getTenantAssetList } from '/@/api/things/asset';
+import { getTenantEntityViews } from '/@/api/things/entityView';
+import { getTenantDeviceList } from '/@/api/things/device';
+
+interface Configuration {
+    direction: string,
+    relationType: string,
+    checkForSingleEntity: boolean,
+    entityType: EntityType,
+    entityId: string,
+}
+
+const VNodes = defineComponent({
+    props: {
+        vnodes: {
+            type: Object,
+            required: true,
+        },
+    },
+    render() {
+        return this.vnodes;
+    },
+});
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+});
+
+const userStore = useUserStore();
+
+const addName = ref();
+const inputRef = ref();
+const formRef = ref<FormInstance>();
+const relationTypeOptions = ref(['Contains', 'Manages']);
+const entityIdOptions = ref();
+
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.DEVICE
+    //TODO edge;
+})
+
+
+const formState = reactive<any>({
+    direction: 'FROM',
+    relationType: 'Contains',
+    checkForSingleEntity: true,
+    entityType: undefined,
+    entityId: undefined,
+});
+
+watch(
+    () => props.configuration,
+    async () => {
+        formState.direction = props.configuration.direction;
+        formState.relationType = props.configuration.relationType;
+        formState.checkForSingleEntity = props.configuration.checkForSingleEntity;
+        formState.entityType = props.configuration.entityType;
+        formState.entityId = props.configuration.entityId;
+        if (formState.entityType) {
+            await handleEntityTypeChange(formState.entityType)
+        }
+    },
+    { immediate: true }
+)
+
+function addRelationType(e) {
+    e.preventDefault();
+    relationTypeOptions.value.push(addName.value);
+    addName.value = '';
+    setTimeout(() => {
+        inputRef.value?.focus();
+    }, 0);
+}
+
+async function handleEntityTypeChange(entityType) {
+    formState.entityId = undefined;
+    switch (entityType) {
+        case EntityType.TENANT:
+            const tenant = await tenantById(userStore.getUserInfo.tenantId.id);
+            entityIdOptions.value = [{ value: tenant.id.id, label: tenant.title }]
+            break;
+        case EntityType.CUSTOMER:
+            const customerResult = await customerList({ pageSize: 1000, page: 0, sortProperty: 'title', sortOrder: 'ASC' });
+            entityIdOptions.value = customerResult.data.map(item => ({ value: item.id.id, label: item.title }))
+            break;
+        case EntityType.USER:
+            const userResultList = await userList({ pageSize: 1000, page: 0, sortProperty: 'email', sortOrder: 'ASC' });
+            entityIdOptions.value = userResultList.data.map(item => ({ value: item.id.id, label: item.name }))
+            break;
+        case EntityType.DASHBOARD:
+            const dashboardList = await currentTenantDashboardList({ pageSize: 1000, page: 0, sortProperty: 'title', sortOrder: 'ASC' });
+            entityIdOptions.value = dashboardList.data.map(item => ({ value: item.id.id, label: item.title }))
+            break;
+        case EntityType.ASSET:
+            const assetResultList = await getTenantAssetList({ pageSize: 1000, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = assetResultList.data.map(item => ({ value: item.id.id, label: item.name }))
+            break;
+        case EntityType.ENTITY_VIEW:
+            const entityViewList = await getTenantEntityViews({ pageSize: 1000, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = entityViewList.data.map(item => ({ value: item.id.id, label: item.name }))
+            break;
+        case EntityType.DEVICE:
+            const deviceList = await getTenantDeviceList({ pageSize: 1000, page: 0, sortProperty: 'name', sortOrder: 'ASC' });
+            entityIdOptions.value = deviceList.data.map(item => ({ value: item.id.id, label: item.name }))
+            break;
+    }
+    //TODO edge;
+
+}
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0003fb1d69f2b88a3bb6a006879ce10ae5ae76bc
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/deviceProfileSwitch.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "device-profile-switch",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue
new file mode 100644
index 0000000000000000000000000000000000000000..88dfb8276dc8b84ca70441daca0bafbb56f7211b
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeFilte.vue
@@ -0,0 +1,71 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="设备类型" name="originatorTypes" :rules="[{ required: true, message: '请选择设备类型!' }]">
+            <Select v-model:value="formState.originatorTypes" :options="entityTypeOptions" mode="multiple">
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "entity-type-filter",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { EntityType, ENTITY_TYPE_OPTIONS } from '/@/enums/entityTypeEnum';
+
+interface Configuration {
+    originatorTypes: Array<EntityType>;
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+
+const entityTypeOptions = ENTITY_TYPE_OPTIONS.filter(item => {
+    return item.value == EntityType.TENANT
+        || item.value == EntityType.CUSTOMER
+        || item.value == EntityType.USER
+        || item.value == EntityType.DASHBOARD
+        || item.value == EntityType.ASSET
+        || item.value == EntityType.ENTITY_VIEW
+        || item.value == EntityType.DEVICE
+        || item.value == EntityType.RULE_CHAIN
+        || item.value == EntityType.RULE_NODE
+
+})
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    originatorTypes: [EntityType.DEVICE],
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.originatorTypes = props.configuration.originatorTypes },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3ed65bdf27183962fc83015bf247675c2937f151
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/entityTypeSwitch.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "entity-type-switch",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..fb6386d1fd242d26e7174f6c3f0b639114e33efa
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/gpsGeofencingFilter.vue
@@ -0,0 +1,160 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border  border-neutral-400 p-2 rounded">
+            <p class="text-base font-medium">坐标字段</p>
+            <div class="p-2">
+                <Row :gutter="20">
+                    <Col :span="12">
+                    <Form.Item label="纬度字段" name="latitudeKeyName" :rules="[{ required: true, message: '纬度字段名称不能为空!' }]">
+                        <Input v-model:value="formState.latitudeKeyName">
+                        </Input>
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="经度字段" name="longitudeKeyName" :rules="[{ required: true, message: '经度字段名称不能为空!' }]">
+                        <Input v-model:value="formState.longitudeKeyName" />
+                    </Form.Item>
+                    </Col>
+                </Row>
+                <Alert type="success" message="规则节点尝试从消息中检索指定的字段。如果它们不存在，它将在元数据中查找它们。" />
+            </div>
+        </div>
+        <div class="border  border-neutral-400 p-2 rounded mt-3">
+            <p class="text-base font-medium">地理围栏</p>
+            <div class="p-2">
+                <Form.Item label="边界类型" name="perimeterType" :rules="[{ required: true, message: '边界类型必选!' }]">
+                    <Select v-model:value="formState.perimeterType">
+                        <Select.Option value="POLYGON">多边形</Select.Option>
+                        <Select.Option value="CIRCLE">圆形</Select.Option>
+                    </Select>
+                </Form.Item>
+                <Form.Item name="fetchPerimeterInfoFromMessageMetadata">
+                    <Checkbox v-model:checked="formState.fetchPerimeterInfoFromMessageMetadata"> 从元数据中获取边界信息</Checkbox>
+                </Form.Item>
+                <Form.Item label="边界信息字段" name="perimeterKeyName" :rules="[{ required: true, message: '边界信息字段不能为空!' }]"
+                    help="包含边界信息的元数据字段名称。" v-if="formState.fetchPerimeterInfoFromMessageMetadata == true">
+                    <Input v-model:value="formState.perimeterKeyName" />
+                </Form.Item>
+
+                <Form.Item label="范围边界定义" name="polygonsDefinition" :rules="[{ required: true, message: '范围边界不能为空!' }]"
+                    help="使用以下格式手动定义多边形：[[lat1，lon1]，[lat2，lon2]，...，[latN，lonN]]。"
+                    v-if="formState.fetchPerimeterInfoFromMessageMetadata == false && formState.perimeterType == 'POLYGON'">
+                    <Input v-model:checked="formState.polygonsDefinition" />
+                </Form.Item>
+
+                <Row :gutter="20"
+                    v-if="formState.fetchPerimeterInfoFromMessageMetadata == false && formState.perimeterType == 'CIRCLE'">
+                    <Col :span="12">
+                    <Form.Item label="圆心纬度" name="centerLatitude" :rules="[{ required: true, message: '圆心纬度不能为空!' }]">
+                        <InputNumber v-model:value="formState.centerLatitude" :style="{ width: '100%' }" :step="0.01" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="圆心经度" name="centerLongitude" :rules="[{ required: true, message: '圆心经度不能为空!' }]">
+                        <InputNumber v-model:value="formState.centerLatitude" :style="{ width: '100%' }" :step="0.01" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="范围" name="range" :rules="[{ required: true, message: '范围不能为空!' }]">
+                        <InputNumber v-model:value="formState.range" :style="{ width: '100%' }" :step="0.01" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="范围单位" name="rangeUnit" :rules="[{ required: true, message: '范围单位不能为空!' }]">
+                        <Select v-model:value="formState.rangeUnit" :default-value="'METER'" :options="rangeUnitOptions">
+                        </Select>
+                    </Form.Item>
+                    </Col>
+                </Row>
+            </div>
+        </div>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "gps-geofencing-filter",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select, Input, Row, Col, Alert, Checkbox, InputNumber } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    latitudeKeyName: string,
+    longitudeKeyName: string,
+    perimeterKeyName: string,
+    polygonsDefinition: string,
+    perimeterType: 'POLYGON' | 'CIRCLE',
+    fetchPerimeterInfoFromMessageMetadata: boolean,
+    centerLatitude: number,
+    centerLongitude: number,
+    range: number,
+    rangeUnit: 'METER' | 'KILOMETER' | 'FOOT' | 'MILE' | 'NAUTICAL_MILE'
+
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const rangeUnitOptions = [
+    { value: 'METER', label: '米' },
+    { value: 'KILOMETER', label: '千米' },
+    { value: 'FOOT', label: '英尺' },
+    { value: 'MILE', label: '英里' },
+    { value: 'NAUTICAL_MILE', label: '海里' }
+]
+
+
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    latitudeKeyName: 'latitude',
+    longitudeKeyName: 'longitude',
+    perimeterKeyName: 'ss_perimeter',
+    polygonsDefinition: undefined,
+    perimeterType: 'POLYGON',
+    fetchPerimeterInfoFromMessageMetadata: true,
+    centerLatitude: undefined,
+    centerLongitude: undefined,
+    range: undefined,
+    rangeUnit: undefined
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.latitudeKeyName = props.configuration.latitudeKeyName;
+        formState.longitudeKeyName = props.configuration.longitudeKeyName;
+        formState.perimeterKeyName = props.configuration.perimeterKeyName;
+        formState.polygonsDefinition = props.configuration.polygonsDefinition;
+        formState.perimeterType = props.configuration.perimeterType;
+        formState.fetchPerimeterInfoFromMessageMetadata = props.configuration.fetchPerimeterInfoFromMessageMetadata;
+        formState.centerLatitude = props.configuration.centerLatitude;
+        formState.centerLongitude = props.configuration.centerLongitude;
+        formState.range = props.configuration.range;
+        formState.rangeUnit = props.configuration.rangeUnit;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..65db0aaf9cdeddf8fc0ebdf6c19b299534e438f7
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeFilter.vue
@@ -0,0 +1,95 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="消息类型" name="messageTypes" :rules="[{ required: true, message: '请选择消息类型!' }]">
+            <Select v-model:value="formState.messageTypes" :options="messageTypeOptions" mode="multiple">
+            </Select>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "message-type-filter",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    messageTypes: Array<string>;
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const messageTypeOptions = [
+    { value: "POST_ATTRIBUTES_REQUEST", label: "Post Attributes" },
+    { value: "POST_TELEMETRY_REQUEST", label: "Post Telemetry" },
+    { value: "TO_SERVER_RPC_REQUEST", label: "PRC Request to Device" },
+    { value: "RPC_CALL_FROM_SERVER_TO_DEVICE", label: "PRC Request from Device" },
+    { value: "RPC_QUEUED", label: "RPC Queued" },
+    { value: "RPC_SENT", label: "RPC Sent" },
+    { value: "RPC_DELIVERED", label: "RPC Delivered" },
+    { value: "RPC_SUCCESSFUL", label: "RPC Successful" },
+    { value: "RPC_TIMEOUT", label: "RPC Timeout" },
+    { value: "RPC_EXPIRED", label: "RPC Expired" },
+    { value: "RPC_FAILED", label: "RPC Failed" },
+    { value: "RPC_DELETED", label: "RPC Deleted" },
+    { value: "ACTIVITY_EVENT", label: "Activity Event" },
+    { value: "INACTIVITY_EVENT", label: "InActivity Event" },
+    { value: "CONNECT_EVENT", label: "Connect Event" },
+    { value: "DISCONNECT_EVENT", label: "Disconnect Event" },
+    { value: "ENTITY_CREATED", label: "Entity Created" },
+    { value: "ENTITY_UPDATED", label: "Entity Updated" },
+    { value: "ENTITY_DELETED", label: "Entity Deleted" },
+    { value: "ENTITY_ASSIGNED", label: "Entity Assigned" },
+    { value: "ENTITY_UNASSIGNED", label: "Entity UnAssigned" },
+    { value: "ATTRIBUTES_UPDATED", label: "Attributes Updated" },
+    { value: "ATTRIBUTES_DELETED", label: "Attributes Deleted" },
+    { value: "ALARM_ACKNOWLEDGED", label: "Alarm Acknowledged" },
+    { value: "ALARM_CLEARED", label: "Alarm Cleared" },
+    { value: "ALARM_ASSIGNED", label: "Alarm Assigned" },
+    { value: "ALARM_UNASSIGNED", label: "Alarm UnAssigned" },
+    { value: "COMMENT_CREATED", label: "Comment Created" },
+    { value: "COMMENT_UPDATED", label: "Comment Updated" },
+    { value: "ENTITY_ASSIGNED_FROM_TENANT", label: "Entity assigned from Tenant" },
+    { value: "ENTITY_ASSIGNED_TO_TENANT", label: "Entity Assigned to Tenant" },
+    { value: "TIMESERIES_UPDATED", label: "Timeseries Updated" },
+    { value: "TIMESERIES_DELETED", label: "Timeseries Deleted" }
+]
+
+
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    messageTypes: ['POST_ATTRIBUTES_REQUEST'],
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.messageTypes = props.configuration.messageTypes },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c0d2f679bac5d38ceba04f6beaf56ef6ebeddba1
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/messageTypeSwitch.vue
@@ -0,0 +1,56 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="version" v-show="false">
+            <Input v-model:value="formState.version">
+            </Input>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "message-type-switch",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    version: number
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    version: 0,
+});
+
+watch(
+    () => props.configuration,
+    () => { formState.version = props.configuration.version },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c1e656aeebb42b36b1856e8958eed66c36f6c1d1
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
@@ -0,0 +1,111 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <div class="flex justify-center mb-2">
+            <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                <Radio.Button value="JS">JavaScript</Radio.Button>
+                <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+            </Radio.Group>
+        </div>
+        <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+            <div>
+                <div class="flex justify-between">
+                    <p class="text-gray-500">function Filter(msg, metadata, msgType) {</p>
+                    <Space>
+                        <Tooltip title="格式化">
+                            <Icon class="cursor-pointer" @click="handleFormatScript"
+                                :icon="'ant-design:format-painter-filled'" />
+                        </Tooltip>
+                        <Tooltip title="测试脚本功能">
+                            <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                        </Tooltip>
+                        <Tooltip title="全屏">
+                            <Icon class="cursor-pointer" @click="handleFullScreen"
+                                :icon="'ant-design:fullscreen-outlined'" />
+                        </Tooltip>
+                    </Space>
+                </div>
+                <div class="py-2">
+                    <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.jsScript" :mode="'javascript'"
+                        class="border border-gray-400" />
+                    <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.tbelScript"
+                        :mode="'javascript'" class="border border-gray-400" />
+                </div>
+                <div class="text-gray-500">}</div>
+            </div>
+
+            <Button class="mt-2" type="primary" @click="handleTestScript">测试脚本功能</Button>
+
+        </Form.Item>
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "script",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Radio, Button, Tooltip, Space } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    scriptLang: 'JS' | 'TBEL',
+    jsScript: string,
+    tbelScript: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scriptLang: 'JS',
+    jsScript: "return msg.temperature > 20;",
+    tbelScript: "return msg.temperature > 20;",
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.jsScript = props.configuration.jsScript;
+        formState.tbelScript = props.configuration.tbelScript;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3d68a10015dba1db9dcef508e3c8db260ce00751
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
@@ -0,0 +1,111 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <div class="flex justify-center mb-2">
+            <Radio.Group v-model:value="formState.scriptLang" button-style="solid">
+                <Radio.Button value="JS">JavaScript</Radio.Button>
+                <Radio.Button value="TBEL">&nbsp;&nbsp;&nbsp;TBEL&nbsp;&nbsp;&nbsp;</Radio.Button>
+            </Radio.Group>
+        </div>
+        <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
+            <div>
+                <div class="flex justify-between">
+                    <p class="text-gray-500">function Switch(msg, metadata, msgType) {</p>
+                    <Space>
+                        <Tooltip title="格式化">
+                            <Icon class="cursor-pointer" @click="handleFormatScript"
+                                :icon="'ant-design:format-painter-filled'" />
+                        </Tooltip>
+                        <Tooltip title="测试脚本功能">
+                            <Icon class="cursor-pointer" @click="handleTestScript" :icon="'ant-design:bug-outlined'" />
+                        </Tooltip>
+                        <Tooltip title="全屏">
+                            <Icon class="cursor-pointer" @click="handleFullScreen"
+                                :icon="'ant-design:fullscreen-outlined'" />
+                        </Tooltip>
+                    </Space>
+                </div>
+                <div class="py-2">
+                    <CodeEditor v-if="formState.scriptLang == 'JS'" v-model:value="formState.jsScript" :mode="'javascript'"
+                        class="border border-gray-400" />
+                    <CodeEditor v-if="formState.scriptLang == 'TBEL'" v-model:value="formState.tbelScript"
+                        :mode="'javascript'" class="border border-gray-400" />
+                </div>
+                <div class="text-gray-500">}</div>
+            </div>
+
+            <Button class="mt-2" type="primary" @click="handleTestScript">测试脚本功能</Button>
+
+        </Form.Item>
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "switch",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Icon } from '/@/components/Icon';
+import { Form, Radio, Button, Tooltip, Space } from 'ant-design-vue';
+import { CodeEditor } from '/@/components/CodeEditor';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    scriptLang: 'JS' | 'TBEL',
+    jsScript: string,
+    tbelScript: string,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    scriptLang: 'JS',
+    jsScript: "return msg.temperature > 20;",
+    tbelScript: "return msg.temperature > 20;",
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.scriptLang = props.configuration.scriptLang;
+        formState.jsScript = props.configuration.jsScript;
+        formState.tbelScript = props.configuration.tbelScript;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleFormatScript() {
+
+}
+
+function handleTestScript() {
+
+}
+
+function handleFullScreen() {
+
+}
+
+defineExpose({ getConfiguration })
+
+</script>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
new file mode 100644
index 0000000000000000000000000000000000000000..b38658db740f7ff6b4515d82d099606061c75850
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -0,0 +1,14 @@
+{
+    "org.thingsboard.rule.engine.filter.TbCheckAlarmStatusNode": "check-alarm-status",
+    "org.thingsboard.rule.engine.filter.TbAssetTypeSwitchNode": "asset-profile-switch",
+    "org.thingsboard.rule.engine.filter.TbCheckMessageNode": "check-fields-presence",
+    "org.thingsboard.rule.engine.filter.TbCheckRelationNode": "check-relation-presence",
+    "org.thingsboard.rule.engine.filter.TbDeviceTypeSwitchNode": "device-profile-switch",
+    "org.thingsboard.rule.engine.filter.TbOriginatorTypeFilterNode": "entity-type-filter",
+    "org.thingsboard.rule.engine.filter.TbOriginatorTypeSwitchNode": "entity-type-switch",
+    "org.thingsboard.rule.engine.filter.TbMsgTypeFilterNode": "message-type-filter",
+    "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode": "message-type-switch",
+    "org.thingsboard.rule.engine.geo.TbGpsGeofencingFilterNode": "gps-geofencing-filter",
+    "org.thingsboard.rule.engine.filter.TbJsFilterNode": "script",
+    "org.thingsboard.rule.engine.filter.TbJsSwitchNode": "switch"
+}
\ No newline at end of file