From 992e9a0aabbd4621501d8b03bc5fa603a40973f6 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 25 Jul 2023 19:50:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96gateway=E7=9A=84?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E5=99=A8=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/data-collect/collector.ts             |   1 +
 .../Collector/Point/Save/SaveModBus.vue       |  49 ++-
 .../DataCollect/Collector/Tree/Save/index.vue | 291 +++++++++---------
 .../Detail/components/EditTable/index.vue     |  10 +-
 src/views/link/AccessConfig/Detail/index.vue  |   2 +-
 src/views/link/AccessConfig/data.ts           |   1 +
 vite.config.ts                                |   2 +-
 7 files changed, 192 insertions(+), 164 deletions(-)

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 53304ef6..ce1c8e5f 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -61,3 +61,4 @@ export const scanOpcUAList = (data: any) =>
 
 export const queryTypeList = () => server.get(`/data-collect/opc/data-types`);
 
+export const getProviders = () => server.get('/data-collect/channel/gateway/codec/providers')
\ No newline at end of file
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 5ddbdfd5..9d40ba15 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -271,7 +271,7 @@ import {
 import { ModBusRules, checkProviderData } from '../../data.ts';
 import type { FormInstance } from 'ant-design-vue';
 import type { Rule } from 'ant-design-vue/lib/form';
-import { cloneDeep } from 'lodash-es';
+import {cloneDeep, omit} from 'lodash-es';
 
 const props = defineProps({
     data: {
@@ -343,10 +343,18 @@ const handleOk = async () => {
 
     // address是多余字段，但是react版本上使用到了这个字段
     params.configuration.parameter = {
-        ...params.configuration.parameter,
-        address: data?.pointKey,
+      ...params.configuration.parameter,
+      address: data?.pointKey,
     };
 
+    if (props.data.provider === 'GATEWAY') {
+      const configuration = cloneDeep(params.configuration)
+      params.configuration = {
+        configuration: configuration,
+        interval: params.interval
+      }
+    }
+
     loading.value = true;
     const response = !id
         ? await savePointBatch(params).catch(() => {})
@@ -439,22 +447,31 @@ watch(
 watch(
     () => props.data,
     (value) => {
-        if (value.id && value.provider === 'MODBUS_TCP') {
+        if (value.id && ['MODBUS_TCP', 'GATEWAY'].includes(value.provider)) {
             const _value: any = cloneDeep(value);
             const { writeByteCount, byteCount } =
-                _value.configuration.parameter;
+            props.data.provider === 'GATEWAY' ? _value.configuration.configuration.parameter: _value.configuration.parameter;
+
+          if (props.data.provider === 'GATEWAY') {
+            formData.value = {
+              ...omit(_value, ['configuration']),
+              ..._value.configuration,
+            }
+          } else {
             formData.value = _value;
-            if (!!_value.accessModes[0]?.value) {
-                formData.value.accessModes = value.accessModes.map(
-                    (i: any) => i.value,
-                );
-            }
-            if (!!_value.features[0]?.value) {
-                formData.value.features = value.features.map(
-                    (i: any) => i.value,
-                );
-            }
-            formData.value.nspwc = !!writeByteCount || !!byteCount;
+          }
+
+          if (!!_value.accessModes[0]?.value) {
+            formData.value.accessModes = value.accessModes.map(
+                (i: any) => i.value,
+            );
+          }
+          if (!!_value.features[0]?.value) {
+            formData.value.features = value.features.map(
+                (i: any) => i.value,
+            );
+          }
+          formData.value.nspwc = !!writeByteCount || !!byteCount;
         }
     },
     { immediate: true, deep: true },
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index c4c9f1a6..f869e77f 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -40,114 +40,111 @@
                     v-model:value="formData.name"
                 />
             </j-form-item>
-
-            <template v-if="provider === 'GATEWAY'">
-              <j-form-item
+            <j-form-item
+                v-if="provider === 'GATEWAY'"
                 label="通讯协议"
-                :name="['configuration', 'collectorProvider']"
+                :name="['collectorProvider']"
                 :rules="[{ required: true, message: '请选择通讯协议' }]"
             >
-                <j-select
-                    style="width: 100%"
-                    v-model:value="formData.configuration.collectorProvider"
-                    :options="providerListItems"
-                    placeholder="请选择通讯协议"
-                    allowClear
-                    show-search
-                    :filter-option="filterOption"
-                    :disabled="!!id"
-                />
+              <j-select
+                  style="width: 100%"
+                  v-model:value="formData.collectorProvider"
+                  :options="providerListItems"
+                  placeholder="请选择通讯协议"
+                  allowClear
+                  show-search
+                  :filter-option="filterOption"
+                  :disabled="!!id"
+              />
+            </j-form-item>
+            <j-form-item
+                v-if="visibleUnitId"
+                :name="['configuration', 'unitId']"
+                :rules="LeftTreeRules.unitId"
+                label="从机地址"
+            >
+              <j-input-number
+                  style="width: 100%"
+                  placeholder="请输入从机地址"
+                  v-model:value="formData.configuration.unitId"
+                  :min="0"
+                  :max="255"
+              />
+            </j-form-item>
+            <j-form-item
+                v-if="provider !== 'GATEWAY'"
+                :name="['configuration', 'inheritBreakerSpec', 'type']"
+                :rules="LeftTreeRules.type"
+                label="点位熔断处理"
+            >
+              <j-card-select
+                  :showImage="false"
+                  v-model:value="formData.configuration.inheritBreakerSpec.type"
+                  :options="[
+                                      { label: '降频', value: 'LowerFrequency' },
+                                      { label: '断开', value: 'Break' },
+                                      { label: '忽略', value: 'Ignore' },
+                                  ]"
+                  @change="changeCardSelectType"
+              />
+            </j-form-item>
+            <p style="color: #616161" v-if="provider !== 'GATEWAY'">
+              {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
+            </p>
+            <j-form-item
+                v-if="visibleEndian"
+                :name="['configuration', 'endian']"
+                :rules="LeftTreeRules.endian"
+                label="双字高低位切换"
+            >
+            <j-card-select
+                :showImage="false"
+                v-model:value="formData.configuration.endian"
+                :options="[
+                                    { label: 'AB', value: 'BIG' },
+                                    { label: 'BA', value: 'LITTLE' },
+                                ]"
+                @change="changeCardSelectEndian"
+                :column="2"
+            />
+            </j-form-item>
+            <j-form-item
+                v-if="visibleEndian"
+                :name="['configuration', 'endianIn']"
+                :rules="LeftTreeRules.endianIn"
+                label="单字高低位切换"
+            >
+            <j-card-select
+                :showImage="false"
+                v-model:value="formData.configuration.endianIn"
+                :options="[
+                                    { label: 'AB', value: 'BIG' },
+                                    { label: 'BA', value: 'LITTLE' },
+                                ]"
+                @change="changeCardSelectEndianIn"
+                :column="2"
+            />
+            </j-form-item>
+            <div v-if="visibleEndian" style="color: #616161">
+            <p>当前内存布局: {{ endianData }}</p>
+            <p>
+              只有4字节数据类型(int32、ieee754 float)
+              具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
+            </p>
+            </div>
+            <j-form-item
+                :name="['configuration', 'requsetTimeout']"
+                label="请求超时时间配置"
+            >
+            <j-input-number
+                style="width: 100%"
+                placeholder="请输入请求超时时间配置"
+                v-model:value="formData.configuration.requsetTimeout"
+                addon-after="ms"
+                :max="2147483648"
+                :min="1"
+            />
             </j-form-item>
-            </template>
-            <template v-else>
-              <j-form-item
-                  v-if="visibleUnitId"
-                  :name="['configuration', 'unitId']"
-                  :rules="LeftTreeRules.unitId"
-                  label="从机地址"
-              >
-                <j-input-number
-                    style="width: 100%"
-                    placeholder="请输入从机地址"
-                    v-model:value="formData.configuration.unitId"
-                    :min="0"
-                    :max="255"
-                />
-              </j-form-item>
-              <j-form-item
-                  :name="['configuration', 'inheritBreakerSpec', 'type']"
-                  :rules="LeftTreeRules.type"
-                  label="点位熔断处理"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.inheritBreakerSpec.type"
-                    :options="[
-                        { label: '降频', value: 'LowerFrequency' },
-                        { label: '断开', value: 'Break' },
-                        { label: '忽略', value: 'Ignore' },
-                    ]"
-                    @change="changeCardSelectType"
-                />
-              </j-form-item>
-              <p style="color: #616161">
-                {{ getTypeTooltip(formData.configuration.inheritBreakerSpec.type) }}
-              </p>
-              <j-form-item
-                  v-if="visibleEndian"
-                  :name="['configuration', 'endian']"
-                  :rules="LeftTreeRules.endian"
-                  label="双字高低位切换"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.endian"
-                    :options="[
-                        { label: 'AB', value: 'BIG' },
-                        { label: 'BA', value: 'LITTLE' },
-                    ]"
-                    @change="changeCardSelectEndian"
-                    :column="2"
-                />
-              </j-form-item>
-              <j-form-item
-                  v-if="visibleEndian"
-                  :name="['configuration', 'endianIn']"
-                  :rules="LeftTreeRules.endianIn"
-                  label="单字高低位切换"
-              >
-                <j-card-select
-                    :showImage="false"
-                    v-model:value="formData.configuration.endianIn"
-                    :options="[
-                        { label: 'AB', value: 'BIG' },
-                        { label: 'BA', value: 'LITTLE' },
-                    ]"
-                    @change="changeCardSelectEndianIn"
-                    :column="2"
-                />
-              </j-form-item>
-              <div v-if="visibleEndian" style="color: #616161">
-                <p>当前内存布局: {{ endianData }}</p>
-                <p>
-                  只有4字节数据类型(int32、ieee754 float)
-                  具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
-                </p>
-              </div>
-              <j-form-item
-                  :name="['configuration', 'requsetTimeout']"
-                  label="请求超时时间配置"
-              >
-                <j-input-number
-                    style="width: 100%"
-                    placeholder="请输入请求超时时间配置"
-                    v-model:value="formData.configuration.requsetTimeout"
-                    addon-after="ms"
-                    :max="2147483648"
-                    :min="1"
-                />
-              </j-form-item>
-            </template>
             <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
@@ -176,11 +173,10 @@
     </j-modal>
 </template>
 <script lang="ts" name="CollectorTreeSave" setup>
-import { save, update } from '@/api/data-collect/collector';
+import { save, update, getProviders } from '@/api/data-collect/collector';
 import { LeftTreeRules } from '../../data';
 import type { FormInstance } from 'ant-design-vue';
-import {cloneDeep} from "lodash-es";
-import {getProviders} from "@/api/data-collect/channel";
+import {cloneDeep, omit} from "lodash-es";
 import {protocolList} from "@/utils/consts";
 
 const loading = ref(false);
@@ -208,13 +204,7 @@ const providerListItems = ref()
 const geyProviderList = async () => {
   const resp: any = await getProviders();
   if (resp.success) {
-    const arr = resp.result.filter(
-        (item: any) =>  ['collector-gateway', 'modbus-tcp', 'opc-ua'].includes(item.id),
-    ).map((it: any) => it.id);
-    console.log(arr, protocolList)
-    providerListItems.value = protocolList.filter((item: any) =>
-        arr.includes(item.alias),
-    );
+    providerListItems.value = resp.result.map((item: any) => ({ label: item.name, value: item.id }))
   } else {
     providerListItems.value = []
   }
@@ -255,12 +245,12 @@ const endianData = computed(() => {
 const formData = ref({
     channelId: undefined,
     name: '',
+    collectorProvider: undefined,
     configuration: {
         unitId: '',
         type: 'LowerFrequency',
         endian: 'BIG',
         endianIn: 'BIG',
-        collectorProvider: undefined,
         requsetTimeout: 2000,
         inheritBreakerSpec: {
           type: 'LowerFrequency',
@@ -274,34 +264,52 @@ const formData = ref({
 });
 
 const handleOk = async () => {
-    const data = await formRef.value?.validate();
+    const _data: any = await formRef.value?.validate();
 
+    if (_data) {
+      const { name } = _channelListAll.value.find(
+          (item: any) => item.id === formData.value.channelId,
+      );
 
+      let _copyData = _data
 
-    const { name } = _channelListAll.value.find(
-        (item: any) => item.id === formData.value.channelId,
-    );
+      if (['GATEWAY'].includes(provider.value)) {
+        const copyData = cloneDeep(_data)
+        _copyData = omit(copyData, ['configuration', 'collectorProvider'])
 
-    if (['GATEWAY'].includes(data?.provider)) {
-      data.configuration.inheritBreakerSpec.type = 'Ignore'
-    }
+        _copyData.configuration = {
+          configuration: {
+            ..._data.configuration,
+            inheritBreakerSpec: {
+              type: 'Ignore'
+            }
+          },
+          collectorProvider: _data.collectorProvider
+        }
+      }
 
-    const params = {
-        ...data,
+      const params = {
+        ..._copyData,
         provider: provider.value,
         channelName: name,
         circuitBreaker: {
           type: 'Ignore'
         }
-    };
+      };
 
-    loading.value = true;
-    const response = !id
-        ? await save(params).catch(() => { success: false })
-        : await update(id, { ...props.data, ...params }).catch(() => { success: false });
-    loading.value = false;
-    if (response.success) {
-        emit('change', true);
+      loading.value = true;
+
+      try {
+        const response = !id
+            ? await save(params)
+            : await update(id, { ...props.data, ...params })
+        loading.value = false;
+        if (response.success) {
+          emit('change', true);
+        }
+      } catch (e) {
+        loading.value = false;
+      }
     }
 };
 
@@ -337,7 +345,7 @@ watch(
     (value) => {
         const dt = _channelListAll.value.find((item) => item.id === value);
         visibleUnitId.value = visibleEndian.value =
-            dt?.provider && dt?.provider === 'MODBUS_TCP';
+            dt?.provider && ['MODBUS_TCP', 'GATEWAY'].includes(dt?.provider);
     },
     { deep: true },
 );
@@ -347,7 +355,7 @@ watch(
     (value) => {
         if (value.id) {
           let copyValue = cloneDeep(value)
-          if (!copyValue?.configuration?.inheritBreakerSpec) {
+          if (!copyValue?.configuration?.inheritBreakerSpec && copyValue.provider !== 'GATEWAY') {
             copyValue.configuration = {
               ...copyValue.configuration,
               inheritBreakerSpec: {
@@ -356,12 +364,17 @@ watch(
             }
             copyValue.circuitBreaker.type = 'Ignore'
           }
-          formData.value = copyValue
 
-          const item = props.channelListAll.find(
-              (item: any) => item.id === formData.value.channelId,
-          );
-          provider.value = item?.provider
+          if (copyValue.provider === 'GATEWAY') {
+            formData.value = {
+              ...omit(copyValue, ['configuration']),
+              ...copyValue.configuration,
+            }
+          } else {
+            formData.value = copyValue
+          }
+
+          provider.value = copyValue?.provider
         };
     },
     { immediate: true, deep: true },
diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
index 713ddb89..54f4f9f9 100644
--- a/src/views/device/Instance/Detail/components/EditTable/index.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -28,14 +28,9 @@
                                     placeholder="请选择"
                                     allowClear
                                     :filter-option="filterOption"
+                                    :options="channelList"
+                                    @select="(_, option) => { record.provider = option.provider }"
                                 >
-                                    <j-select-option
-                                        v-for="item in channelList"
-                                        :key="item.value"
-                                        :value="item.value"
-                                        :label="item.label"
-                                        >{{ item.label }}</j-select-option
-                                    >
                                 </j-select>
                             </j-form-item>
                         </template>
@@ -269,6 +264,7 @@ const onSave = () => {
                 (i: any) => i.channelId,
             );
             if (arr && arr.length !== 0) {
+                console.log(arr)
                 const resp = await saveMapping(
                     instanceStore.current.id,
                     props.provider,
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index aa1f7625..9661b8c0 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -139,7 +139,7 @@ const getTypeList = (result: Record<string, any>) => {
         } else if (item.id === 'OneNet' || item.id === 'Ctwing') {
             item.type = 'cloud';
             cloud.push(item);
-        } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua') {
+        } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua' || item.id === 'collector-gateway') {
             item.type = 'channel';
             channel.push(item);
         } else if (
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index ba4f72fa..891b18dc 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -45,6 +45,7 @@ BackMap.set('gb28181-2016', getImage('/access/gb28181.png'));
 BackMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
 BackMap.set('edge-child-device', getImage('/access/child-device.png'));
 BackMap.set('official-edge-gateway', getImage('/access/edge.png'));
+BackMap.set('collector-gateway', getImage('/access/collector-gateway.png'));
 
 const descriptionList = {
     'udp-device-gateway':
diff --git a/vite.config.ts b/vite.config.ts
index f5403f0c..36d90794 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,7 +94,7 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.32.226:8844',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://192.168.32.163:8844', //张季本地
+                  // target: 'http://192.168.32.163:8844', //张季本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
                   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',