Merge branch 'ft' into 'main_dev'

fix:修改Teambition上的问题

See merge request yunteng/thingskit-front!543

@@ -34,6 +34,8 @@ enum Api {
   getTenantProfile = '/tenant_profiles',
   deleteTenantProfile = '/tenantProfile',
   setTenantProfile = '/tenantProfile',
+  getTenantPageList = '/admin/all/tenants',
+  getTenantAllPageList = '/admin/',
 }
 
 export async function deleteTenantProfileApi(ids: string) {
@@ -155,3 +157,15 @@ export function getTenantRoles(tenantCode: string) {
     url: Api.getTenantRoles,
   });
 }
+
+export function getTenantPageList() {
+  return defHttp.get({
+    url: Api.getTenantPageList,
+  });
+}
+
+export function getTenantAllPageLists(tenantId) {
+  return defHttp.get({
+    url: `${Api.getTenantAllPageList}${tenantId}/all/tenant_admin`,
+  });
+}

@@ -39,6 +39,7 @@ export interface TenantPageRequestParams extends BaseQueryParams {
 }
 
 export interface TenantAdminPageRequestParams extends BaseQueryParams {
+  [x: string]: any;
   realName?: string;
   tenantId?: string;
   items?: string[];

@@ -67,8 +67,8 @@
     initVal();
   });
 
-  function initVal() {
-    if (props?.type) getOptions(props?.type);
+  async function initVal() {
+    if (props?.type) await getOptions(props?.type);
     if (props?.value) for (let i in props.value) Reflect.set(valueObj, i, props.value[i]);
   }
 

@@ -42,8 +42,6 @@
 
   const role: string = userInfo?.roles[0];
 
-  console.log({ role });
-
   const loading = ref(true);
 
   setTimeout(() => {

@@ -22,6 +22,7 @@
         v-show="getRequestBody.content.requestParamsBodyType === 'x-www-form-urlencoded'"
       />
       <JsonEditor
+        style="width: 35vw; height: 30vh"
         v-show="getRequestBody.content.requestParamsBodyType === 'json'"
         ref="jsonEditorRef"
       />

@@ -20,7 +20,7 @@
         mode: 'code',
         mainMenuBar: false,
         statusBar: false,
-      };
+      } as object;
       let editor = new jsoneditor(jsoneditorRef.value, options);
       editor.set(jsonValue.value);
       jsonInstance.value = editor;

@@ -163,6 +163,7 @@
 
   const handleTestParamsInterface = () => {
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let value = getValue(false) as any;
     dataMap.mapParamsObj = {
       list: value?.Params,
@@ -174,6 +175,7 @@
     let value = getValue(false) as any;
     const type = value?.Body?.requestParamsBodyType;
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let values = [];
     for (let i in value?.Body) if (i === type) values = value?.Body[i];
     dataMap.mapBodyObj = {
@@ -185,6 +187,7 @@
 
   const handleTestHeaderInterface = () => {
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let value = getValue(false) as any;
     dataMap.mapHeaderObj = {
       list: value?.Header,
@@ -207,14 +210,20 @@
   };
 
   //设置数据
-  const setValue = (data) => {
-    nextTick(() => {
-      const Objects = JSON.parse(data?.requestParams);
-      if (!Objects) return;
-      dataForTypeMap[0][1](isEmpty(Objects?.Params) ? [pushObj] : Objects?.Params);
-      dataForTypeMap[1][1](isEmpty(Objects?.Body) ? {} : Objects?.Body);
-      dataForTypeMap[2][1](isEmpty(Objects?.Header) ? [pushObj] : Objects?.Header);
-    });
+  const setValue = (data, flag, defaultValue) => {
+    if (!flag) {
+      nextTick(() => {
+        const Objects = JSON.parse(data?.requestParams);
+        if (!Objects) return;
+        dataForTypeMap[0][1](isEmpty(Objects?.Params) ? [pushObj] : Objects?.Params);
+        dataForTypeMap[1][1](isEmpty(Objects?.Body) ? {} : Objects?.Body);
+        dataForTypeMap[2][1](isEmpty(Objects?.Header) ? [pushObj] : Objects?.Header);
+      });
+    } else {
+      nextTick(() => {
+        dataForTypeMap[0][1](defaultValue);
+      });
+    }
   };
 
   //重置数据

@@ -2,18 +2,52 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
-        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
+        <div class="flex" v-if="isAdmin(role)">
+          <Select
+            v-model:value="selectTenant"
+            allowClear
+            @change="onSelect"
+            style="width: 150px"
+            :getPopupContainer="
+              (triggerNode) => {
+                return triggerNode.parentNode;
+              }
+            "
+            placeholder="请选择租户"
+            :options="selectOptions"
+          />
+          <Select
+            v-model:value="selectSysTenant"
+            allowClear
+            @change="onSelctTenant"
+            style="width: 150px; margin-left: 10px"
+            v-if="selectTenantOptions.length > 0"
+            :getPopupContainer="
+              (triggerNode) => {
+                return triggerNode.parentNode;
+              }
+            "
+            placeholder="请选择租户"
+            :options="selectTenantOptions"
+          />
+        </div>
+        <Button
+          :disabled="testDisabled"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
+          >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
+        </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
           <a-col :span="3"> 参数设置 </a-col>
           <a-col :span="21">
             <div v-if="data?.type === 'x-www-form-urlencoded' || data?.type === 'form-data'">
-              <TestBodyCellTable ref="testEditCellTableRef" />
+              <TestBodyCellTable :token="getToken" ref="testEditCellTableRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'json'">
-              <JsonEditor ref="jsonEditorRef" />
+              <JsonEditor style="width: 35vw; height: 30vh" ref="jsonEditorRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'xml'">
               <a-textarea v-model:value="xmlContent" placeholder="请输入xml" :rows="6" />
@@ -26,13 +60,24 @@
   </div>
 </template>
 <script lang="ts" setup name="testRequest">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, onMounted } from 'vue';
   import { Button } from 'ant-design-vue';
   import TestBodyCellTable from './testEditBodyCellTable.vue';
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getTenantAllPageLists, getTenantPageList } from '/@/api/tenant/tenantApi';
+  import { selectType } from '../../../types';
+  import { Select } from 'ant-design-vue';
+  import { getUserToken } from '/@/api/sys/user';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { isAdmin } from '/@/enums/roleEnum';
+
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+
+  const role: string = userInfo?.roles[0];
 
   const emits = defineEmits(['testBodyInterface', 'closeTest']);
 
@@ -42,12 +87,33 @@
     },
   });
 
+  onMounted(async () => {
+    if (isAdmin(role)) {
+      const res = await getTenantPageList();
+      selectOptions.value = res.map((m) => ({ label: m.name, value: m.tenantId }));
+    } else {
+      //租户
+      const { token } = await getUserToken(userInfo?.userId);
+      getToken.value = token;
+    }
+  });
+
+  const selectOptions = ref<selectType[]>([]);
+
+  const selectTenantOptions = ref<selectType[]>([]);
+
   const { createMessage } = useMessage();
 
   const showTestEditCell = ref(false);
 
+  const testDisabled = ref(true);
+
   const excuteData = ref({});
 
+  const selectTenant = ref(undefined);
+
+  const selectSysTenant = ref(undefined);
+
   const xmlContent = ref('');
 
   const testEditCellTableRef = ref<InstanceType<typeof TestBodyCellTable>>();
@@ -58,10 +124,47 @@
 
   const { getMultipleKeys } = useUtils();
 
-  const handleTest = () => {
-    showTestEditCell.value = true;
-    emits('testBodyInterface');
-    getValue();
+  const getToken = ref('');
+
+  const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    selectSysTenant.value = undefined;
+    const rest = (await getTenantAllPageLists(e)) as any;
+    selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
+  };
+
+  const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    const { token } = await getUserToken(e);
+    getToken.value = token;
+  };
+
+  const isSingleClickText = ref('open');
+
+  const handleTest = (o) => {
+    if (isAdmin(role)) {
+      if (!selectTenant.value || !selectSysTenant.value) {
+        createMessage.error('请选择租户或者租户管理员');
+        throw Error('请选择租户或者租户管理员');
+      }
+    }
+    if (o === 'open') {
+      showTestEditCell.value = true;
+      emits('testBodyInterface');
+      getValue();
+      isSingleClickText.value = 'close';
+    } else {
+      isSingleClickText.value = 'open';
+      onCloseTest();
+    }
   };
 
   const getValue = async () => {
@@ -141,6 +244,7 @@
     }
     excuteData.value = {
       params,
+      token: getToken.value,
     };
     return excuteData.value;
   };
@@ -149,6 +253,9 @@
   const setValue = () => {
     showTestEditCell.value = false;
     testResult.value = '';
+    selectTenant.value = undefined;
+    selectSysTenant.value = undefined;
+    selectTenantOptions.value = [];
   };
 
   const onCloseTest = () => {

@@ -130,9 +130,8 @@
   import { reactive, ref, onMounted } from 'vue';
   import { Select } from 'ant-design-vue';
   import { findDictItemByCode } from '/@/api/system/dict';
-  import { getAllDeviceByOrg } from '/@/api/dataBoard';
-  import { getDeviceAttributes } from '/@/api/dataBoard';
   import { useApi } from '../../../hooks/useApi';
+  import { useUtils } from '../../../hooks/useUtils';
   import { cloneDeep } from 'lodash-es';
   import { tableItems, selectType } from '../../../types';
   import { editTestCellTableTHeadConfig } from '../../../config';
@@ -142,6 +141,9 @@
     method: {
       type: String,
     },
+    token: {
+      type: String,
+    },
   });
 
   onMounted(async () => {
@@ -155,6 +157,8 @@
       selectOptions.value = selectOptions.value.filter((f) => f.value !== 'scope');
   });
 
+  const { isOtherHttp } = useUtils();
+
   const selectOptions = ref<selectType[]>([]);
 
   const valueOptions = ref<selectType[]>([]);
@@ -199,10 +203,10 @@
   const getApi = (list) => {
     list?.forEach(async (it) => {
       if (it.key === 'deviceProfileId') {
-        const { options } = await useApi(it.key);
+        const { options } = await useApi(it.key, props.token);
         valueOptions.value = options;
       } else if (it.key === 'organizationId') {
-        const { options } = await useApi(it.key);
+        const { options } = await useApi(it.key, props.token);
         treeData.value = options as any;
       }
     });
@@ -220,7 +224,10 @@
   };
 
   const getEntityOptions = async (organizationId: string, deviceProfileId?: string) => {
-    const res = await getAllDeviceByOrg(organizationId, deviceProfileId);
+    const res = await isOtherHttp('api/yt/device/list', props.token, {
+      organizationId,
+      deviceProfileId,
+    });
     entityOptions.value = res.map((item) => ({
       label: item.name,
       value: item.tbDeviceId,
@@ -228,7 +235,10 @@
   };
 
   const getAttributeOptions = async (params) => {
-    const res = await getDeviceAttributes(params);
+    const { deviceProfileId, dataType } = params;
+    const res = await isOtherHttp(`api/yt/device/attributes/${deviceProfileId}`, props.token, {
+      dataType,
+    });
     if (Object.keys(res).length === 0) return (attributeOptions.value.length = 0);
     attributeOptions.value = res?.map((item) => ({ label: item.name, value: item.identifier }));
   };

 <template>
   <div v-if="showTestFlag" class="mt-8">
     <div>
-      <Button @click="handleExcute" type="primary"> 执行测试请求 </Button>
+      <a-row>
+        <Button @click="handleExcute" type="primary"> 执行测试请求 </Button>
+      </a-row>
+      <a-row class="mt-8" type="flex" justify="center" align="middle">
+        <a-col :span="2"> 测试地址 </a-col>
+        <a-col :span="22">
+          <Tag color="blue" style="width: 31.6vw; white-space: normal; height: auto">
+            {{ apiUrl?.split('{?')[0] }}
+          </Tag>
+        </a-col>
+      </a-row>
     </div>
     <div class="mt-8">
       <a-row type="flex" justify="center">
         <a-col :span="24">
-          <a-textarea
-            disabled
+          <JsonEditor
             v-if="isWebSocketType === '2'"
-            allow-clear
-            show-count
-            v-model:value="testResult"
-            placeholder="测试结果为："
-            :rows="8"
-          />
-          <a-textarea
-            disabled
-            v-else
-            allow-clear
-            show-count
-            v-model:value="httpResult"
-            placeholder="测试结果为："
-            :rows="8"
+            style="width: 35vw; height: 40vh"
+            ref="jsonWebsocketEditorRef"
           />
+          <JsonEditor v-else style="width: 35vw; height: 40vh" ref="jsonEditorRef" />
         </a-col>
       </a-row>
     </div>
@@ -34,9 +32,9 @@
   import { Button } from 'ant-design-vue';
   import { otherHttp } from '/@/utils/http/axios';
   import { useWebSocket } from '@vueuse/core';
-  import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
-  import { getAuthCache } from '/@/utils/auth';
   import { useUtils } from '../../../hooks/useUtils';
+  import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
+  import { Tag } from 'ant-design-vue';
 
   const emits = defineEmits(['emitExcute']);
 
@@ -48,7 +46,9 @@
 
   const showTestFlag = ref(false);
 
-  const token = getAuthCache(JWT_TOKEN_KEY);
+  const jsonEditorRef = ref<InstanceType<typeof JsonEditor>>();
+
+  const jsonWebsocketEditorRef = ref<InstanceType<typeof JsonEditor>>();
 
   const socketUrls = ref('');
 
@@ -79,11 +79,13 @@
     return formatString(this, replacements);
   };
 
-  const testResult = ref('');
+  const isWebSocketType = ref('');
+
+  const isToken = ref('');
 
-  const httpResult = ref('');
+  const apiUrl = ref('');
 
-  const isWebSocketType = ref('');
+  const isPostToken = ref('');
 
   //执行测试接口
   const handleExcute = () => {
@@ -100,11 +102,13 @@
     const url = Objects?.apiGetUrl;
     const headers = Objects?.Header?.params;
     const params = Objects?.Params?.params;
+    isToken.value = Objects?.Params?.token;
     const body = Objects?.Body?.params;
-    const apiUrl = url?.restfulFormat(params);
+    isPostToken.value = Objects?.Body?.token;
+    apiUrl.value = url?.restfulFormat(params);
     if (isWebSocketType.value === '2') {
       socketUrls.value = url;
-      socketMessage.server = `${socketUrls.value}?token=${token}`;
+      socketMessage.server = `${socketUrls.value}?token=${isToken.value}`;
       const list = Object.values(params);
       const isEmpty = list.some((it) => it === '' || null || undefined);
       if (!isEmpty) {
@@ -113,20 +117,46 @@
         resetValue(false);
       }
     } else {
-      const resp = await otherHttpRequest(apiType, apiUrl?.split('{?')[0], headers, params, body);
-      if (!resp) return;
-      httpResult.value = JSON.stringify(resp);
+      try {
+        const resp = await otherHttpRequest(
+          apiType,
+          apiUrl.value?.split('{?')[0],
+          headers,
+          params,
+          body,
+          isToken.value,
+          isPostToken.value
+        );
+        if (!resp) return;
+        if (Object.prototype.toString.call(resp) === '[object Object]') {
+          jsonEditorRef.value?.setJsonValue(resp);
+        } else if (typeof resp === 'string') {
+          jsonEditorRef.value?.setJsonValue(resp);
+        } else if (Array.isArray(resp)) {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+        } else {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+        }
+      } catch (e) {
+        if (Object.prototype.toString.call(e) === '[object Object]') {
+          jsonEditorRef.value?.setJsonValue(e);
+        } else {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(e));
+        }
+      }
     }
   };
 
   //websocket请求
   const websocketRequest = (params, destroy = false) => {
     //websocket请求
-    Reflect.deleteProperty(params, 'deviceProfileId');
-    Reflect.deleteProperty(params, 'organizationId');
-    Reflect.set(params, 'cmdId', 1);
-    Reflect.set(params, 'scope', 'LATEST_TELEMETRY');
-    Reflect.set(params, 'entityType', 'DEVICE');
+    if (Object.prototype.toString.call(params) === '[object Object]') {
+      Reflect.deleteProperty(params, 'deviceProfileId');
+      Reflect.deleteProperty(params, 'organizationId');
+      Reflect.set(params, 'cmdId', 1);
+      Reflect.set(params, 'scope', 'LATEST_TELEMETRY');
+      Reflect.set(params, 'entityType', 'DEVICE');
+    }
     socketMessage.sendValue.tsSubCmds.push(params);
     const { send, close } = useWebSocket(socketMessage.server, {
       onConnected() {
@@ -135,7 +165,15 @@
       },
       onMessage(_, e) {
         const { data } = JSON.parse(e.data);
-        testResult.value = JSON.stringify(data);
+        if (Object.prototype.toString.call(data) === '[object Object]') {
+          jsonWebsocketEditorRef.value?.setJsonValue(data);
+        } else if (typeof data === 'string') {
+          jsonWebsocketEditorRef.value?.setJsonValue(data);
+        } else if (Array.isArray(data)) {
+          jsonWebsocketEditorRef.value?.setJsonValue(JSON.stringify(data));
+        } else {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(data));
+        }
       },
       onDisconnected() {
         console.log('断开连接了');
@@ -159,32 +197,49 @@
     headers = {},
     params = {},
     body,
+    token,
+    postToken,
     joinPrefix = false
   ) => {
+    const { convertObj } = useUtils();
     switch (apiType) {
       case 'GET':
+        const objGet = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!token ? postToken : token}`,
+        });
         return await otherHttp.get(
-          { url: apiUrl, params, headers },
+          { url: apiUrl, params, headers: objGet },
           {
             apiUrl: '',
             joinPrefix,
+            withToken: false,
+            errorMessageMode: 'none',
           }
         );
       case 'POST':
-        const { convertObj } = useUtils();
+        const objPost = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+        });
         return await otherHttp.post(
-          { url: `${apiUrl}?${convertObj(params)}`, data: body, headers },
+          { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPost },
           {
             apiUrl: '',
             joinPrefix,
+            withToken: false,
+            errorMessageMode: 'none',
           }
         );
       case 'PUT':
+        const objPut = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+        });
         return await otherHttp.put(
-          { url: apiUrl, data: body, headers, params },
+          { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPut, params },
           {
             apiUrl: '',
             joinPrefix,
+            withToken: false,
+            errorMessageMode: 'none',
           }
         );
     }
@@ -194,8 +249,10 @@
     if (flag) {
       showTestFlag.value = false;
     }
-    httpResult.value = '测试结果为：';
-    testResult.value = '测试结果为：';
+    nextTick(() => {
+      jsonEditorRef.value?.setJsonValue('执行测试结果为：');
+      jsonWebsocketEditorRef.value?.setJsonValue('执行测试结果为：');
+    });
     isWebSocketType.value = '0';
   };
 

@@ -2,8 +2,42 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
-        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
+        <div class="flex" v-if="isAdmin(role)">
+          <Select
+            allowClear
+            v-model:value="selectTenant"
+            @change="onSelect"
+            style="width: 150px"
+            :getPopupContainer="
+              (triggerNode) => {
+                return triggerNode.parentNode;
+              }
+            "
+            placeholder="请选择租户"
+            :options="selectOptions"
+          />
+          <Select
+            v-model:value="selectSysTenant"
+            allowClear
+            @change="onSelctTenant"
+            style="width: 150px; margin-left: 10px"
+            v-if="selectTenantOptions.length > 0"
+            :getPopupContainer="
+              (triggerNode) => {
+                return triggerNode.parentNode;
+              }
+            "
+            placeholder="请选择租户"
+            :options="selectTenantOptions"
+          />
+        </div>
+        <Button
+          :disabled="testDisabled"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
+          >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
+        </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
@@ -18,33 +52,102 @@
   </div>
 </template>
 <script lang="ts" setup name="testRequest">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, onMounted } from 'vue';
   import { Button } from 'ant-design-vue';
   import TestHeaderEditCellTable from './testEditHeaderCellTable.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { selectType } from '../../../types';
+  import { Select } from 'ant-design-vue';
+  import { getUserToken } from '/@/api/sys/user';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getTenantAllPageLists, getTenantPageList } from '/@/api/tenant/tenantApi';
+  import { getAuthCache } from '/@/utils/auth';
+  import { isAdmin } from '/@/enums/roleEnum';
 
   const emits = defineEmits(['testHeaderInterface', 'closeTest']);
 
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+
+  const role: string = userInfo?.roles[0];
+
   const props = defineProps({
     data: {
       type: Object,
     },
   });
 
+  onMounted(async () => {
+    if (isAdmin(role)) {
+      const res = await getTenantPageList();
+      selectOptions.value = res.map((m) => ({ label: m.name, value: m.tenantId }));
+    } else {
+      //租户
+      const { token } = await getUserToken(userInfo?.userId);
+      getToken.value = token;
+    }
+  });
+
+  const selectOptions = ref<selectType[]>([]);
+
+  const selectTenantOptions = ref<selectType[]>([]);
+
+  const testDisabled = ref(true);
+
   const { createMessage } = useMessage();
 
   const showTestEditCell = ref(false);
 
   const excuteData = ref({});
 
+  const selectTenant = ref(undefined);
+
+  const selectSysTenant = ref(undefined);
+
   const testEditCellTableRef = ref<InstanceType<typeof TestHeaderEditCellTable>>();
 
   const testResult = ref('');
 
-  const handleTest = () => {
-    showTestEditCell.value = true;
-    emits('testHeaderInterface');
-    getValue();
+  const getToken = ref('');
+
+  const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    selectSysTenant.value = undefined;
+    const rest = (await getTenantAllPageLists(e)) as any;
+    selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
+  };
+
+  const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    const { token } = await getUserToken(e);
+    getToken.value = token;
+  };
+
+  const isSingleClickText = ref('open');
+
+  const handleTest = (o) => {
+    if (isAdmin(role)) {
+      if (!selectTenant.value || !selectSysTenant.value) {
+        createMessage.error('请选择租户或者租户管理员');
+        throw Error('请选择租户或者租户管理员');
+      }
+    }
+    if (o === 'open') {
+      showTestEditCell.value = true;
+      emits('testHeaderInterface');
+      getValue();
+      isSingleClickText.value = 'close';
+    } else {
+      isSingleClickText.value = 'open';
+      onCloseTest();
+    }
   };
 
   const getValue = async () => {
@@ -72,6 +175,7 @@
     getTable?.map((it: any) => (params[it.key!] = it.value!));
     excuteData.value = {
       params,
+      token: getToken.value,
     };
     return excuteData.value;
   };
@@ -80,6 +184,9 @@
   const setValue = () => {
     showTestEditCell.value = false;
     testResult.value = '';
+    selectTenant.value = undefined;
+    selectSysTenant.value = undefined;
+    selectTenantOptions.value = [];
   };
 
   const onCloseTest = () => {

@@ -2,14 +2,38 @@
   <div>
     <div class="mt-8">
       <div class="flex">
-        <Button @click="handleTest" type="primary"> 打开测试接口 </Button>
-        <Button class="ml-2" @click="onCloseTest" type="primary"> 关闭测试接口 </Button>
+        <div class="flex" v-if="isAdmin(role)">
+          <Select
+            allowClear
+            v-model:value="selectTenant"
+            @change="onSelect"
+            style="width: 150px"
+            placeholder="请选择租户"
+            :options="selectOptions"
+          />
+          <Select
+            v-model:value="selectSysTenant"
+            allowClear
+            @change="onSelctTenant"
+            style="width: 150px; margin-left: 10px"
+            v-if="selectTenantOptions.length > 0"
+            placeholder="请选择租户"
+            :options="selectTenantOptions"
+          />
+        </div>
+        <Button
+          :disabled="isAdmin(role) ? testDisabled : false"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
+          >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
+        </Button>
       </div>
       <div v-if="showTestEditCell" class="mt-8">
         <a-row type="flex" justify="center">
           <a-col :span="3"> 参数设置 </a-col>
           <a-col :span="21">
-            <TestParamsCellTable ref="testEditCellTableRef" />
+            <TestParamsCellTable :token="getToken" ref="testEditCellTableRef" />
           </a-col>
         </a-row>
       </div>
@@ -18,12 +42,23 @@
   </div>
 </template>
 <script lang="ts" setup name="testRequest">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, onMounted } from 'vue';
   import { Button } from 'ant-design-vue';
   import TestParamsCellTable from './testEditParamsCellTable.vue';
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getTenantAllPageLists, getTenantPageList } from '/@/api/tenant/tenantApi';
+  import { selectType } from '../../../types';
+  import { Select } from 'ant-design-vue';
+  import { getUserToken } from '/@/api/sys/user';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { isAdmin } from '/@/enums/roleEnum';
+
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+
+  const role: string = userInfo?.roles[0];
 
   const emits = defineEmits(['testParamsInterface', 'closeTest']);
 
@@ -33,22 +68,73 @@
     },
   });
 
+  onMounted(async () => {
+    if (isAdmin(role)) {
+      const res = await getTenantPageList();
+      selectOptions.value = res.map((m) => ({ label: m.name, value: m.tenantId }));
+    } else {
+      //租户
+      const { token } = await getUserToken(userInfo?.userId);
+      getToken.value = token;
+    }
+  });
+
+  const selectOptions = ref<selectType[]>([]);
+
+  const testDisabled = ref(true);
+
+  const selectTenantOptions = ref<selectType[]>([]);
+
   const { createMessage } = useMessage();
 
   const showTestEditCell = ref(false);
 
   const excuteData = ref({});
 
+  const selectTenant = ref(undefined);
+
+  const selectSysTenant = ref(undefined);
+
   const testEditCellTableRef = ref<InstanceType<typeof TestParamsCellTable>>();
 
   const testResult = ref('');
 
   const { getMultipleKeys } = useUtils();
 
-  const handleTest = () => {
-    showTestEditCell.value = true;
-    emits('testParamsInterface');
-    getValue();
+  const getToken = ref('');
+
+  const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    selectSysTenant.value = undefined;
+    const rest = (await getTenantAllPageLists(e)) as any;
+    selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
+  };
+
+  const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
+    const { token } = await getUserToken(e);
+    getToken.value = token;
+  };
+  const isSingleClickText = ref('open');
+
+  const handleTest = (o) => {
+    if (o === 'open') {
+      showTestEditCell.value = true;
+      emits('testParamsInterface');
+      getValue();
+      isSingleClickText.value = 'close';
+    } else {
+      isSingleClickText.value = 'open';
+      onCloseTest();
+    }
   };
 
   const getValue = async () => {
@@ -116,6 +202,7 @@
     }
     excuteData.value = {
       params,
+      token: getToken.value,
     };
     return excuteData.value;
   };
@@ -124,6 +211,9 @@
   const setValue = () => {
     showTestEditCell.value = false;
     testResult.value = '';
+    selectTenant.value = undefined;
+    selectSysTenant.value = undefined;
+    selectTenantOptions.value = [];
   };
 
   const onCloseTest = () => {

@@ -130,9 +130,8 @@
   import { reactive, ref, onMounted } from 'vue';
   import { Select } from 'ant-design-vue';
   import { findDictItemByCode } from '/@/api/system/dict';
-  import { getAllDeviceByOrg } from '/@/api/dataBoard';
-  import { getDeviceAttributes } from '/@/api/dataBoard';
   import { useApi } from '../../../hooks/useApi';
+  import { useUtils } from '../../../hooks/useUtils';
   import { cloneDeep } from 'lodash-es';
   import { tableItems, selectType } from '../../../types';
   import { editTestCellTableTHeadConfig } from '../../../config';
@@ -142,6 +141,9 @@
     method: {
       type: String,
     },
+    token: {
+      type: String,
+    },
   });
 
   onMounted(async () => {
@@ -155,6 +157,8 @@
       selectOptions.value = selectOptions.value.filter((f) => f.value !== 'scope');
   });
 
+  const { isOtherHttp } = useUtils();
+
   const selectOptions = ref<selectType[]>([]);
 
   const valueOptions = ref<selectType[]>([]);
@@ -191,10 +195,10 @@
   const getApi = (list) => {
     list?.forEach(async (it) => {
       if (it.key === 'deviceProfileId') {
-        const { options } = await useApi(it.key);
+        const { options } = await useApi(it.key, props.token);
         valueOptions.value = options;
       } else if (it.key === 'organizationId') {
-        const { options } = await useApi(it.key);
+        const { options } = await useApi(it.key, props.token);
         treeData.value = options as any;
       }
     });
@@ -212,7 +216,10 @@
   };
 
   const getEntityOptions = async (organizationId: string, deviceProfileId?: string) => {
-    const res = await getAllDeviceByOrg(organizationId, deviceProfileId);
+    const res = await isOtherHttp('api/yt/device/list', props.token, {
+      organizationId,
+      deviceProfileId,
+    });
     entityOptions.value = res.map((item) => ({
       label: item.name,
       value: item.tbDeviceId,
@@ -220,7 +227,10 @@
   };
 
   const getAttributeOptions = async (params) => {
-    const res = await getDeviceAttributes(params);
+    const { deviceProfileId, dataType } = params;
+    const res = await isOtherHttp(`api/yt/device/attributes/${deviceProfileId}`, props.token, {
+      dataType,
+    });
     if (Object.keys(res).length === 0) return (attributeOptions.value.length = 0);
     attributeOptions.value = res?.map((item) => ({ label: item.name, value: item.identifier }));
   };

@@ -102,6 +102,7 @@ export const schemas: FormSchema[] = [
         getPopupContainer: () => document.body,
         async onChange(e) {
           setFieldsValue({
+            requestOriginUrl: '',
             requestHttpTypeAndUrl: {
               requestHttpType: undefined,
               requestUrl: '',
@@ -113,6 +114,14 @@ export const schemas: FormSchema[] = [
               type: e,
             },
           });
+          updateSchema({
+            field: 'requestOriginUrl',
+            componentProps: {
+              placeholder: `${
+                e === '0' ? '示例：http://127.0.0.1' : e === '2' ? '示例：ws://127.0.0.1' : ''
+              }`,
+            },
+          });
         },
       };
     },
@@ -124,14 +133,24 @@ export const schemas: FormSchema[] = [
     required: true,
     colProps: { span: 24 },
     defaultValue: 'server_url',
-    componentProps: {
-      placeholder: '请选择地址类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'dataview_select_origin_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择地址类型',
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'dataview_select_origin_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        onChange: (e) => {
+          if (e) {
+            setFieldsValue({
+              requestOriginUrl: '',
+            });
+          }
+        },
+      };
     },
   },
   {
@@ -140,9 +159,14 @@ export const schemas: FormSchema[] = [
     colProps: { span: 24 },
     required: true,
     component: 'Input',
-    componentProps: {
-      maxLength: 255,
-      placeholder: '请输入地址',
+    componentProps: ({ formActionType }) => {
+      const { getFieldsValue } = formActionType;
+      const type = getFieldsValue()?.requestContentType;
+      return {
+        placeholder: `${
+          type === '0' ? '示例：http://127.0.0.1' : type === '2' ? '示例：ws://127.0.0.1' : ''
+        }`,
+      };
     },
     ifShow: ({ values }) => values['originUrlType'] === 'custom_url',
   },
@@ -160,6 +184,13 @@ export const schemas: FormSchema[] = [
     },
   },
   {
+    field: 'fillAddress',
+    label: '完整地址',
+    component: 'Input',
+    slot: 'slotFillAddress',
+    colProps: { span: 24 },
+  },
+  {
     field: 'requestSQLKey',
     label: '键名',
     colProps: { span: 6 },

 <template>
   <div>
     <BasicDrawer
+      destroyOnClose
       showFooter
       v-bind="$attrs"
       @register="registerDrawer"
@@ -9,6 +10,9 @@
     >
       <BasicForm @register="registerForm">
         <template #selectMethods="{ model }">
+          <p style="display: none">{{
+            watchRequestHttpTypeAndUrl(model['requestHttpTypeAndUrl'])
+          }}</p>
           <SimpleRequest
             ref="simpleRequestRef"
             v-if="model['requestContentType'] === '0' || model['requestContentType'] === '2'"
@@ -27,12 +31,30 @@
             />
           </div>
         </template>
+        <template #slotFillAddress="{ model }">
+          <div>
+            <Tag color="blue" style="width: 35vw; white-space: normal; height: auto">
+              {{
+                ` ${
+                  model['originUrlType'] !== 'server_url'
+                    ? !model['requestOriginUrl']
+                      ? ''
+                      : model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl
+                    : `${templateFillAddress(model['requestContentType'], model['originUrlType'])}${
+                        model['requestHttpTypeAndUrl']?.requestUrl
+                      }`
+                } 
+                `
+              }}
+            </Tag>
+          </div>
+        </template>
       </BasicForm>
     </BasicDrawer>
   </div>
 </template>
 <script lang="ts" setup name="publicApi">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, watch } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicForm, useForm } from '/@/components/Form';
   import { schemas } from './config';
@@ -45,8 +67,9 @@
 
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUtils } from './hooks/useUtils';
+  import { Tag } from 'ant-design-vue';
 
-  const { resetReqHttpType } = useUtils();
+  const { resetReqHttpType, isServerUrl } = useUtils();
 
   const emits = defineEmits(['success', 'register']);
 
@@ -60,6 +83,35 @@
 
   const testSqlRef = ref<InstanceType<typeof TestSql>>();
 
+  const templateFillAddress = (method, type) => {
+    return isServerUrl(method, type);
+  };
+
+  const watchRequestHttpTypeAndUrlStr = ref('');
+
+  const watchRequestHttpTypeAndUrl = (o) => {
+    watchRequestHttpTypeAndUrlStr.value = o;
+  };
+
+  watch(
+    () => watchRequestHttpTypeAndUrlStr.value,
+    (newValue: any) => {
+      if (!newValue?.requestUrl) return;
+      if (newValue?.requestUrl.includes('{entityType}')) {
+        simpleRequestRef.value?.setValue(null, true, [
+          {
+            key: 'scope',
+            value: 'entityType',
+            required: true,
+          },
+        ]);
+      }
+    },
+    {
+      deep: true,
+    }
+  );
+
   const [registerForm, { resetFields, validate, setFieldsValue, updateSchema }] = useForm({
     labelWidth: 120,
     schemas,
@@ -94,7 +146,7 @@
           requestUrl: data.record?.requestUrl,
         },
       });
-      await nextTick(() => simpleRequestRef.value?.setValue(data.record));
+      await nextTick(() => simpleRequestRef.value?.setValue(data.record, false, []));
       updateSchema({
         field: 'requestHttpTypeAndUrl',
         componentProps: {
@@ -110,12 +162,19 @@
       const values = await validate();
       if (!values) return;
       const isRequestHttpTypeAndUrlEmpty = values?.requestHttpTypeAndUrl;
-      if (
-        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestHttpType') ||
-        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')
-      ) {
-        createMessage.error('请填写请求类型&地址');
-        throw Error('请填写请求类型&地址');
+      if (values.requestContentType === '0') {
+        if (
+          !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestHttpType') ||
+          !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')
+        ) {
+          createMessage.error('请填写请求类型&地址');
+          throw Error('请填写请求类型&地址');
+        }
+      } else if (values.requestContentType === '2') {
+        if (!Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')) {
+          createMessage.error('请填写请求类型&地址');
+          throw Error('请填写请求类型&地址');
+        }
       }
       const Objects = simpleRequestRef.value?.getValue(true);
       const requestOriginUrl =

 import { ref } from 'vue';
-import { deviceProfile } from '/@/api/device/deviceManager';
-import { getOrganizationList } from '/@/api/system/system';
-// import { copyTransFun } from '/@/utils/fnUtils';
-// import { getAllDeviceByOrg } from '/@/api/dataBoard';
-// import { getDeviceAttributes } from '/@/api/dataBoard';
 import { copyTransFun } from '/@/utils/fnUtils';
+import { useUtils } from './useUtils';
 
-export const useApi = async (key) => {
+export const useApi = async (key, token) => {
+  const { isOtherHttp } = useUtils();
   const options = ref<{ label: string; value: string; disabled?: boolean }[]>([]);
   switch (key) {
     case 'deviceProfileId':
-      const res = await deviceProfile();
+      const res = (await isOtherHttp('/api/yt/device_profile/me/list', token, {})) as any;
       options.value = res?.map((m) => ({ label: m.name, value: m.id }));
       break;
     case 'organizationId':
-      const data = await getOrganizationList();
+      const data = await isOtherHttp('/api/yt/organization/me/list', token, {});
       copyTransFun(data as never as any);
       options.value = data as any;
   }

+import { otherHttp } from '/@/utils/http/axios';
+
 export const useUtils = () => {
   //获取多个key
   const getMultipleKeys = (list) => {
@@ -51,5 +53,44 @@ export const useUtils = () => {
     }
     return _result.join('&');
   };
-  return { getMultipleKeys, pushObj, resetReqHttpType, resetUpdateSchema, convertObj };
+  //判断服务器地址是否为http/https ws/wss
+  const isServerUrl = (method, type) => {
+    const pathUrl = window.location.host;
+    const protocol = window.location.protocol;
+    let url = '';
+    if (method === '2') {
+      if (type === 'server_url') {
+        url = `${protocol === 'http' ? 'ws:' : protocol === 'https' ? 'wss:' : 'ws:'}//${pathUrl}`;
+      }
+    } else if (method === '0') {
+      if (type === 'server_url') {
+        url = `${protocol}//${pathUrl}`;
+      }
+    }
+    return url;
+  };
+  //TODO:待优化自定义请求
+  const isOtherHttp = async (url, token, params) => {
+    return await otherHttp.get(
+      {
+        url,
+        headers: { 'X-Authorization': `Bearer ${token}` },
+        params,
+      },
+      {
+        apiUrl: '',
+        withToken: false,
+        joinPrefix: false,
+      }
+    );
+  };
+  return {
+    getMultipleKeys,
+    pushObj,
+    resetReqHttpType,
+    resetUpdateSchema,
+    isServerUrl,
+    convertObj,
+    isOtherHttp,
+  };
 };

@@ -152,7 +152,7 @@
       else setStatusIsTrue();
     },
     getCheckboxProps: (record) => ({
-      disabled: record.state === 1,
+      disabled: record.creator !== userId.value || record.state === 1,
     }),
   };
 
@@ -174,21 +174,30 @@
   };
 
   const handlePublish = async (type, record) => {
-    type === 'publish' ? await getPublish(record.id) : await getCancelPublish(record.id);
-    createMessage.success(`${type === 'publish' ? '发布' : '取消发布'}成功`);
-    handleSuccess();
+    try {
+      type === 'publish' ? await getPublish(record.id) : await getCancelPublish(record.id);
+      createMessage.success(`${type === 'publish' ? '发布' : '取消发布'}成功`);
+    } finally {
+      handleSuccess();
+    }
   };
 
   const handleBatchPublish = async (type) => {
-    await putPublishOrCancelPublish(type, batchDeleteIds.value);
-    createMessage.success(`${type === 'batchPublish' ? '批量发布' : '批量取消发布'}成功`);
-    handleSuccess();
+    try {
+      await putPublishOrCancelPublish(type, batchDeleteIds.value);
+      createMessage.success(`${type === 'batchPublish' ? '批量发布' : '批量取消发布'}成功`);
+    } finally {
+      handleSuccess();
+    }
   };
 
   const handleDeleteOrBatchDelete = async (record) => {
-    const ids = record === null ? batchDeleteIds.value : [record.id];
-    await deleteBigViewInterface(ids);
-    createMessage.success(`${record === null ? '批量删除' : '删除'}成功`);
-    handleSuccess();
+    try {
+      const ids = record === null ? batchDeleteIds.value : [record.id];
+      await deleteBigViewInterface(ids);
+      createMessage.success(`${record === null ? '批量删除' : '删除'}成功`);
+    } finally {
+      handleSuccess();
+    }
   };
 </script>

 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
-import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 
 export enum TypeEnum {
@@ -114,20 +113,6 @@ export const step1Schemas: FormSchema[] = [
     },
   },
   {
-    field: 'code',
-    label: '地址码',
-    component: 'Input',
-    ifShow: ({ model }) => {
-      return (
-        model['transportType'] === TransportTypeEnum.TCP &&
-        model['deviceType'] === DeviceTypeEnum.SENSOR
-      );
-    },
-    dynamicRules: ({ model }) => {
-      return [{ required: model['transportType'] === 'TCP', message: '地址码为必填项' }];
-    },
-  },
-  {
     field: 'brand',
     component: 'ApiRadioGroup',
     label: '选择厂家',