Merge branch 'fix/data-board-service-command' into 'main_dev'

fix: 修复看板管理服务调用未携带服务调用标志&&同步异步下发

See merge request yunteng/thingskit-front!704

@@ -40,6 +40,7 @@ enum DataBoardShareUrl {
 
 
 enum SendCommand {
 enum SendCommand {
   ONEWAY = '/plugins/rpc/oneway',
   ONEWAY = '/plugins/rpc/oneway',
+  TWOWAY = '/plugins/rpc/twoway',
 }
 }
 
 
 enum DeviceUrl {
 enum DeviceUrl {
@@ -229,6 +230,16 @@ export const sendCommandOneway = (params: SendCommandParams) => {
   );
   );
 };
 };
 
 
+export const sendCommandTwoway = (params: SendCommandParams) => {
+  return defHttp.post(
+    {
+      url: `${SendCommand.TWOWAY}/${params.deviceId}`,
+      params: params.value,
+    },
+    { joinPrefix: false, withShareToken: isShareMode() }
+  );
+};
+
 export const getDeviceRelation = (params: { deviceId: string; isSlave: boolean }) => {
 export const getDeviceRelation = (params: { deviceId: string; isSlave: boolean }) => {
   return defHttp.get<string>({
   return defHttp.get<string>({
     url: DeviceUrl.GET_DEVICE_RELATION,
     url: DeviceUrl.GET_DEVICE_RELATION,

@@ -33,6 +33,7 @@
         service: value.service,
         service: value.service,
         command: value.command,
         command: value.command,
         commandType: value.commandType,
         commandType: value.commandType,
+        callType: value.callType,
       },
       },
     };
     };
     return value;
     return value;
@@ -46,6 +47,7 @@
       service: customCommand?.service || (record as Recordable).service,
       service: customCommand?.service || (record as Recordable).service,
       command: customCommand?.command || (record as Recordable).command,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
+      callType: customCommand?.callType || (record as Recordable).callType,
     } as unknown as Partial<CommonDataSourceBindValueType>);
     } as unknown as Partial<CommonDataSourceBindValueType>);
   };
   };
 
 

@@ -33,6 +33,7 @@
         service: value.service,
         service: value.service,
         command: value.command,
         command: value.command,
         commandType: value.commandType,
         commandType: value.commandType,
+        callType: value.callType,
       },
       },
     };
     };
     return value;
     return value;
@@ -46,6 +47,7 @@
       service: customCommand?.service || (record as Recordable).service,
       service: customCommand?.service || (record as Recordable).service,
       command: customCommand?.command || (record as Recordable).command,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
+      callType: customCommand?.callType || (record as Recordable).callType,
     } as unknown as Partial<CommonDataSourceBindValueType>);
     } as unknown as Partial<CommonDataSourceBindValueType>);
   };
   };
 
 

@@ -33,6 +33,7 @@
         service: value.service,
         service: value.service,
         command: value.command,
         command: value.command,
         commandType: value.commandType,
         commandType: value.commandType,
+        callType: value.callType,
       },
       },
     };
     };
     return value;
     return value;
@@ -46,6 +47,7 @@
       service: customCommand?.service || (record as Recordable).service,
       service: customCommand?.service || (record as Recordable).service,
       command: customCommand?.command || (record as Recordable).command,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
+      callType: customCommand?.callType || (record as Recordable).callType,
     } as unknown as Partial<CommonDataSourceBindValueType>);
     } as unknown as Partial<CommonDataSourceBindValueType>);
   };
   };
 
 

@@ -23,6 +23,7 @@ export interface CommonDataSourceBindValueType extends Record<DataSourceField, s
     service?: string;
     service?: string;
     command?: string;
     command?: string;
     commandType?: string;
     commandType?: string;
+    callType?: string;
   };
   };
 }
 }
 
 
@@ -44,6 +45,7 @@ export enum DataSourceField {
   COMMAND = 'command',
   COMMAND = 'command',
   COMMAND_TYPE = 'commandType',
   COMMAND_TYPE = 'commandType',
   SERVICE = 'service',
   SERVICE = 'service',
+  CALL_TYPE = 'callType',
 }
 }
 
 
 const isTcpProfile = (transportType: string) => transportType === TransportTypeEnum.TCP;
 const isTcpProfile = (transportType: string) => transportType === TransportTypeEnum.TCP;
@@ -292,12 +294,22 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
           valueField: 'itemValue',
           valueField: 'itemValue',
           placeholder: '请选择命令类型',
           placeholder: '请选择命令类型',
           onChange() {
           onChange() {
-            setFieldsValue({ [DataSourceField.COMMAND]: null, [DataSourceField.SERVICE]: null });
+            setFieldsValue({
+              [DataSourceField.COMMAND]: null,
+              [DataSourceField.SERVICE]: null,
+              [DataSourceField.CALL_TYPE]: null,
+            });
           },
           },
         };
         };
       },
       },
     },
     },
     {
     {
+      field: DataSourceField.CALL_TYPE,
+      component: 'Input',
+      ifShow: false,
+      label: 'callType',
+    },
+    {
       field: DataSourceField.SERVICE,
       field: DataSourceField.SERVICE,
       component: 'ApiSelect',
       component: 'ApiSelect',
       label: '服务',
       label: '服务',
@@ -317,7 +329,13 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
           api: async () => {
           api: async () => {
             try {
             try {
               if (deviceProfileId) {
               if (deviceProfileId) {
-                return await getDeviceService(deviceProfileId);
+                const services = await getDeviceService(deviceProfileId);
+                const value = formModel[DataSourceField.SERVICE];
+                if (value) {
+                  const selected = services.find((item) => item.value === value);
+                  selected && setFieldsValue({ [DataSourceField.CALL_TYPE]: selected.callType });
+                }
+                return services;
               }
               }
             } catch (error) {}
             } catch (error) {}
             return [];
             return [];
@@ -328,7 +346,10 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             const command = value
             const command = value
               ? (options.functionJson.inputData || [])[0]?.serviceCommand
               ? (options.functionJson.inputData || [])[0]?.serviceCommand
               : null;
               : null;
-            setFieldsValue({ [DataSourceField.COMMAND]: command });
+            setFieldsValue({
+              [DataSourceField.COMMAND]: command,
+              [DataSourceField.CALL_TYPE]: value ? options.callType : null,
+            });
           },
           },
         };
         };
       },
       },

 import { ref } from 'vue';
 import { ref } from 'vue';
 import { DataSource } from '../../palette/types';
 import { DataSource } from '../../palette/types';
-import { sendCommandOneway } from '/@/api/dataBoard';
+import { sendCommandOneway, sendCommandTwoway } from '/@/api/dataBoard';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { ServiceCallTypeEnum } from '/@/enums/toolEnum';
 
 
 const { createMessage } = useMessage();
 const { createMessage } = useMessage();
 export function useSendCommand() {
 export function useSendCommand() {
@@ -16,7 +17,6 @@ export function useSendCommand() {
   const sendCommand = async (record: DataSource, value: any) => {
   const sendCommand = async (record: DataSource, value: any) => {
     if (!record) return false;
     if (!record) return false;
     const { customCommand, attribute } = record || {};
     const { customCommand, attribute } = record || {};
-
     const { deviceId } = record;
     const { deviceId } = record;
     if (!deviceId) return false;
     if (!deviceId) return false;
 
 
@@ -26,21 +26,23 @@ export function useSendCommand() {
         [attribute!]: Number(value),
         [attribute!]: Number(value),
       };
       };
 
 
+      let sendCommandFn = sendCommandOneway;
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
       if (customCommand?.transportType === TransportTypeEnum.TCP) {
       if (customCommand?.transportType === TransportTypeEnum.TCP) {
         params = customCommand.command!;
         params = customCommand.command!;
+        if (customCommand.callType === ServiceCallTypeEnum.ASYNC) {
+          sendCommandFn = sendCommandTwoway;
+        }
       }
       }
 
 
-      console.log(params);
-
       // 控制按钮下发命令为0 或 1
       // 控制按钮下发命令为0 或 1
-      await sendCommandOneway({
+      await sendCommandFn({
         deviceId,
         deviceId,
         value: {
         value: {
           params: params || null,
           params: params || null,
           persistent: true,
           persistent: true,
           additionalInfo: {
           additionalInfo: {
-            cmdType: 'API',
+            cmdType: customCommand.commandType || 'API',
           },
           },
           method: 'methodThingskit',
           method: 'methodThingskit',
         },
         },

@@ -67,6 +67,7 @@ export interface CustomCommand {
   commandType: string;
   commandType: string;
   command: string;
   command: string;
   service: string;
   service: string;
+  callType: string;
 }
 }
 
 
 export interface ComponentLayoutType {
 export interface ComponentLayoutType {