Merge branch 'perf/device-manage-import' into 'main_dev'

perf: 设备列表导入字段调整

See merge request yunteng/thingskit-front!620

@@ -3,6 +3,7 @@ import { DeviceTypeEnum } from './deviceModel';
 export interface ImportDeviceParams {
   file: string;
   tkDeviceProfileId: string;
+  tbDeviceProfileId: string;
   organizationId: string;
   deviceTypeEnum: DeviceTypeEnum;
   mapping: {
@@ -11,6 +12,8 @@ export interface ImportDeviceParams {
     header: boolean;
     update: boolean;
   };
+  gateWayTbDeviceId: string;
+  isTcpDeviceProfile: boolean;
 }
 
 export interface ImportDeviceResponse {

 <script lang="ts" setup>
   import { Button } from 'ant-design-vue';
-  import { computed, nextTick, onMounted } from 'vue';
-  import { basicInfoForm, FieldsEnum } from './config';
+  import { onMounted } from 'vue';
+  import { basicInfoForm } from './config';
   import { basicProps } from './props';
   import StepContainer from './StepContainer.vue';
   import { BasicForm, useForm } from '/@/components/Form';
@@ -15,26 +15,14 @@
 
   const emit = defineEmits(['update:value']);
 
-  const canGoNext = computed(() => {
-    const values = props.value as Recordable;
-    return (
-      Reflect.has(values, FieldsEnum.ORGANIZATION_ID) &&
-      Reflect.has(values, FieldsEnum.TK_DEVICE_PROFILE_ID) &&
-      Reflect.has(values, FieldsEnum.DEVICE_TYPE)
-    );
-  });
-  const [register, { getFieldsValue, setFieldsValue }] = useForm({
+  const [register, { getFieldsValue, setFieldsValue, validate }] = useForm({
     schemas: basicInfoForm,
     layout: 'vertical',
     showActionButtonGroup: false,
-    submitFunc: async () => {
-      await nextTick();
-      const values = getFieldsValue() || {};
-      emit('update:value', values);
-    },
   });
 
-  const handleGoNext = () => {
+  const handleGoNext = async () => {
+    await validate();
     emit('update:value', getFieldsValue());
     props.goNextStep?.();
   };
@@ -48,7 +36,7 @@
   <StepContainer>
     <BasicForm @register="register" />
     <div class="flex justify-end gap-2">
-      <Button type="primary" @click="handleGoNext" :disabled="!canGoNext">下一步</Button>
+      <Button type="primary" @click="handleGoNext">下一步</Button>
     </div>
   </StepContainer>
 </template>

@@ -8,6 +8,7 @@
     ColumnFileEnum,
     ColumTypeEnum,
     generateColumnTypeOptions,
+    CredentialsEnum,
   } from './config';
   import { nextTick, onMounted, ref, unref, watch } from 'vue';
   import { ColumnDataRecord, Options, UploadFileParseValue } from './type';
@@ -47,7 +48,7 @@
     const exampleRow = content.at(0) || {};
 
     const getColumnType = (index: number) => {
-      return index === DEVICE_NAME_INDEX ? ColumTypeEnum.NAME : ColumTypeEnum.SERVER_ATTRIBUTE;
+      return index === DEVICE_NAME_INDEX ? ColumTypeEnum.NAME : CredentialsEnum.ACCESS_TOKEN;
     };
 
     const dataSource = header.map((columnKey, index) => {

@@ -7,6 +7,7 @@
   import { CreateEntityValue, UploadFileParseValue } from './type';
   import { batchImportDevice } from '/@/api/device/batchImport';
   import { ImportDeviceParams, ImportDeviceResponse } from '/@/api/device/model/batchImportModel';
+  import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 
   const props = defineProps({
     ...basicProps,
@@ -37,7 +38,7 @@
     try {
       const value = transfromData(JSON.parse(JSON.stringify(props.value)));
       const result = await batchImportDevice(value);
-      await sleep(3000);
+      await sleep(1000);
       emit('update:result', result);
       props.goNextStep?.();
     } catch (error) {
@@ -75,7 +76,16 @@
 
   const transfromData = (data: CreateEntityValue) => {
     const { basicInfo, columnConfiguration, fileParseValue } = data;
-    const { tkDeviceProfileId, organizationId, deviceTypeEnum, deviceTypeName } = basicInfo;
+    const {
+      tkDeviceProfileId,
+      organizationId,
+      deviceTypeEnum,
+      deviceTypeName,
+      gateWayTbDeviceId,
+      tbDeviceProfileId,
+      isTcpDeviceProfile,
+    } = basicInfo;
+
     const { file, columns } = insertDeviceTypeName(
       deviceTypeName,
       fileParseValue,
@@ -86,12 +96,15 @@
       tkDeviceProfileId,
       organizationId,
       deviceTypeEnum,
+      tbDeviceProfileId,
       mapping: {
         columns: columns,
         delimiter: DelimiterEnum.COMMA,
         header: true,
         update: true,
       },
+      isTcpDeviceProfile,
+      ...(deviceTypeEnum === DeviceTypeEnum.SENSOR ? { gateWayTbDeviceId } : {}),
     } as ImportDeviceParams;
   };
 

@@ -49,6 +49,7 @@
       const fileReader = new FileReader();
       fileReader.onload = (event: ProgressEvent) => {
         const data = (event.target as FileReader).result as string;
+
         const result = XLSX.read(data, { type: 'string' });
 
         const sheetName = result.SheetNames.at(0);

 import { Options } from './type';
+import { getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { queryDeviceProfileBy } from '/@/api/device/deviceManager';
+import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { getOrganizationList } from '/@/api/system/system';
 import { FormSchema } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { copyTransFun } from '/@/utils/fnUtils';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 
 export enum FieldsEnum {
   ORGANIZATION_ID = 'organizationId',
@@ -14,6 +17,9 @@ export enum FieldsEnum {
   DELIMITER = 'delimiter',
   HEADER = 'header',
   UPDATE = 'update',
+  GATEWAY_TB_DEVICE_ID = 'gateWayTbDeviceId',
+  TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
+  IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
 }
 
 export enum DelimiterEnum {
@@ -39,7 +45,7 @@ export enum ColumnFileEnum {
 
 export enum ColumTypeEnum {
   NAME = 'NAME',
-  // TYPE = 'TYPE',
+  TYPE = 'TYPE',
   LABEL = 'LABEL',
   DESCRIPTION = 'DESCRIPTION',
   SHARED_ATTRIBUTE = 'SHARED_ATTRIBUTE',
@@ -48,6 +54,17 @@ export enum ColumTypeEnum {
   IS_GATEWAY = 'IS_GATEWAY',
 }
 
+export enum ColumnTypeNameEnum {
+  NAME = '名称',
+  TYPE = '类型',
+  LABEL = '标签',
+  DESCRIPTION = '说明',
+  SHARED_ATTRIBUTE = '共享属性',
+  SERVER_ATTRIBUTE = '服务器属性',
+  TIMESERIES = 'Timeseries',
+  IS_GATEWAY = 'Is网关',
+}
+
 export enum CredentialsEnum {
   ACCESS_TOKEN = 'ACCESS_TOKEN',
   X509 = 'X509',
@@ -67,17 +84,6 @@ export enum CredentialsEnum {
   // LWM2M_SERVER_CLIENT_SECRET_KEY = 'LWM2M_SERVER_CLIENT_SECRET_KEY',
 }
 
-export enum ColumnTypeNameEnum {
-  NAME = '名称',
-  // TYPE = '类型',
-  // LABEL = '标签',
-  // DESCRIPTION = '说明',
-  SHARED_ATTRIBUTE = '共享属性',
-  SERVER_ATTRIBUTE = '服务器属性',
-  TIMESERIES = 'Timeseries',
-  IS_GATEWAY = 'Is网关',
-}
-
 export enum CredentialsNameEnum {
   ACCESS_TOKEN = '访问令牌',
   X509 = 'X.509',
@@ -103,8 +109,7 @@ export const basicInfoForm: FormSchema[] = [
     label: '所属组织',
     component: 'ApiTreeSelect',
     rules: [{ required: true, message: '所属组织为必填项' }],
-    componentProps: ({ formActionType }) => {
-      const { submit } = formActionType;
+    componentProps: () => {
       return {
         maxLength: 250,
         placeholder: '请选择所属组织',
@@ -114,7 +119,6 @@ export const basicInfoForm: FormSchema[] = [
           return data;
         },
         getPopupContainer: () => document.body,
-        onChange: () => submit(),
       };
     },
   },
@@ -124,7 +128,7 @@ export const basicInfoForm: FormSchema[] = [
     component: 'ApiSelect',
     rules: [{ required: true, message: '设备类型为必填项' }],
     componentProps: ({ formActionType }) => {
-      const { setFieldsValue, submit, clearValidate } = formActionType;
+      const { setFieldsValue, clearValidate } = formActionType;
       return {
         api: findDictItemByCode,
         params: {
@@ -136,8 +140,8 @@ export const basicInfoForm: FormSchema[] = [
           setFieldsValue({
             [FieldsEnum.DEVICE_TYPE_NAME]: value ? options.label : null,
             [FieldsEnum.TK_DEVICE_PROFILE_ID]: null,
+            [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
           });
-          submit();
           clearValidate();
         },
       };
@@ -149,7 +153,7 @@ export const basicInfoForm: FormSchema[] = [
     label: '产品',
     rules: [{ required: true, message: '产品为必填项' }],
     componentProps: ({ formActionType, formModel }) => {
-      const { submit } = formActionType;
+      const { setFieldsValue } = formActionType;
       const deviceType = Reflect.get(formModel, FieldsEnum.DEVICE_TYPE);
       return {
         api: queryDeviceProfileBy,
@@ -158,7 +162,14 @@ export const basicInfoForm: FormSchema[] = [
         placeholder: '请选择产品',
         params: { deviceType },
         getPopupContainer: () => document.body,
-        onChange: () => submit(),
+        onChange(value: string, options: DeviceRecord) {
+          setFieldsValue({
+            [FieldsEnum.IS_TCP_DEVICE_PROFILE]: value
+              ? options.transportType === TransportTypeEnum.TCP
+              : false,
+            [FieldsEnum.TB_DEVICE_PROFILE_ID]: value ? options.tbProfileId : null,
+          });
+        },
         showSearch: true,
         filterOption: (inputValue: string, options: Record<'label', string>) => {
           return options.label.includes(inputValue);
@@ -167,6 +178,51 @@ export const basicInfoForm: FormSchema[] = [
     },
   },
   {
+    field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
+    component: 'ApiSelect',
+    label: '网关设备',
+    ifShow: ({ model }) => model[FieldsEnum.DEVICE_TYPE] === DeviceTypeEnum.SENSOR,
+    required: true,
+    componentProps: ({ formModel }) => {
+      const organizationId = formModel[FieldsEnum.ORGANIZATION_ID];
+      return {
+        api: async () => {
+          try {
+            if (!organizationId) return;
+            const result = await getMeetTheConditionsDevice({
+              deviceType: DeviceTypeEnum.GATEWAY,
+              organizationId,
+            });
+            return result;
+          } catch (error) {
+            return [];
+          }
+        },
+        labelField: 'name',
+        valueField: 'tbDeviceId',
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
+    field: FieldsEnum.IS_TCP_DEVICE_PROFILE,
+    component: 'Checkbox',
+    label: 'tcp产品标志',
+    show: false,
+  },
+  {
+    field: FieldsEnum.TB_DEVICE_PROFILE_ID,
+    component: 'Input',
+    label: 'tb设备配置id',
+    show: false,
+  },
+  {
+    field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
+    component: 'Input',
+    label: 'tb网关设备ID',
+    show: false,
+  },
+  {
     field: FieldsEnum.DEVICE_TYPE_NAME,
     component: 'Input',
     label: '设备名称',
@@ -205,14 +261,16 @@ export const importConfigurationSchema: FormSchema[] = [
 ];
 
 export const generateColumnTypeOptions = () => {
-  const valueOptions = Object.keys(ColumTypeEnum);
-  const labelOptions = Object.values(ColumnTypeNameEnum);
+  // const valueOptions = Object.keys(ColumTypeEnum);
+  // const labelOptions = Object.values(ColumnTypeNameEnum);
   const credentialsValueOptions = Object.keys(CredentialsEnum);
   const credentialsNameOptions = Object.values(CredentialsNameEnum);
-  const options: Options[] = valueOptions.map((value, index) => ({
-    label: labelOptions[index],
-    value,
-  }));
+  // const options: Options[] = valueOptions.map((value, index) => ({
+  //   label: labelOptions[index],
+  //   value,
+  // }));
+
+  const options: Options[] = [];
 
   const credentialsOption: Options = {
     label: 'credentials',
@@ -245,9 +303,8 @@ export const columnTypeSchema: BasicColumn[] = [
   },
 ];
 
-export const csvTemplate = `name,username,password
-Device 11,admin,password
-Device 22,admin1,password1
+export const csvTemplate = `设备名称,凭证账号,凭证密码
+温湿度设备,admin,123456 
 `;
 
 export const downloadFile = (data: string, fileName: string, type: string, ext: string) => {

@@ -138,7 +138,7 @@
         </Steps.Step>
       </Steps>
       <Tooltip
-        title="模板表头的第一列为设备名称,且不能重复,如需预置访问凭证(ACCESS_TOKEN、MQTT client ID、MQTT user name、MQTT password)添加新的列即可。例如:username、password"
+        title="模板表头的第一列为设备名称,且不能重复,如需预置访问凭证(ACCESS_TOKEN、MQTT client ID、MQTT user name、MQTT password)添加新的列即可。例如:凭证账号,凭证密码"
       >
         <Button
           type="text"

@@ -20,9 +20,16 @@ export interface Options {
 }
 
 export type BasicInfoRecord = Record<
-  'organizationId' | 'tkDeviceProfileId' | 'deviceTypeEnum' | 'deviceTypeName',
+  | 'organizationId'
+  | 'tkDeviceProfileId'
+  | 'deviceTypeEnum'
+  | 'deviceTypeName'
+  | 'gateWayTbDeviceId'
+  | 'gateWayTkDeviceId'
+  | 'tbDeviceProfileId',
   string
->;
+> &
+  Record<'isTcpDeviceProfile', boolean>;
 
 export interface CreateEntityValue {
   basicInfo: BasicInfoRecord;