fix: device list create device select tcp sensor device only select gateway device

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","http://192.168.10.103:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
+VITE_PROXY = [["/api","http://192.168.10.114:8080/api"],["/thingskit-drawio","http://192.168.10.136:8080/api"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -5,6 +5,7 @@ import {
   DeviceProfileModel,
   DeviceProfileModel,
   DeviceProfileQueryParam,
   DeviceProfileQueryParam,
   DeviceQueryParam,
   DeviceQueryParam,
+  DeviceRecord,
   DeviceTypeEnum,
   DeviceTypeEnum,
 } from '/@/api/device/model/deviceModel';
 } from '/@/api/device/model/deviceModel';
 import { ChildDeviceParams } from './model/deviceModel';
 import { ChildDeviceParams } from './model/deviceModel';
@@ -28,6 +29,8 @@ enum DeviceManagerApi {
   COMMAND_ISSUANCE = '/rpc',
   COMMAND_ISSUANCE = '/rpc',
 
 
   DEVICE_ATTR = '/device/attributes',
   DEVICE_ATTR = '/device/attributes',
+
+  GATEWAY_DEVICE = '/device/gateway/list',
 }
 }
 
 
 export const devicePage = (params: DeviceQueryParam) => {
 export const devicePage = (params: DeviceQueryParam) => {
@@ -201,6 +204,17 @@ export const getGATEWAYdevice = async (params: {
   );
   );
 };
 };
 
 
+export const getGatewayDevice = (params: Record<'organizationId' | 'transportType', string>) => {
+  const { organizationId, transportType } = params;
+  return defHttp.get<DeviceRecord[]>({
+    url: DeviceManagerApi.GATEWAY_DEVICE,
+    params: {
+      organizationId,
+      transportType,
+    },
+  });
+};
+
 // 获取网关设备
 // 获取网关设备
 export const getGATEWAY = (tbDeviceId: string) => {
 export const getGATEWAY = (tbDeviceId: string) => {
   return defHttp.get({
   return defHttp.get({

@@ -82,9 +82,9 @@
           if (next) {
           if (next) {
             const value = next[valueField];
             const value = next[valueField];
             prev.push({
             prev.push({
+              ...omit(next, [labelField, valueField]),
               label: next[labelField],
               label: next[labelField],
               value: numberToString ? `${value}` : value,
               value: numberToString ? `${value}` : value,
-              ...omit(next, [labelField, valueField]),
             });
             });
           }
           }
           return prev;
           return prev;

 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { deviceProfile, getGATEWAYdevice } from '/@/api/device/deviceManager';
+import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
 
 
 export enum TypeEnum {
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
   IS_GATEWAY = 'GATEWAY',
@@ -73,7 +73,12 @@ export const step1Schemas: FormSchema[] = [
           option: { deviceType: string; transportType: string; id: string }
           option: { deviceType: string; transportType: string; id: string }
         ) {
         ) {
           const { deviceType, transportType, id } = option;
           const { deviceType, transportType, id } = option;
-          setFieldsValue({ deviceType: deviceType, transportType, deviceProfileId: id });
+          setFieldsValue({
+            deviceType: deviceType,
+            transportType,
+            deviceProfileId: id,
+            gatewayId: null,
+          });
         },
         },
       };
       };
     },
     },
@@ -139,14 +144,20 @@ export const step1Schemas: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
-      const { organizationId, deviceType } = formModel;
+      const { organizationId, transportType } = formModel;
       return {
       return {
-        api: getGATEWAYdevice,
+        // api: async (params: Record<'transportType' | 'organizationId', string>) => {
+        //   const options = await getGatewayDevice(params);
+        //   return options.filter((item) => item.deviceType === DeviceTypeEnum.GATEWAY);
+        // },
+        api: getGatewayDevice,
         showSearch: true,
         showSearch: true,
         params: {
         params: {
           organizationId,
           organizationId,
-          deviceType,
+          transportType,
         },
         },
+        valueField: 'id',
+        labelField: 'name',
       };
       };
     },
     },
   },
   },