fix: device list create device search sensor device carry dataType field

@@ -170,8 +170,8 @@ export const getShareBoardComponentInfo = (params: { boardId: string; tenantId:
  */
  */
 export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
 export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
   return defHttp.get<MasterDeviceList[]>({
   return defHttp.get<MasterDeviceList[]>({
-    url: `${DeviceUrl.GET_DEVICE_MASTER}/${organizationId}`,
-    params: { deviceProfileId },
+    url: DeviceUrl.GET_DEVICE_MASTER,
+    params: { deviceProfileId, organizationId },
   });
   });
 };
 };
 
 

@@ -5,6 +5,7 @@ import {
   DeviceProfileModel,
   DeviceProfileModel,
   DeviceProfileQueryParam,
   DeviceProfileQueryParam,
   DeviceQueryParam,
   DeviceQueryParam,
+  DeviceTypeEnum,
 } from '/@/api/device/model/deviceModel';
 } from '/@/api/device/model/deviceModel';
 import { ChildDeviceParams } from './model/deviceModel';
 import { ChildDeviceParams } from './model/deviceModel';
 import { PaginationResult } from '/#/axios';
 import { PaginationResult } from '/#/axios';
@@ -183,10 +184,17 @@ export const cancelDispatchCustomer = (data) => {
 };
 };
 
 
 // 获取组织下的的所有网关设备
 // 获取组织下的的所有网关设备
-export const getGATEWAYdevice = async (params: { organization: string }) => {
+export const getGATEWAYdevice = async (params: {
+  organizationId: string;
+  deviceType: DeviceTypeEnum.GATEWAY;
+}) => {
+  const { organizationId, deviceType } = params;
   const res = await defHttp.get({
   const res = await defHttp.get({
-    url: `/device/list/GATEWAY`,
-    params,
+    url: `/device/list`,
+    params: {
+      organizationId,
+      deviceType,
+    },
   });
   });
   return Promise.resolve<{ label: string; value: string }[]>(
   return Promise.resolve<{ label: string; value: string }[]>(
     res.map((item) => ({ label: item.name, value: item.tbDeviceId }))
     res.map((item) => ({ label: item.name, value: item.tbDeviceId }))

@@ -125,7 +125,6 @@ export const step1Schemas: FormSchema[] = [
     },
     },
     ifShow: ({ values }) => isGateWay(values.deviceType),
     ifShow: ({ values }) => isGateWay(values.deviceType),
   },
   },
-
   {
   {
     field: 'organizationId',
     field: 'organizationId',
     label: '所属组织',
     label: '所属组织',
@@ -140,12 +139,13 @@ 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 } = formModel;
+      const { organizationId, deviceType } = formModel;
       return {
       return {
         api: getGATEWAYdevice,
         api: getGATEWAYdevice,
         showSearch: true,
         showSearch: true,
         params: {
         params: {
           organizationId,
           organizationId,
+          deviceType,
         },
         },
       };
       };
     },
     },

@@ -95,10 +95,8 @@
   const validateMapComponent = async (dataSource: Record<DataSourceField, string>[]) => {
   const validateMapComponent = async (dataSource: Record<DataSourceField, string>[]) => {
     if (dataSource.length) {
     if (dataSource.length) {
       const firstRecord = dataSource.at(0)!;
       const firstRecord = dataSource.at(0)!;
-      const { deviceId, slaveDeviceId } = firstRecord;
-      const flag = dataSource.every(
-        (item) => item.deviceId === deviceId && item.slaveDeviceId === slaveDeviceId
-      );
+      const { deviceId } = firstRecord;
+      const flag = dataSource.every((item) => item.deviceId === deviceId);
       if (!flag) {
       if (!flag) {
         createMessage.warning('地图组件绑定的数据源应该一致');
         createMessage.warning('地图组件绑定的数据源应该一致');
         return Promise.reject(false);
         return Promise.reject(false);

@@ -252,7 +252,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps({ formModel }) {
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
-
         return {
         return {
           api: async () => {
           api: async () => {
             try {
             try {
@@ -281,7 +280,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
     {
     {
       field: DataSourceField.DEVICE_RENAME,
       field: DataSourceField.DEVICE_RENAME,
       component: 'Input',
       component: 'Input',
-      label: '设备',
+      label: '设备名',
       colProps: { span: 8 },
       colProps: { span: 8 },
       componentProps: {
       componentProps: {
         placeholder: '设备重命名',
         placeholder: '设备重命名',