From 313f09645af6ce526ff5174dcbd87aa472c8b885 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Mon, 25 Mar 2024 18:00:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=9B=86=20customerAttribute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nodeTpl/ENRICHMENT/calculateDelta.vue     | 115 ++++++++++++
 .../nodeTpl/ENRICHMENT/customerAttributes.vue | 167 ++++++++++++++++++
 .../ruleChain/flow/nodeTpl/FILTER/script.vue  |  14 +-
 .../ruleChain/flow/nodeTpl/FILTER/switch.vue  |  14 +-
 .../flow/nodeTpl/rule-chain-types.json        |   5 +-
 5 files changed, 302 insertions(+), 13 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
new file mode 100644
index 0000000..c0ad78e
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/calculateDelta.vue
@@ -0,0 +1,115 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <Row :gutter="20">
+            <Col :span="12">
+            <Form.Item label="输入值" name="inputValueKey" :rules="[{ required: true, message: '输入值不能为空!' }]">
+                <Input v-model:value="formState.inputValueKey">
+                </Input>
+            </Form.Item>
+
+            </Col>
+            <Col :span="12">
+            <Form.Item label="输出值" name="outputValueKey" :rules="[{ required: true, message: '输出值不能为空!' }]">
+                <Input v-model:value="formState.outputValueKey">
+                </Input>
+            </Form.Item>
+            </Col>
+        </Row>
+        <Form.Item label="小数点位数" name="round">
+            <InputNumber v-model:value="formState.round" style="width: 100%;">
+            </InputNumber>
+        </Form.Item>
+        <Form.Item name="tellFailureIfDeltaIsNegative" help="若deltavalue为负数，则规则节点强制消息处理失败。">
+            <div class="border border-neutral-300 rounded-md  px-4 py-2">
+                <Checkbox v-model:checked="formState.tellFailureIfDeltaIsNegative">
+                    如果delta为负数，则Failure
+                </Checkbox>
+            </div>
+        </Form.Item>
+        <Form.Item name="useCache">
+            <div class="border  border-neutral-300 rounded-md  px-4 py-2"
+                help="规则节点将缓存传入消息中的“pulseCounter”值，以提高性能。请注意，如果您在其他地方修改“脉冲计数器值”，则不会更新缓存">
+                <Checkbox v-model:checked="formState.useCache">
+                    使用缓存
+                </Checkbox>
+            </div>
+
+        </Form.Item>
+        <Form.Item name="addPeriodBetweenMsgs" help="如果启用，则规则节点会将“periodInMs”添加到输出消息中。">
+            <div class="border  border-neutral-300 rounded-md  px-4 py-2">
+                <Checkbox v-model:checked="formState.addPeriodBetweenMsgs">
+                    加上“pulseCounter”读数之间的时间差
+                </Checkbox>
+            </div>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "calculate-delta",
+    components: { Checkbox }
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Row, Col, InputNumber, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    inputValueKey: string,
+    outputValueKey: string,
+    periodValueKey: string,
+    round: number,
+    useCache: boolean,
+    addPeriodBetweenMsgs: boolean,
+    tellFailureIfDeltaIsNegative: boolean,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    inputValueKey: 'pulseCounter',
+    outputValueKey: 'delta',
+    round: undefined,
+    tellFailureIfDeltaIsNegative: true,
+    useCache: true,
+    addPeriodBetweenMsgs: false,
+    periodValueKey: 'periodInMs',
+
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.inputValueKey = props.configuration.inputValueKey;
+        formState.outputValueKey = props.configuration.outputValueKey;
+        formState.periodValueKey = props.configuration.periodValueKey;
+        formState.round = props.configuration.round;
+        formState.useCache = props.configuration.useCache;
+        formState.addPeriodBetweenMsgs = props.configuration.addPeriodBetweenMsgs;
+        formState.tellFailureIfDeltaIsNegative = props.configuration.tellFailureIfDeltaIsNegative;
+    },
+    { 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/ENRICHMENT/customerAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
new file mode 100644
index 0000000..026e798
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
@@ -0,0 +1,167 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="dataToFetch">
+            <div class="flex justify-center mb-2">
+                <Radio.Group v-model:value="formState.dataToFetch" button-style="solid">
+                    <Radio.Button value="ATTRIBUTES">Attributes</Radio.Button>
+                    <Radio.Button value="LATEST_TELEMETRY">Last telemetry</Radio.Button>
+                </Radio.Group>
+            </div>
+        </Form.Item>
+
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <Form.Item :label="formState.dataToFetch == 'ATTRIBUTES' ? '属性映射' : '时序数据映射'" name="dataMapping"
+                :rules="[{ validator: validatorDataMapping }]">
+                <Table class="mapping-table">
+                    <tr class="header">
+                        <th>原属性</th>
+                        <th>目标属性</th>
+                    </tr>
+                    <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+                        <td class="py-2 px-4">
+                            <Input v-model:value="mapping.key" placeholder="输入原属性" />
+                        </td>
+                        <td> <Input v-model:value="mapping.value" placeholder="输入目标属性" />
+                        </td>
+                        <td>
+                            <Tooltip title="删除" class="pl-4">
+                                <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                    @click="handleDeleteMapping(index)" />
+                            </Tooltip>
+                        </td>
+                    </tr>
+                </Table>
+                <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+                <Alert type="success" message="所有输入字段都支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+            </Form.Item>
+        </div>
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "customer-attributes",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Radio, Button, Tooltip, Alert } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    dataMapping: Recordable,
+    dataToFetch: 'ATTRIBUTES' | 'LATEST_TELEMETRY',
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    dataMapping: { alarmThreshold: 'threshold' },
+    dataToFetch: 'ATTRIBUTES',
+    fetchTo: 'METADATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        mappingList.value = [];
+        formState.dataMapping = props.configuration.dataMapping;
+        formState.dataToFetch = props.configuration.dataToFetch;
+        formState.fetchTo = props.configuration.fetchTo;
+        Object.keys(formState.dataMapping).forEach(key => {
+            mappingList.value.push({ key: key, value: formState.dataMapping[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            mappingList.value.forEach(mapping => {
+                data.dataMapping[mapping.key] = mapping.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorDataMapping() {
+    if (mappingList.value.length < 1) {
+        return Promise.reject('属性映射必填！');
+    } else {
+        let validateTag = true;
+        mappingList.value.forEach(mapping => {
+            if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+                validateTag = false;
+            }
+        })
+        if (!validateTag) {
+            return Promise.reject('属性映射不能存在空值！');
+        } else {
+            return Promise.resolve();
+        }
+
+    }
+}
+
+function handleDeleteMapping(index: number) {
+    mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+    mappingList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+
+<style lang="less">
+.ant-form-item-has-error {
+    .mapping-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.mapping-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
index c1e656a..f6d860b 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/script.vue
@@ -1,12 +1,14 @@
 <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="scriptLang">
+            <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>
         <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
             <div>
                 <div class="flex justify-between">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
index 3d68a10..07df3b9 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/FILTER/switch.vue
@@ -1,12 +1,14 @@
 <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="scriptLang">
+            <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>
         <Form.Item :name="formState.scriptLang == 'JS' ? 'jsScript' : 'tbelScript'">
             <div>
                 <div class="flex justify-between">
diff --git a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index b38658d..94602ef 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -10,5 +10,8 @@
     "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"
+    "org.thingsboard.rule.engine.filter.TbJsSwitchNode": "switch",
+
+    "org.thingsboard.rule.engine.metadata.CalculateDeltaNode":"calculate-delta",
+    "org.thingsboard.rule.engine.metadata.TbGetCustomerAttributeNode":"customer-attributes"
 }
\ No newline at end of file
-- 
Gitee


From 9e4c0a7b2b5d4dc35ee714f5323f828a51d1d697 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Fri, 29 Mar 2024 14:26:33 +0800
Subject: [PATCH 2/5] customer details

---
 .../nodeTpl/ENRICHMENT/customerAttributes.vue | 10 ++
 .../nodeTpl/ENRICHMENT/customerDetails.vue    | 94 +++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |  3 +-
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue

diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
index 026e798..3718580 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerAttributes.vue
@@ -36,6 +36,16 @@
                 <Alert type="success" message="所有输入字段都支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
             </Form.Item>
         </div>
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>添加映射属性到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
 
 
 
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue
new file mode 100644
index 0000000..f42ff69
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/customerDetails.vue
@@ -0,0 +1,94 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="选择详情" name="detailsList" :rules="[{ required: true, message: '请选择详情!' }]">
+            <Select v-model:value="formState.detailsList" mode="multiple" placeholder="请选择详情！"
+                :options="detailSelectOptions">
+            </Select>
+        </Form.Item>
+
+
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>添加选中的属性到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "customer-details",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Select, Radio } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    detailsList: [],
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const detailSelectOptions = [
+    { value: 'ID', label: 'Id' },
+    { value: 'TITLE', label: 'Title' },
+    { value: 'ADDITIONAL_INFO', label: 'Additional Info' },
+    { value: 'COUNTRY', label: 'Country' },
+    { value: 'STATE', label: 'State' },
+    { value: 'CITY', label: 'City' },
+    { value: 'ZIP', label: 'Zip' },
+    { value: 'ADDRESS', label: 'Address' },
+    { value: 'ADDRESS2', label: 'Address2' },
+    { value: 'PHONE', label: 'Phone' },
+    { value: 'EMAIL', label: 'Email' }
+]
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    detailsList: [],
+    fetchTo: 'DATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.detailsList = props.configuration.detailsList;
+        formState.fetchTo = props.configuration.fetchTo;
+    },
+    { 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/rule-chain-types.json b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
index 94602ef..2abfbe0 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -13,5 +13,6 @@
     "org.thingsboard.rule.engine.filter.TbJsSwitchNode": "switch",
 
     "org.thingsboard.rule.engine.metadata.CalculateDeltaNode":"calculate-delta",
-    "org.thingsboard.rule.engine.metadata.TbGetCustomerAttributeNode":"customer-attributes"
+    "org.thingsboard.rule.engine.metadata.TbGetCustomerAttributeNode":"customer-attributes",
+    "org.thingsboard.rule.engine.metadata.TbGetCustomerDetailsNode":"customer-details"
 }
\ No newline at end of file
-- 
Gitee


From 26c73a468a60fccf36c87fd05797945c1839bdfc Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 30 Mar 2024 10:17:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE=E4=BF=9D=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/things/componentDescriptor.ts        |  1 +
 src/views/things/ruleChain/flow/index.vue    |  5 ++---
 src/views/things/ruleChain/flow/nodeForm.vue | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/things/componentDescriptor.ts b/src/api/things/componentDescriptor.ts
index 7a7d29a..001d620 100644
--- a/src/api/things/componentDescriptor.ts
+++ b/src/api/things/componentDescriptor.ts
@@ -8,6 +8,7 @@ export interface ComponentDescriptor extends BasicModel<null> {
   type: ComponentDescriptorType;
   scope: 'SYSTEM' | 'TENANT';
   clusteringMode: 'USER_PREFERENCE' | 'ENABLED' | 'SINGLETON';
+  configurationVersion: number,
   configurationDescriptor: {
     nodeDefinition: {
       configDirective: string,
diff --git a/src/views/things/ruleChain/flow/index.vue b/src/views/things/ruleChain/flow/index.vue
index b5e0bed..b9c4941 100644
--- a/src/views/things/ruleChain/flow/index.vue
+++ b/src/views/things/ruleChain/flow/index.vue
@@ -431,8 +431,8 @@ function onNodeAdded({ node, index, options }) {
 const [registerNodeModal, { openModal: openNodeModal }] = useModal();
 
 // Node 节点数据编辑成功  更新节点数据
-function handleNodeSuccess(data: RuleNode) {
-  const node = graphRef.value?.getCellById(data.id.id) as Node;
+function handleNodeSuccess({ nodeId, data }) {
+  const node = graphRef.value?.getCellById(nodeId) as Node;
   //TODO： 每个节点的弹框编辑数据 不一样，更新节点数据
   if (node) {
     node.setData({ descriptor: node.data.descriptor, data: data })
@@ -643,7 +643,6 @@ async function handleSave() {
   const jsonData = graphRef.value?.toJSON();
   if (jsonData) {
     const cells = jsonData.cells;
-
     const nodes = cells
       .filter(cell => cell.shape == 'rule-chain-node' && cell.data.data)
       .map(cell => {
diff --git a/src/views/things/ruleChain/flow/nodeForm.vue b/src/views/things/ruleChain/flow/nodeForm.vue
index b180cb3..d08acbb 100644
--- a/src/views/things/ruleChain/flow/nodeForm.vue
+++ b/src/views/things/ruleChain/flow/nodeForm.vue
@@ -39,6 +39,9 @@
       <Form.Item :name="['additionalInfo', 'layoutY']" v-show="false">
         <InputNumber v-model:value="formState.additionalInfo.layoutY" />
       </Form.Item>
+      <Form.Item name="configurationVersion" v-show="false">
+        <InputNumber v-model:value="formState.configurationVersion" />
+      </Form.Item>
     </Form>
   </BasicModal>
 </template>
@@ -102,6 +105,7 @@ const formState = reactive<RuleNode>({
   singletonMode: false,
   type: descriptor.value?.clazz || '',
   configuration: descriptor.value?.configurationDescriptor.nodeDefinition.defaultConfiguration || {},
+  configurationVersion: 0,
   additionalInfo: { description: '', layoutX: 0, layoutY: 0 },
 });
 
@@ -118,14 +122,11 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
     formState[key] = record.value[key];
   })
   if (isEmpty(formState.id.id)) {
-    formState.id.id = nodeId.value;
     formState.type = descriptor.value?.clazz || '';
     formState.configuration = descriptor.value?.configurationDescriptor.nodeDefinition.defaultConfiguration || {};
+    formState.configurationVersion = descriptor.value?.configurationVersion || 0;
   }
 
-  console.log(descriptor.value);
-
-
   setModalProps({ loading: false });
 });
 
@@ -149,7 +150,8 @@ async function handleSubmit() {
 
     // console.log('submit', params, data, record);
     setTimeout(closeModal);
-    emit('success', { ...data, configuration: configuration, id: formState.id, ruleChainId: formState.ruleChainId, });
+    const ruleNode = { ...data, configuration: configuration, id: record.value?.id, ruleChainId: formState.ruleChainId };
+    emit('success', { nodeId: nodeId.value, data: ruleNode });
   } catch (error: any) {
     if (error && error.errorFields) {
       showMessage(t('common.validateError'));
@@ -163,7 +165,7 @@ async function handleSubmit() {
 function handleCancel() {
   setTimeout(closeModal);
   if (record.value?.id?.id) {
-    emit('success', { ...record.value });
+    emit('success', { nodeId: nodeId.value, data: { ...record.value } });
   } else {
     emit('cancel', { nodeId: nodeId.value });
   }
-- 
Gitee


From cd6537fa057d4e600f1e90320e6ea1c5427e751d Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 30 Mar 2024 11:03:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE-originator-attr?=
 =?UTF-8?q?ibute?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/things/ruleChain/flow/nodeForm.vue  |   3 +-
 .../ENRICHMENT/fetchDeviceCredentials.vue     |  69 ++++++++++
 .../ENRICHMENT/originatorAttributes.vue       | 126 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   4 +-
 4 files changed, 200 insertions(+), 2 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue

diff --git a/src/views/things/ruleChain/flow/nodeForm.vue b/src/views/things/ruleChain/flow/nodeForm.vue
index d08acbb..d2f28de 100644
--- a/src/views/things/ruleChain/flow/nodeForm.vue
+++ b/src/views/things/ruleChain/flow/nodeForm.vue
@@ -121,11 +121,12 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
   Object.keys(record.value as any).forEach(key => {
     formState[key] = record.value[key];
   })
-  if (isEmpty(formState.id.id)) {
+  if (isEmpty(formState.id?.id)) {
     formState.type = descriptor.value?.clazz || '';
     formState.configuration = descriptor.value?.configurationDescriptor.nodeDefinition.defaultConfiguration || {};
     formState.configurationVersion = descriptor.value?.configurationVersion || 0;
   }
+  console.log(descriptor.value)
 
   setModalProps({ loading: false });
 });
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
new file mode 100644
index 0000000..f00fd45
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/fetchDeviceCredentials.vue
@@ -0,0 +1,69 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>将凭据提取到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "fetch-device-credentials",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Radio } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+
+interface Configuration {
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    fetchTo: 'DATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.fetchTo = props.configuration.fetchTo;
+    },
+    { 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/ENRICHMENT/originatorAttributes.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
new file mode 100644
index 0000000..ce48d24
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorAttributes.vue
@@ -0,0 +1,126 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">原始属性</p>
+            <div class="p-2">
+                <Form.Item label="客户端属性" name="clientAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.clientAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="共享属性" name="sharedAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.sharedAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="服务端属性" name="serverAttributeNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.serverAttributeNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item label="时序数据" name="latestTsKeyNames" :rules="[{ validator: validatorAttributeNames }]">
+                    <Select v-model:value="formState.latestTsKeyNames" mode="tags">
+                    </Select>
+                </Form.Item>
+                <Form.Item name="getLatestValueWithTs" v-show="formState.latestTsKeyNames.length > 0">
+                    <Checkbox v-model:checked="formState.getLatestValueWithTs">
+                        获取带有时间戳的最后一条数据
+                    </Checkbox>
+                </Form.Item>
+            </div>
+        </div>
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>将原始属性添加到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+        <Form.Item name="tellFailureIfAbsent" help="如果至少有一个选定的密钥不存在，则出消息将报告“Failure”">
+            <div class="border border-neutral-300 rounded-md  px-4 py-2">
+                <Checkbox v-model:checked="formState.tellFailureIfAbsent">
+                    如果缺少任何属性，则告知失败
+                </Checkbox>
+            </div>
+        </Form.Item>
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "originator-attributes",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Radio, Select, Checkbox } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    clientAttributeNames: [],
+    latestTsKeyNames: [],
+    serverAttributeNames: [],
+    sharedAttributeNames: [],
+    getLatestValueWithTs: boolean,
+    tellFailureIfAbsent: boolean,
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    clientAttributeNames: [],
+    latestTsKeyNames: [],
+    serverAttributeNames: [],
+    sharedAttributeNames: [],
+    getLatestValueWithTs: false,
+    tellFailureIfAbsent: true,
+    fetchTo: 'DATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.clientAttributeNames = props.configuration.clientAttributeNames;
+        formState.latestTsKeyNames = props.configuration.latestTsKeyNames;
+        formState.serverAttributeNames = props.configuration.serverAttributeNames;
+        formState.sharedAttributeNames = props.configuration.sharedAttributeNames;
+        formState.getLatestValueWithTs = props.configuration.getLatestValueWithTs;
+        formState.tellFailureIfAbsent = props.configuration.tellFailureIfAbsent;
+        formState.fetchTo = props.configuration.fetchTo;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorAttributeNames() {
+    if (!isEmpty(formState.clientAttributeNames) || !isEmpty(formState.serverAttributeNames) || !isEmpty(formState.sharedAttributeNames) || !isEmpty(formState.latestTsKeyNames)) {
+        return Promise.resolve();
+    } else {
+        return Promise.reject('原始属性必须填写一项！');
+    }
+}
+
+
+
+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
index 2abfbe0..7e63685 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -14,5 +14,7 @@
 
     "org.thingsboard.rule.engine.metadata.CalculateDeltaNode":"calculate-delta",
     "org.thingsboard.rule.engine.metadata.TbGetCustomerAttributeNode":"customer-attributes",
-    "org.thingsboard.rule.engine.metadata.TbGetCustomerDetailsNode":"customer-details"
+    "org.thingsboard.rule.engine.metadata.TbGetCustomerDetailsNode":"customer-details",
+    "org.thingsboard.rule.engine.metadata.TbFetchDeviceCredentialsNode":"fetch-device-credentials",
+    "org.thingsboard.rule.engine.metadata.TbGetAttributesNode":"originator-attributes"
 }
\ No newline at end of file
-- 
Gitee


From f6f824f00ce5b89766a406d7029069c7b0ed3af1 Mon Sep 17 00:00:00 2001
From: fuyunfeng <1069035666@qq.com>
Date: Sat, 30 Mar 2024 17:40:39 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=84=E5=88=99=E9=93=BE-origin-telemetr?=
 =?UTF-8?q?y\origin-filedls?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/telemetryEnum.ts                    |  39 ++++
 .../nodeTpl/ENRICHMENT/originatorFields.vue   | 192 +++++++++++++++++
 .../ENRICHMENT/originatorTelemetry.vue        | 203 ++++++++++++++++++
 .../flow/nodeTpl/rule-chain-types.json        |   4 +-
 .../things/telemetry/timeseriesChart.vue      |  14 +-
 5 files changed, 441 insertions(+), 11 deletions(-)
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
 create mode 100644 src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue

diff --git a/src/enums/telemetryEnum.ts b/src/enums/telemetryEnum.ts
index 6deb629..d819819 100644
--- a/src/enums/telemetryEnum.ts
+++ b/src/enums/telemetryEnum.ts
@@ -3,3 +3,42 @@ export enum Scope {
   CLIENT_SCOPE = 'CLIENT_SCOPE',
   SHARED_SCOPE = 'SHARED_SCOPE',
 }
+
+export enum OrderBy {
+  ASCENDING = 'ASC',
+  DESCENDING = 'DESC',
+}
+
+export enum Aggregation {
+  NONE = 'NONE',
+  MIN = 'MIN',
+  MAX = 'MAX',
+  AVG = 'AVG',
+  SUM = 'SUM',
+  COUNT = 'COUNT',
+}
+
+export enum TimeUnit {
+  MILLISECONDS = 'MILLISECONDS',
+  SECONDS = 'SECONDS',
+  MINUTES = 'MINUTES',
+  HOURS = 'HOURS',
+  DAYS = 'DAYS',
+}
+
+export const TIME_UNIT_OPTIONS = [
+  { value: TimeUnit.MILLISECONDS, label: '毫秒' },
+  { value: TimeUnit.SECONDS, label: '秒' },
+  { value: TimeUnit.MINUTES, label: '分钟' },
+  { value: TimeUnit.HOURS, label: '小时' },
+  { value: TimeUnit.DAYS, label: '天' },
+]
+
+export const AGGREGATION_OPTIONS = [
+  { value: Aggregation.NONE, label: '无' },
+  { value: Aggregation.MIN, label: '最小值' },
+  { value: Aggregation.MAX, label: '最大值' },
+  { value: Aggregation.AVG, label: '平均值' },
+  { value: Aggregation.SUM, label: '求和' },
+  { value: Aggregation.COUNT, label: '计数' }
+]
\ No newline at end of file
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
new file mode 100644
index 0000000..472a782
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorFields.vue
@@ -0,0 +1,192 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <Form.Item label="原始字段映射" name="dataMapping" :rules="[{ validator: validatorDataMapping }]">
+                <Table class="mapping-table">
+                    <tr class="header">
+                        <th>原字段</th>
+                        <th>目标字段</th>
+                    </tr>
+                    <tr class="content" v-for="(mapping, index) in mappingList" :key="index">
+                        <td class="py-2 px-4">
+                            <Select v-model:value="mapping.key" :options="mappingKeyOptions" />
+                        </td>
+                        <td> <Input v-model:value="mapping.value" placeholder="输入目标字段" />
+                        </td>
+                        <td>
+                            <Tooltip title="删除" class="pl-4">
+                                <Icon :icon="'ant-design:delete-outlined'" :size="20" color="red" class="cursor-pointer"
+                                    @click="handleDeleteMapping(index)" />
+                            </Tooltip>
+                        </td>
+                    </tr>
+                </Table>
+                <Button class="my-4" type="primary" @click="handleAddMapping">添加映射</Button>
+                <Alert type="success" message="目标关键字段支持模板化。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。" />
+            </Form.Item>
+        </div>
+        <Form.Item name="fetchTo">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <span>添加原始字段映射到</span>
+                <Radio.Group v-model:value="formState.fetchTo" button-style="solid">
+                    <Radio.Button value="DATA">Message</Radio.Button>
+                    <Radio.Button value="METADATA">Metadata</Radio.Button>
+                </Radio.Group>
+            </div>
+
+        </Form.Item>
+        <Form.Item name="ignoreNullStrings">
+            <div class="flex justify-between items-center border border-neutral-300 rounded-md py-2 px-4">
+                <Checkbox v-model:checked="formState.ignoreNullStrings">
+                    跳过空字段
+                </Checkbox>
+            </div>
+        </Form.Item>
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "originator-fields",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Input, Select, Radio, Button, Checkbox, Tooltip, Alert } from 'ant-design-vue';
+import { Icon } from '/@/components/Icon';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { isEmpty } from 'lodash';
+
+interface Configuration {
+    dataMapping: Recordable,
+    ignoreNullStrings: boolean,
+    fetchTo: 'METADATA' | 'DATA'
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+
+});
+
+const mappingKeyOptions = [
+    { value: 'createdTime', label: '创建时间' },
+    { value: 'name', label: '名称' },
+    { value: 'firstName', label: '名字' },
+    { value: 'lastName', label: '姓氏' },
+    { value: 'email', label: '电子邮件' },
+    { value: 'title', label: '标题' },
+    { value: 'country', label: '国家' },
+    { value: 'state', label: '省' },
+    { value: 'city', label: '城市' },
+    { value: 'address', label: '地址' },
+    { value: 'address2', label: '地址2' },
+    { value: 'zip', label: '邮政编码' },
+    { value: 'phone', label: '电话' },
+    { value: 'label', label: '标签' },
+    { value: 'id', label: 'Id' }
+]
+
+const mappingList = ref<Array<any>>([]);
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    dataMapping: { name: 'originatorName' },
+    ignoreNullStrings: false,
+    fetchTo: 'METADATA',
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        mappingList.value = [];
+        formState.dataMapping = props.configuration.dataMapping;
+        formState.ignoreNullStrings = props.configuration.ignoreNullStrings;
+        formState.fetchTo = props.configuration.fetchTo;
+        Object.keys(formState.dataMapping).forEach(key => {
+            mappingList.value.push({ key: key, value: formState.dataMapping[key] })
+        })
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        const data = await formRef.value?.validate();
+        if (data) {
+            mappingList.value.forEach(mapping => {
+                data.dataMapping[mapping.key] = mapping.value;
+            })
+        }
+        return data;
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function validatorDataMapping() {
+    if (mappingList.value.length < 1) {
+        return Promise.reject('原始字段映射必填！');
+    } else {
+        let validateTag = true;
+        mappingList.value.forEach(mapping => {
+            if (isEmpty(mapping.key) || isEmpty(mapping.value)) {
+                validateTag = false;
+            }
+        })
+        if (!validateTag) {
+            return Promise.reject('原始字段映射不能存在空值！');
+        } else {
+            return Promise.resolve();
+        }
+
+    }
+}
+
+function handleDeleteMapping(index: number) {
+    mappingList.value.splice(index, 1)
+}
+
+function handleAddMapping() {
+    mappingList.value.push({ key: '', value: '' })
+}
+
+defineExpose({ getConfiguration })
+
+</script>
+
+<style lang="less">
+.ant-form-item-has-error {
+    .mapping-table {
+        border: 1px solid #ff4d4f;
+    }
+}
+
+.mapping-table {
+    width: 100%;
+    align: "center";
+    border: 1px solid @border-color-base;
+    border-radius: 4px;
+
+    .header {
+        border-bottom: 1px solid @border-color-base;
+    }
+
+    th {
+        padding: 10px 8px;
+        text-align: left;
+        color: @border-color-base;
+    }
+
+    .td {
+        padding: 2px 2px;
+    }
+}
+</style>
diff --git a/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
new file mode 100644
index 0000000..9ab7d2e
--- /dev/null
+++ b/src/views/things/ruleChain/flow/nodeTpl/ENRICHMENT/originatorTelemetry.vue
@@ -0,0 +1,203 @@
+<template>
+    <Form ref="formRef" :model="formState" layout="vertical">
+
+        <Form.Item label="时序数据Keys" name="latestTsKeyNames" :rules="[{ required: true, message: '请选择时序数据Keys!' }]"
+            help="使用${metadataKey}表示元数据中的值，$[messageKey]表示消息正文中的值。">
+            <Select v-model:value="formState.latestTsKeyNames" mode="tags">
+            </Select>
+        </Form.Item>
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">提取间隔</p>
+            <div class="p-2">
+                <Form.Item name="useMetadataIntervalPatterns">
+                    <div class="flex items-center">
+                        <Switch size="small" v-model:checked="formState.useMetadataIntervalPatterns"
+                            @change="handleUseMetadataIntervalChange" />
+                        <span class="ml-4">使用动态间隔</span>
+                    </div>
+                </Form.Item>
+                <Row :gutter="20" v-if="formState.useMetadataIntervalPatterns == false">
+                    <Col :span="12">
+                    <Form.Item label="开始间隔" name="startInterval" :rules="[{ required: true, message: '开始间隔必填!' }]">
+                        <InputNumber v-model:value="formState.startInterval" :min="1" :style="{ width: '100%' }" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="时间单位" name="startIntervalTimeUnit">
+                        <Select v-model:value="formState.startIntervalTimeUnit" :options="TIME_UNIT_OPTIONS" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="结束间隔" name="endInterval" :rules="[{ required: true, message: '结束间隔必填!' }]">
+                        <InputNumber v-model:value="formState.endInterval" :min="1" :style="{ width: '100%' }" />
+                    </Form.Item>
+                    </Col>
+                    <Col :span="12">
+                    <Form.Item label="时间单位" name="endIntervalTimeUnit">
+                        <Select v-model:value="formState.endIntervalTimeUnit" :options="TIME_UNIT_OPTIONS" />
+                    </Form.Item>
+                    </Col>
+                </Row>
+                <template v-if="formState.useMetadataIntervalPatterns == true">
+                    <Form.Item label="开始间隔" name="startIntervalPattern" :rules="[{ required: true, message: '开始间隔必填!' }]">
+                        <Input v-model:value="formState.startIntervalPattern" />
+                    </Form.Item>
+                    <Form.Item label="结束间隔" name="endIntervalPattern" :rules="[{ required: true, message: '结束间隔必填!' }]">
+                        <Input v-model:value="formState.endIntervalPattern" />
+                    </Form.Item>
+                </template>
+                <Alert type="success">
+                    <template #message>
+                        <div v-if="formState.useMetadataIntervalPatterns == false">
+                            提取从
+                            {{ formState.startInterval }}
+                            {{ TIME_UNIT_OPTIONS.find(unit => unit.value == formState.startIntervalTimeUnit)?.label }}
+                            前到
+                            {{ formState.endInterval }}
+                            {{ TIME_UNIT_OPTIONS.find(unit => unit.value == formState.endIntervalTimeUnit)?.label }}
+                            前的时间序列。
+                        </div>
+                        <div v-else>
+                            间隔开始和结束输入字段支持模板化。请注意，替换的模板值应以毫秒为单位进行设置。使用$[messageKey]从消息中提取值，使用${metadataKey}从元数据中提取值。
+                        </div>
+
+                    </template>
+                </Alert>
+            </div>
+        </div>
+        <div class="border border-neutral-300 rounded-md py-2 px-3 mb-4">
+            <p class="text-base font-medium">提取策略</p>
+            <div class="p-2">
+                <Form.Item name="fetchMode">
+                    <Radio.Group v-model:value="formState.fetchMode" button-style="solid" :style="{ display: 'flex' }"
+                        class="w-full">
+                        <Radio.Button class="flex-1" value="FIRST">First</Radio.Button>
+                        <Radio.Button class="flex-1" value="LAST">Last</Radio.Button>
+                        <Radio.Button class="flex-1" value="ALL">All</Radio.Button>
+                    </Radio.Group>
+                </Form.Item>
+                <Alert type="success">
+                    <template #message>
+                        <span v-if="formState.fetchMode == 'FIRST'"> 如果选择提取策略'First'规则节点将检索到最接近提取间隔开始的遥测数据。</span>
+                        <span v-else-if="formState.fetchMode == 'LAST'"> 如果选择了提取模式'Last'规则节点将检索到距离提取间隔结束最近的遥测数据。</span>
+                        <span v-else="formState.fetchMode == 'ALL'"> 如果选择了提取模式'All'规则节点将使用可配置的查询参数从提取间隔中检索遥测数据。</span>
+                    </template>
+                </Alert>
+                <template v-if="formState.fetchMode == 'ALL'">
+                    <Form.Item label="数据聚合" name="aggregation">
+                        <Select v-model:value="formState.aggregation" :options="AGGREGATION_OPTIONS" />
+                    </Form.Item>
+                    <Form.Item label="时间戳排序" name="orderBy">
+                        <Select v-model:value="formState.orderBy">
+                            <Select.Option value="ASC">ASC</Select.Option>
+                            <Select.Option value="DESC">DESC</Select.Option>
+                        </Select>
+                    </Form.Item>
+                    <Form.Item label="Limit" name="limit" :rules="[{ required: true, message: 'Limit必填!' }]"
+                        help="最小限值为2，最大值为-1000。如果要提取单个条目，请选择提提取策略'First'或 'Last'。">
+                        <InputNumber v-model:value="formState.limit" :min="2" :style="{ width: '100%' }" />
+                    </Form.Item>
+                </template>
+
+            </div>
+        </div>
+
+
+
+    </Form>
+</template>
+<script lang="ts">
+export default defineComponent({
+    name: "originator-telemetry",
+});
+</script>
+<script lang="ts" setup >
+import { ref, watch, defineComponent, reactive } from 'vue';
+import { Form, Switch, Select, Row, Col, Radio, Input, InputNumber, Alert } from 'ant-design-vue';
+import { FormInstance } from 'ant-design-vue/lib/form';
+import { Aggregation, OrderBy, TimeUnit, TIME_UNIT_OPTIONS, AGGREGATION_OPTIONS } from '/@/enums/telemetryEnum';
+
+interface Configuration {
+    latestTsKeyNames: [],
+    useMetadataIntervalPatterns: boolean,
+    startInterval: number,
+    startIntervalPattern: string,
+    startIntervalTimeUnit: TimeUnit,
+    endInterval: number,
+    endIntervalPattern: string,
+    endIntervalTimeUnit: TimeUnit,
+    fetchMode: 'FIRST' | 'LAST' | 'ALL',
+    aggregation: Aggregation,
+    orderBy: OrderBy,
+    limit: 1000,
+}
+
+
+const props = defineProps({
+    configuration: {
+        type: Object as PropType<Configuration>,
+        required: true,
+    },
+});
+
+
+const formRef = ref<FormInstance>();
+
+const formState = reactive<any>({
+    latestTsKeyNames: [],
+    useMetadataIntervalPatterns: false,
+    startInterval: 2,
+    startIntervalPattern: '',
+    startIntervalTimeUnit: TimeUnit.SECONDS,
+    endInterval: 1,
+    endIntervalPattern: '',
+    endIntervalTimeUnit: TimeUnit.SECONDS,
+    fetchMode: 'FIRST',
+    aggregation: Aggregation.NONE,
+    orderBy: OrderBy.ASCENDING,
+    limit: 1000,
+});
+
+watch(
+    () => props.configuration,
+    () => {
+        formState.latestTsKeyNames = props.configuration.latestTsKeyNames;
+        formState.useMetadataIntervalPatterns = props.configuration.useMetadataIntervalPatterns;
+        formState.startInterval = props.configuration.startInterval;
+        formState.startIntervalPattern = props.configuration.startIntervalPattern;
+        formState.startIntervalTimeUnit = props.configuration.startIntervalTimeUnit;
+        formState.endInterval = props.configuration.endInterval;
+        formState.endIntervalPattern = props.configuration.endIntervalPattern;
+        formState.endIntervalTimeUnit = props.configuration.endIntervalTimeUnit;
+        formState.fetchMode = props.configuration.fetchMode;
+        formState.aggregation = props.configuration.aggregation;
+        formState.orderBy = props.configuration.orderBy;
+        formState.limit = props.configuration.limit;
+    },
+    { immediate: true }
+)
+
+async function getConfiguration() {
+    try {
+        return await formRef.value?.validate();
+    } catch (error: any) {
+        throw error;
+    }
+}
+
+function handleUseMetadataIntervalChange(useMetadataInterval) {
+    if (useMetadataInterval == true) {
+        formState.startInterval = -1;
+        formState.endInterval = 1;
+    } else {
+        formState.startInterval = 1;
+        formState.endInterval = 2;
+
+    }
+}
+
+
+
+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
index 7e63685..d3e2936 100644
--- a/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
+++ b/src/views/things/ruleChain/flow/nodeTpl/rule-chain-types.json
@@ -16,5 +16,7 @@
     "org.thingsboard.rule.engine.metadata.TbGetCustomerAttributeNode":"customer-attributes",
     "org.thingsboard.rule.engine.metadata.TbGetCustomerDetailsNode":"customer-details",
     "org.thingsboard.rule.engine.metadata.TbFetchDeviceCredentialsNode":"fetch-device-credentials",
-    "org.thingsboard.rule.engine.metadata.TbGetAttributesNode":"originator-attributes"
+    "org.thingsboard.rule.engine.metadata.TbGetAttributesNode":"originator-attributes",
+    "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode":"originator-fields",
+    "org.thingsboard.rule.engine.metadata.TbGetTelemetryNode":"originator-telemetry"
 }
\ No newline at end of file
diff --git a/src/views/things/telemetry/timeseriesChart.vue b/src/views/things/telemetry/timeseriesChart.vue
index 9aac66d..9bb3302 100644
--- a/src/views/things/telemetry/timeseriesChart.vue
+++ b/src/views/things/telemetry/timeseriesChart.vue
@@ -54,6 +54,7 @@ import { TsData, } from '/@/api/things/telemetry';
 import { BasicForm, FormSchema, useForm } from '/@/components/Form';
 import TimeseriesModal from './timeseriesModal.vue';
 import { isArray } from 'lodash';
+import { AGGREGATION_OPTIONS, Aggregation } from '/@/enums/telemetryEnum';
 
 const { t } = useI18n('things');
 const { showMessage } = useMessage();
@@ -163,16 +164,9 @@ const inputFormSchemas: FormSchema[] = [
     label: t('聚合函数'),
     field: 'agg',
     component: 'Select',
-    defaultValue: 'NONE',
+    defaultValue: Aggregation.NONE,
     componentProps: {
-      options: [
-        { label: '无', value: 'NONE' },
-        { label: '最小值', value: 'MIN' },
-        { label: '最大值', value: 'MAX' },
-        { label: '平均数', value: 'AVG' },
-        { label: '求和', value: 'SUM' },
-        { label: '计数', value: 'COUNT' },
-      ]
+      options: AGGREGATION_OPTIONS
     },
   },
 ];
@@ -244,7 +238,7 @@ async function sendQuery() {
     timeRange: [dayjs().subtract(2, 'hour'), dayjs()],
     interval: 60000,
     limit: 1000,
-    agg: 'NONE',
+    agg: Aggregation.NONE,
     ...data,
   }
   websocketSend(
-- 
Gitee