Merge branch 'dev-ww' into 'main'

feat: linkedge action add service command

See merge request huang/yun-teng-iot-front!402

@@ -10,6 +10,8 @@ enum ModelOfMatter {
   TSL = '/things_model',
   LIST = '/things_model/page',
   RELEASE = '/things_model',
+
+  GET_MODEL_SERVICE = '/things_model/get_services',
 }
 
 export const getModelList = (
@@ -60,3 +62,10 @@ export const releaseModel = (deviceProfileId: string) => {
     url: `${ModelOfMatter.RELEASE}/${deviceProfileId}`,
   });
 };
+
+export const getModelServices = (params: { deviceProfileId: string }) => {
+  const { deviceProfileId } = params;
+  return defHttp.get({
+    url: `${ModelOfMatter.GET_MODEL_SERVICE}/${deviceProfileId}`,
+  });
+};

@@ -112,9 +112,14 @@ export const getAttribute = (orgId, deviceIds) => {
  * 获取主设备列表（exclude子设备）---执行动作
  * @param params organizationId
  */
-export const byOganizationIdGetMasterDevice = (params) => {
+export const byOrganizationIdGetMasterDevice = (params: {
+  organizationId: string;
+  deviceProfileId?: string;
+}) => {
+  const { organizationId, deviceProfileId } = params;
   return defHttp.get({
-    url: ScreenManagerApi.MASTER_GET_DEVICE + '/' + params,
+    url: `${ScreenManagerApi.MASTER_GET_DEVICE}/${organizationId}`,
+    params: { deviceProfileId },
   });
 };
 //TODO-fengtao

@@ -116,9 +116,9 @@
 <script lang="ts" setup>
   import { ref, watch, unref, computed, nextTick } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { formSchema, organizationId } from './config/config.data.ts';
+  import { formSchema, organizationId as organizationIdRef } from './config/config.data';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { genTriggerOrConditionData, genActionData } from './config/formatData.ts';
+  import { genTriggerOrConditionData, genActionData } from './config/formatData';
   import { Divider } from 'ant-design-vue';
   import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -126,11 +126,10 @@
     screenLinkPageAddApi,
     screenLinkPageByDeptIdGetDevice,
     getOrganizationAlarmConfig,
-    byOganizationIdGetMasterDevice,
   } from '/@/api/ruleengine/ruleengineApi';
   import TriggerOrCondition from './cpns/Trigger-Condition.vue';
   import Action from './cpns/Action.vue';
-  import { findOperation } from './config/formatData.ts';
+  import { findOperation } from './config/formatData';
   import { formatToDateTime } from '/@/utils/dateUtil';
 
   const emit = defineEmits(['register', 'success']);
@@ -179,6 +178,7 @@
         doConditions,
         doActions,
       } = data.record;
+      organizationIdRef.value = organizationId;
       // 赋值
       await setFieldsValue(data.record);
       id.value = recordId;
@@ -186,7 +186,7 @@
       //TODO-fengtao-把组织id传给子组件
       provideOrgid.value = organizationId;
       //TODO-fengtao获取当前执行动作下的设备(master那个接口)
-      getMasterDeviceList.value = await byOganizationIdGetMasterDevice(organizationId);
+      // getMasterDeviceList.value = await byOrganizationIdGetMasterDevice(organizationId);
       //TODO-fengtao
       // 获取当前组织下的设备列表
       const options = await screenLinkPageByDeptIdGetDevice({
@@ -394,6 +394,7 @@
           const selectDeviceId = ref('');
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
+            ...action,
             outTarget: action.outTarget,
             device: action.entityType,
             deviceId: action.deviceId,
@@ -451,12 +452,12 @@
                   }
                   //fengtao-把设备id回传给子组件
                   item.updateFieldAttributeFunc(selectDeviceId.value, provideOrgid.value);
-                  item.updateFieldDeviceId(
-                    deviceList.value,
-                    provideOrgid.value,
-                    isUpdate.value,
-                    getMasterDeviceList.value
-                  );
+                  // item.updateFieldDeviceId(
+                  //   deviceList.value,
+                  //   provideOrgid.value,
+                  //   isUpdate.value,
+                  //   getMasterDeviceList.value
+                  // );
                   //fengtao
                   // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
                   item.operationType =
@@ -533,12 +534,12 @@
   });
 
   // 设置设备的options
-  const setEditFields = (linkAge, deviceList) => {
-    unref(linkAge).map((item) => {
-      //TODO-fengtao
-      item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
-      //TODO-fengtao
-    });
+  const setEditFields = (_linkAge, _deviceList) => {
+    // unref(linkAge).map((item) => {
+    //TODO-fengtao
+    // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+    //TODO-fengtao
+    // });
   };
   // 设置告警配置options
   const setEditAlarmConfig = (linkAge, alarmConfigList) => {
@@ -554,16 +555,20 @@
   //FT add 2022-10-27
   const addOrgId = ref('');
   //FT add 2022-10-27
-  watch(organizationId, async (newValue: string) => {
+  watch(organizationIdRef, async (newValue: string) => {
     if (!newValue) return;
     //FT add 2022-10-27
     addOrgId.value = newValue;
     //FT add 2022-10-27
     const { items = [] } = await screenLinkPageByDeptIdGetDevice({ organizationId: newValue });
     //TODO fengtao
-    getMasterDeviceList.value = await byOganizationIdGetMasterDevice(newValue);
+    // getMasterDeviceList.value = await byOrganizationIdGetMasterDevice(newValue);
     //TODO fengtao
-    deviceList.value = (items || []).map((item) => ({ label: item.name, value: item.tbDeviceId }));
+    deviceList.value = (items || []).map((item) => ({
+      ...item,
+      label: item.name,
+      value: item.tbDeviceId,
+    }));
     //TODO fengtao
     orgId.value = newValue;
     //TODO fengtao
@@ -595,7 +600,7 @@
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       //TODO fengtao
-      item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
       if (isUpdate.value) {
         item.updateEditFieldAlarmConfig(editAlarmConfigData);
       } else {
@@ -661,6 +666,8 @@
         createMessage.error('请添加触发器或者执行条件');
         throw '请添加触发器或者执行条件';
       }
+
+      // return;
       //新增的代码2022-11-22
       const postAddOrEditData = {
         ...basicFormValue,
@@ -722,7 +729,7 @@
   const handleClose = () => {
     id.value = undefined;
     tenantId.value = undefined;
-    organizationId.value = undefined;
+    organizationIdRef.value = undefined;
     isView.value = true;
     getTriggerFormValue.value = [];
     getConditionFormValue.value = [];

-import { ref } from 'vue';
+import { ref, unref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
+import {
+  byOrganizationIdGetMasterDevice,
+  screenLinkOrganizationGetApi,
+} from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { numberAndNonegativeRule } from '/@/utils/rules';
 import { findDictItemByCode } from '/@/api/system/dict';
+import { deviceProfile } from '/@/api/device/deviceManager';
+import { getModelServices } from '/@/api/device/modelOfMatter';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 
 /**
  * 所使用的枚举值
@@ -167,10 +173,10 @@ const isPartOrAll = (type: string) => {
   return type === 'ALL' || type === 'PART';
 };
 const isService = (type: string) => {
-  return type === 'service';
+  return Number(type) === 1;
 };
 const isDefine = (type: string) => {
-  return type === 'custom_define';
+  return Number(type) === 0;
 };
 //新增代码2022-11-23
 
@@ -319,95 +325,147 @@ export const actionSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        api: deviceProfile,
+        placeholder: '请选择产品',
+        labelField: 'name',
+        valueField: 'id',
+        getPopupContainer: () => document.body,
+        onChange: () => {
+          setFieldsValue({ deviceId: [] });
+        },
+      };
+    },
+    ifShow: ({ values }) => isDeviceOut(values.outTarget),
+  },
+  {
     field: 'device',
     label: '',
     component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备',
-      options: [
-        { label: '全部', value: 'ALL' },
-        { label: '部分', value: 'PART' },
-      ],
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择设备',
+        options: [
+          { label: '全部', value: 'ALL' },
+          { label: '部分', value: 'PART' },
+        ],
+        onChange: () => {
+          setFieldsValue({ deviceId: [], thingsModelId: null });
+        },
+      };
     },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget),
+    ifShow: ({ values }) => isDeviceOut(values.outTarget) && values['deviceProfileId'],
     colProps: { span: 6 },
   },
   {
     field: 'deviceId',
     label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备',
-      mode: 'multiple',
+    component: 'ApiSelect',
+    componentProps: ({ formModel }) => {
+      const deviceProfileId = formModel['deviceProfileId'];
+      return {
+        placeholder: '请选择设备',
+        mode: 'multiple',
+        api: byOrganizationIdGetMasterDevice,
+        params: {
+          organizationId: unref(organizationId),
+          deviceProfileId,
+        },
+        labelField: 'name',
+        valueField: 'id',
+      };
     },
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },
   },
   //新增代码2022-11-23
   {
-    field: 'customDefine',
+    field: 'commandType',
     label: '',
     required: true,
     component: 'ApiSelect',
     colProps: {
       span: 6,
     },
-    defaultValue: 'custom_define',
-    componentProps: {
-      placeholder: '请选择类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'custom_define',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-      getPopupContainer: () => document.body,
+    defaultValue: '0',
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        placeholder: '请选择类型',
+        api: async () => {
+          const record = await findDictItemByCode({
+            dictCode: 'custom_define',
+          });
+          return record.map((item) => ({ ...item, itemValue: Number(item.itemValue) }));
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+        onChange: () => {
+          setFieldsValue({ doContext: null, thingsModelId: null });
+        },
+      };
     },
     ifShow: ({ values }) => isDeviceOut(values.outTarget) && isPartOrAll(values.device),
   },
   //新增代码2022-11-23
   {
-    field: 'customMode',
+    field: 'callType',
     label: '',
     required: true,
     component: 'ApiSelect',
     colProps: {
       span: 6,
     },
-    defaultValue: 'OneWay',
+    defaultValue: 'SYNC',
     componentProps: {
       placeholder: '请选择类型',
       api: findDictItemByCode,
       params: {
-        dictCode: 'custom_mode',
+        dictCode: 'call_mode',
       },
       labelField: 'itemText',
       valueField: 'itemValue',
       getPopupContainer: () => document.body,
     },
     ifShow: ({ values }) =>
-      isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.customDefine),
+      isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType),
   },
   //新增代码2022-11-23
   {
-    field: 'service',
+    field: 'thingsModelId',
     label: '',
     required: true,
     component: 'ApiSelect',
     colProps: {
       span: 6,
     },
-    componentProps: {
-      placeholder: '请选择服务',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'attribute_unit',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-      getPopupContainer: () => document.body,
+    componentProps: ({ formModel, formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      const deviceProfileId = formModel['deviceProfileId'];
+      return {
+        placeholder: '请选择服务',
+        api: getModelServices,
+        params: {
+          deviceProfileId,
+        },
+        labelField: 'functionName',
+        valueField: 'id',
+        getPopupContainer: () => document.body,
+        onChange: (_, options: ModelOfMatterParams) => {
+          // console.log(options);
+          setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
+        },
+      };
     },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isService(values.customDefine),
+    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isService(values.commandType),
   },
   //新增代码2022-11-23
   {
@@ -429,7 +487,7 @@ export const actionSchema: FormSchema[] = [
     slot: 'doContext',
     show: ({ values }) => {
       return (
-        isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.customDefine)
+        isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType)
       );
     },
     colProps: {

 import { formatToDateTime } from '/@/utils/dateUtil';
 import { Number_Operation, String_Operation, Boolean_Operation } from '/@/enums/operationEnum';
-import { numberAndNonegativeRule } from '/@/utils/rules';
 
 // 生成触发器或执行条件JSON数据
 export const genTriggerOrConditionData = (triggerData) => {
@@ -77,6 +76,11 @@ export const genActionData = (actionData) => {
     doContext,
     device,
     deviceId,
+    deviceProfileId,
+    commandType,
+    callType,
+    service,
+    thingsModelId,
   } = actionData;
   const clearRule = clearRules.map((item) => {
     const mapPredicate = item.predicate.map((pred) => {
@@ -133,6 +137,11 @@ export const genActionData = (actionData) => {
       outTarget,
       entityType: device ?? 'ALL',
       deviceId: device === 'PART' ? deviceId : null,
+      deviceProfileId,
+      commandType,
+      callType,
+      service,
+      thingsModelId,
       doContext: clearRule?.length
         ? {
             alarmLevel: alarm_level,

@@ -246,15 +246,20 @@
     }
     //ft-add-2022-11-22
     //TODO-fengtao-设备验证
+    const value = getFieldsValue();
+    const doContext = unref(jsonInstance)?.get() || {};
     return {
-      ...getFieldsValue(),
-      doContext: unref(jsonInstance.value)?.get(),
+      ...value,
+      ...(Number(value.commandType) === 0 ? { doContext } : {}),
       clearRule,
     };
   };
 
   const setFieldsFormValueFun = (fieldsValue) => {
-    setFieldsValue(fieldsValue);
+    setFieldsValue({
+      ...fieldsValue,
+      ...(fieldsValue.commandType ? { commandType: String(fieldsValue.commandType) } : {}),
+    });
   };
   //ft-add
   const resetConditionForm = () => {};