Merge branch 'cherry-pick-e6853904' into 'main'

Merge branch 'feat-import-model-of-matter' into 'main_dev'

See merge request yunteng/thingskit-front!600

@@ -55,3 +55,9 @@ export interface GetModelTslParams {
   functionType: FunctionType;
   functionType: FunctionType;
   deviceProfileId: string;
   deviceProfileId: string;
 }
 }
+
+export interface ImportModelOfMatterType {
+  data: Recordable;
+  functionType: string;
+  tkDeviceProfileId: string;
+}

 import { BasicPageParams } from '../model/baseModel';
 import { BasicPageParams } from '../model/baseModel';
-import { GetModelTslParams, ModelOfMatterParams } from './model/modelOfMatterModel';
+import {
+  GetModelTslParams,
+  ImportModelOfMatterType,
+  ModelOfMatterParams,
+} from './model/modelOfMatterModel';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 
 
@@ -11,6 +15,8 @@ enum ModelOfMatter {
   LIST = '/things_model/page',
   LIST = '/things_model/page',
   RELEASE = '/things_model',
   RELEASE = '/things_model',
 
 
+  IMPORT = '/things_model/import',
+
   GET_MODEL_SERVICE = '/things_model/get_services',
   GET_MODEL_SERVICE = '/things_model/get_services',
 }
 }
 
 
@@ -69,3 +75,10 @@ export const getModelServices = (params: { deviceProfileId: string }) => {
     url: `${ModelOfMatter.GET_MODEL_SERVICE}/${deviceProfileId}`,
     url: `${ModelOfMatter.GET_MODEL_SERVICE}/${deviceProfileId}`,
   });
   });
 };
 };
+
+export const importModelOfMatter = (data: ImportModelOfMatterType) => {
+  return defHttp.post({
+    url: ModelOfMatter.IMPORT,
+    data,
+  });
+};

@@ -281,6 +281,7 @@ export const formSchemas = (hasStructForm: boolean): FormSchema[] => {
       colProps: {
       colProps: {
         span: 24,
         span: 24,
       },
       },
+      ifShow: () => !hasStructForm,
       defaultValue: 'r',
       defaultValue: 'r',
       componentProps: {
       componentProps: {
         placeholder: '请选择读写类型',
         placeholder: '请选择读写类型',

@@ -33,9 +33,9 @@
                 </Button>
                 </Button>
               </Authority>
               </Authority>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
-              <Button v-if="false && isShowBtn" type="primary" @click="handleImportModel"
-                >导入物模型</Button
-              >
+              <Upload v-if="isShowBtn" :show-upload-list="false" :customRequest="handleImportModel">
+                <Button type="primary"> 导入物模型 </Button>
+              </Upload>
             </div>
             </div>
             <div class="flex gap-2">
             <div class="flex gap-2">
               <Authority :value="ModelOfMatterPermission.RELEASE">
               <Authority :value="ModelOfMatterPermission.RELEASE">
@@ -126,13 +126,19 @@
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
-  import { Popconfirm, Button, Alert } from 'ant-design-vue';
+  import { Popconfirm, Button, Alert, Upload } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { deleteModel, getModelList, releaseModel } from '/@/api/device/modelOfMatter';
+  import {
+    deleteModel,
+    getModelList,
+    importModelOfMatter,
+    releaseModel,
+  } from '/@/api/device/modelOfMatter';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
   import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
   import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
   import { ref } from 'vue';
   import { ref } from 'vue';
+  import { isObject, isString } from '/@/utils/is';
   defineEmits(['register']);
   defineEmits(['register']);
 
 
   const props = defineProps<{
   const props = defineProps<{
@@ -229,7 +235,37 @@
     }
     }
   };
   };
 
 
-  const handleImportModel = async () => {};
+  const paseJSON = (string: string) => {
+    let data = null;
+    let flag = false;
+    try {
+      if (!isString(string)) return { flag: false, data };
+      data = JSON.parse(string);
+      flag = true;
+      if (!isObject(data)) flag = false;
+    } catch (error) {}
+    return { flag, data };
+  };
+
+  const handleImportModel = async (data: { file: File }) => {
+    const fileReader = new FileReader();
+
+    fileReader.onload = async () => {
+      const { flag, data } = paseJSON(fileReader.result as string);
+      if (!flag) return;
+      const result = await importModelOfMatter({
+        tkDeviceProfileId: props.record.id,
+        data: data!,
+        functionType: 'all',
+      });
+
+      result ? createMessage.success('导入成功~') : createMessage.error('导入失败~');
+
+      result && reload();
+    };
+
+    fileReader.readAsText(data.file, 'utf-8');
+  };
 
 
   defineExpose({});
   defineExpose({});
 </script>
 </script>

@@ -85,7 +85,13 @@
     try {
     try {
       loading.value = true;
       loading.value = true;
       const record = await getModelTsl({ deviceProfileId: props.record.id, functionType });
       const record = await getModelTsl({ deviceProfileId: props.record.id, functionType });
-      jsonValue.value = JSON.stringify(record, null, 2);
+      jsonValue.value = JSON.stringify(
+        {
+          [functionType]: record,
+        },
+        null,
+        2
+      );
     } catch (error) {
     } catch (error) {
     } finally {
     } finally {
       loading.value = false;
       loading.value = false;

+import { ref } from 'vue';
+import { DataSource } from '../../palette/types';
+import { sendCommandOneway } from '/@/api/dataBoard';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+
+const { createMessage } = useMessage();
+export function useSendCommand() {
+  const loading = ref(false);
+
+  const error = () => {
+    createMessage.error('下发指令失败');
+    return false;
+  };
+  const sendCommand = async (record: DataSource, value: any) => {
+    if (!record) return error();
+    const { customCommand, attribute } = record;
+
+    const { deviceId } = record;
+    if (!deviceId) return error();
+    loading.value = true;
+    try {
+      let params: string | Recordable = {
+        [attribute!]: Number(value),
+      };
+
+      // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
+      if (customCommand?.transportType === TransportTypeEnum.TCP) {
+        params = customCommand.command!;
+      }
+
+      // 控制按钮下发命令为0 或 1
+      await sendCommandOneway({
+        deviceId,
+        value: {
+          params: params,
+          persistent: true,
+          additionalInfo: {
+            cmdType: 'API',
+          },
+          method: 'methodThingskit',
+        },
+      });
+      createMessage.success('命令下发成功');
+      return true;
+    } catch (msg) {
+      return error();
+    } finally {
+      loading.value = false;
+    }
+  };
+  return {
+    sendCommand,
+    loading,
+  };
+}