chore: 恢复合并到main_dev丢失的代码（公共接口管理）

@@ -18,6 +18,7 @@
               placeholder="请选择"
               placeholder="请选择"
               :options="selectOptions"
               :options="selectOptions"
               @change="handleChange"
               @change="handleChange"
+              @dropdownVisibleChange="hanldeDropdownVisibleChange"
               allowClear
               allowClear
             />
             />
           </td>
           </td>
@@ -121,6 +122,8 @@
     }
     }
   };
   };
 
 
+  const hanldeDropdownVisibleChange = () => handleChange();
+
   //Select互斥
   //Select互斥
   const handleChange = () => {
   const handleChange = () => {
     selectOptions.value.forEach((ele) => {
     selectOptions.value.forEach((ele) => {

@@ -18,6 +18,7 @@
               placeholder="请选择"
               placeholder="请选择"
               :options="selectOptions"
               :options="selectOptions"
               @change="handleChange"
               @change="handleChange"
+              @dropdownVisibleChange="hanldeDropdownVisibleChange"
               allowClear
               allowClear
             />
             />
           </td>
           </td>
@@ -139,6 +140,8 @@
     });
     });
   };
   };
 
 
+  const hanldeDropdownVisibleChange = () => handleChange();
+
   //获取数据
   //获取数据
   const getValue = () => {
   const getValue = () => {
     const assemblyData = tableArray.content.map((it) => {
     const assemblyData = tableArray.content.map((it) => {

@@ -31,6 +31,7 @@
   import moment from 'moment';
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
   import { useUtils } from '../../../hooks/useUtils';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const emits = defineEmits(['testBodyInterface']);
   const emits = defineEmits(['testBodyInterface']);
 
 
@@ -40,6 +41,8 @@
     },
     },
   });
   });
 
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
   const showTestEditCell = ref(false);
 
 
   const excuteData = ref({});
   const excuteData = ref({});
@@ -111,6 +114,7 @@
         return {
         return {
           key,
           key,
           value,
           value,
+          required: it.required,
         };
         };
       });
       });
   };
   };
@@ -120,6 +124,11 @@
     let params: any = {};
     let params: any = {};
     if (props.data?.type === 'x-www-form-urlencoded' || props.data?.type === 'form-data') {
     if (props.data?.type === 'x-www-form-urlencoded' || props.data?.type === 'form-data') {
       const getTable = getTestTableKeyValue();
       const getTable = getTestTableKeyValue();
+      const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+      if (hasRequired) {
+        createMessage.error('参数不能为空');
+        throw new Error('参数不能为空');
+      }
       getTable?.map((it) => (params[it.key!] = it.value!));
       getTable?.map((it) => (params[it.key!] = it.value!));
     } else if (props.data?.type === 'json') {
     } else if (props.data?.type === 'json') {
       params = jsonEditorRef.value?.getJsonValue();
       params = jsonEditorRef.value?.getJsonValue();

@@ -243,7 +243,9 @@
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'entityId') f.value = null;
         if (f.key === 'entityId') f.value = null;
       });
       });
-      getAttributeOptions({ deviceProfileId: e.value });
+      if (e.value) {
+        getAttributeOptions({ deviceProfileId: e.value });
+      }
       if (organizationId !== '') {
       if (organizationId !== '') {
         getEntityOptions(organizationId, e.value);
         getEntityOptions(organizationId, e.value);
       }
       }

@@ -8,7 +8,7 @@
         <a-col :span="2"> 测试结果 </a-col>
         <a-col :span="2"> 测试结果 </a-col>
         <a-col :span="22">
         <a-col :span="22">
           <a-textarea
           <a-textarea
-            v-if="ifWebSocket === '2'"
+            v-if="isWebSocketType === '2'"
             allow-clear
             allow-clear
             show-count
             show-count
             v-model:value="testResult"
             v-model:value="testResult"
@@ -29,14 +29,13 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup name="testRequest">
 <script lang="ts" setup name="testRequest">
-  import { nextTick, ref, reactive } from 'vue';
+  import { nextTick, ref, reactive, onUnmounted } from 'vue';
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
   import { otherHttp } from '/@/utils/http/axios';
   import { otherHttp } from '/@/utils/http/axios';
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  // import { useGlobSetting } from '/@/hooks/setting';
+  import { useUtils } from '../../../hooks/useUtils';
 
 
   const emits = defineEmits(['emitExcute']);
   const emits = defineEmits(['emitExcute']);
 
 
@@ -48,16 +47,10 @@
 
 
   const showTestFlag = ref(false);
   const showTestFlag = ref(false);
 
 
-  const ifWebSocket = ref('');
-
-  const { createMessage } = useMessage();
-
   const token = getAuthCache(JWT_TOKEN_KEY);
   const token = getAuthCache(JWT_TOKEN_KEY);
 
 
   const socketUrls = ref('');
   const socketUrls = ref('');
 
 
-  // const { socketUrl } = useGlobSetting();
-
   const socketMessage: any = reactive({
   const socketMessage: any = reactive({
     server: ``,
     server: ``,
     sendValue: {
     sendValue: {
@@ -89,6 +82,8 @@
 
 
   const httpResult = ref('');
   const httpResult = ref('');
 
 
+  const isWebSocketType = ref('');
+
   //执行测试接口
   //执行测试接口
   const handleExcute = () => {
   const handleExcute = () => {
     emits('emitExcute');
     emits('emitExcute');
@@ -99,18 +94,23 @@
     await nextTick();
     await nextTick();
     //获取Params和Header和Body
     //获取Params和Header和Body
     const Objects = props.data;
     const Objects = props.data;
-    const isWebSocketType = Objects?.method;
+    isWebSocketType.value = Objects?.method;
     const apiType = Objects?.apiType;
     const apiType = Objects?.apiType;
     const url = Objects?.apiGetUrl;
     const url = Objects?.apiGetUrl;
     const headers = Objects?.Header?.params;
     const headers = Objects?.Header?.params;
     const params = Objects?.Params?.params;
     const params = Objects?.Params?.params;
     const body = Objects?.Body?.params;
     const body = Objects?.Body?.params;
     const apiUrl = url?.restfulFormat(params);
     const apiUrl = url?.restfulFormat(params);
-    ifWebSocket.value = isWebSocketType;
-    if (isWebSocketType === '2') {
+    if (isWebSocketType.value === '2') {
       socketUrls.value = url;
       socketUrls.value = url;
       socketMessage.server = `${socketUrls.value}?token=${token}`;
       socketMessage.server = `${socketUrls.value}?token=${token}`;
-      websocketRequest(params);
+      const list = Object.values(params);
+      const isEmpty = list.some((it) => it === '' || null || undefined);
+      if (!isEmpty) {
+        websocketRequest(params);
+      } else {
+        resetValue(false);
+      }
     } else {
     } else {
       const resp = await otherHttpRequest(apiType, apiUrl?.split('{?')[0], headers, params, body);
       const resp = await otherHttpRequest(apiType, apiUrl?.split('{?')[0], headers, params, body);
       if (!resp) return;
       if (!resp) return;
@@ -119,7 +119,7 @@
   };
   };
 
 
   //websocket请求
   //websocket请求
-  const websocketRequest = (params) => {
+  const websocketRequest = (params, destroy = false) => {
     //websocket请求
     //websocket请求
     Reflect.deleteProperty(params, 'deviceProfileId');
     Reflect.deleteProperty(params, 'deviceProfileId');
     Reflect.deleteProperty(params, 'organizationId');
     Reflect.deleteProperty(params, 'organizationId');
@@ -140,12 +140,17 @@
         console.log('断开连接了');
         console.log('断开连接了');
         close();
         close();
       },
       },
-      onError() {
-        createMessage.error('webSocket连接超时,请联系管理员');
-      },
+      onError() {},
     });
     });
+    if (destroy) close();
   };
   };
 
 
+  onUnmounted(() => {
+    if (isWebSocketType.value === '2') {
+      websocketRequest(null, true);
+    }
+  });
+
   //TODO: 待优化 项目自带第三方请求
   //TODO: 待优化 项目自带第三方请求
   const otherHttpRequest = async (
   const otherHttpRequest = async (
     apiType,
     apiType,
@@ -165,8 +170,9 @@
           }
           }
         );
         );
       case 'POST':
       case 'POST':
+        const { convertObj } = useUtils();
         return await otherHttp.post(
         return await otherHttp.post(
-          { url: apiUrl, data: body, headers, params },
+          { url: `${apiUrl}?${convertObj(params)}`, data: body, headers },
           {
           {
             apiUrl: '',
             apiUrl: '',
             joinPrefix,
             joinPrefix,
@@ -189,7 +195,7 @@
     }
     }
     httpResult.value = '测试结果为：';
     httpResult.value = '测试结果为：';
     testResult.value = '测试结果为：';
     testResult.value = '测试结果为：';
-    ifWebSocket.value = '0';
+    isWebSocketType.value = '0';
   };
   };
 
 
   const showTest = () => (showTestFlag.value = true);
   const showTest = () => (showTestFlag.value = true);

@@ -20,6 +20,7 @@
   import { ref, nextTick } from 'vue';
   import { ref, nextTick } from 'vue';
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
   import TestHeaderEditCellTable from './testEditHeaderCellTable.vue';
   import TestHeaderEditCellTable from './testEditHeaderCellTable.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const emits = defineEmits(['testHeaderInterface']);
   const emits = defineEmits(['testHeaderInterface']);
 
 
@@ -29,6 +30,8 @@
     },
     },
   });
   });
 
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
   const showTestEditCell = ref(false);
 
 
   const excuteData = ref({});
   const excuteData = ref({});
@@ -59,6 +62,11 @@
   //获取数据
   //获取数据
   const getTestValue = () => {
   const getTestValue = () => {
     const getTable = getTestTableKeyValue();
     const getTable = getTestTableKeyValue();
+    const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+    if (hasRequired) {
+      createMessage.error('参数不能为空');
+      throw new Error('参数不能为空');
+    }
     const params: any = {};
     const params: any = {};
     getTable?.map((it: any) => (params[it.key!] = it.value!));
     getTable?.map((it: any) => (params[it.key!] = it.value!));
     excuteData.value = {
     excuteData.value = {

@@ -22,6 +22,7 @@
   import TestParamsCellTable from './testEditParamsCellTable.vue';
   import TestParamsCellTable from './testEditParamsCellTable.vue';
   import moment from 'moment';
   import moment from 'moment';
   import { useUtils } from '../../../hooks/useUtils';
   import { useUtils } from '../../../hooks/useUtils';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const emits = defineEmits(['testParamsInterface']);
   const emits = defineEmits(['testParamsInterface']);
 
 
@@ -31,6 +32,8 @@
     },
     },
   });
   });
 
 
+  const { createMessage } = useMessage();
+
   const showTestEditCell = ref(false);
   const showTestEditCell = ref(false);
 
 
   const excuteData = ref({});
   const excuteData = ref({});
@@ -92,6 +95,7 @@
         return {
         return {
           key,
           key,
           value,
           value,
+          required: it.required,
         };
         };
       });
       });
   };
   };
@@ -99,6 +103,11 @@
   //获取数据
   //获取数据
   const getTestValue = () => {
   const getTestValue = () => {
     const getTable = getTestTableKeyValue();
     const getTable = getTestTableKeyValue();
+    const hasRequired = getTable?.some((it) => it.required === true && !it.value);
+    if (hasRequired) {
+      createMessage.error('参数不能为空');
+      throw new Error('参数不能为空');
+    }
     const params: any = {};
     const params: any = {};
     getTable?.map((it) => (params[it.key!] = it.value!));
     getTable?.map((it) => (params[it.key!] = it.value!));
     if (params['keys']) {
     if (params['keys']) {

@@ -235,7 +235,9 @@
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'organizationId') organizationId = f.value;
         if (f.key === 'entityId') f.value = null;
         if (f.key === 'entityId') f.value = null;
       });
       });
-      getAttributeOptions({ deviceProfileId: e.value });
+      if (e.value) {
+        getAttributeOptions({ deviceProfileId: e.value });
+      }
       if (organizationId !== '') {
       if (organizationId !== '') {
         getEntityOptions(organizationId, e.value);
         getEntityOptions(organizationId, e.value);
       }
       }

@@ -46,7 +46,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUtils } from './hooks/useUtils';
   import { useUtils } from './hooks/useUtils';
 
 
-  const { resetReqHttpType, resetUpdateSchema } = useUtils();
+  const { resetReqHttpType } = useUtils();
 
 
   const emits = defineEmits(['success', 'register']);
   const emits = defineEmits(['success', 'register']);
 
 
@@ -69,10 +69,15 @@
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
   const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
     await resetFields();
     await resetFields();
     await nextTick();
     await nextTick();
-    updateSchema(resetUpdateSchema);
     setFieldsValue(resetReqHttpType);
     setFieldsValue(resetReqHttpType);
     const title = `${!data.isUpdate ? '新增' : '修改'}公共接口`;
     const title = `${!data.isUpdate ? '新增' : '修改'}公共接口`;
     setDrawerProps({ title });
     setDrawerProps({ title });
+    updateSchema({
+      field: 'requestHttpTypeAndUrl',
+      componentProps: {
+        type: '0',
+      },
+    });
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
     !isUpdate.value ? (putId.value = '') : (putId.value = data.record.id);
     !isUpdate.value ? (putId.value = '') : (putId.value = data.record.id);
     simpleRequestRef.value?.resetValue() && testSqlRef.value?.resetValue();
     simpleRequestRef.value?.resetValue() && testSqlRef.value?.resetValue();

@@ -36,5 +36,20 @@ export const useUtils = () => {
       type: '0',
       type: '0',
     },
     },
   };
   };
-  return { getMultipleKeys, pushObj, resetReqHttpType, resetUpdateSchema };
+  //对象转get params参数
+  const convertObj = (data: object) => {
+    const _result: any = [];
+    for (const key in data) {
+      const value = data[key];
+      if (value.constructor == Array) {
+        value.forEach(function (_value) {
+          _result.push(key + '=' + _value);
+        });
+      } else {
+        _result.push(key + '=' + value);
+      }
+    }
+    return _result.join('&');
+  };
+  return { getMultipleKeys, pushObj, resetReqHttpType, resetUpdateSchema, convertObj };
 };
 };

@@ -39,7 +39,7 @@
               icon: 'ant-design:node-expand-outlined',
               icon: 'ant-design:node-expand-outlined',
               onClick: handlePublish.bind(null, 'publish', record),
               onClick: handlePublish.bind(null, 'publish', record),
               ifShow: () => {
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
               },
             },
             },
             {
             {
@@ -47,7 +47,7 @@
               icon: 'ant-design:node-collapse-outlined',
               icon: 'ant-design:node-collapse-outlined',
               onClick: handlePublish.bind(null, 'canelPublish', record),
               onClick: handlePublish.bind(null, 'canelPublish', record),
               ifShow: () => {
               ifShow: () => {
-                return record.state === 1;
+                return record.state === 1 && record.creator === userId;
               },
               },
             },
             },
             {
             {
@@ -55,7 +55,7 @@
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               onClick: handleCreateOrEdit.bind(null, record),
               onClick: handleCreateOrEdit.bind(null, record),
               ifShow: () => {
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
               },
             },
             },
             {
             {
@@ -63,7 +63,7 @@
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
               ifShow: () => {
               ifShow: () => {
-                return record.state === 0;
+                return record.state === 0 && record.creator === userId;
               },
               },
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
@@ -93,6 +93,12 @@
   import { Popconfirm, Modal } from 'ant-design-vue';
   import { Popconfirm, Modal } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+
+  const userInfo = getAuthCache(USER_INFO_KEY) as any;
+
+  const userId = ref(userInfo?.userId);
 
 
   const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
   const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
     api: getDataViewInterfacePage,
     api: getDataViewInterfacePage,