pref:更换场景联动设备列表接口

fengtao
1 parent 56f2df68
Showing 5 changed files with 71 additions and 6 deletions
src/api/device/deviceManager.ts
src/api/ruleengine/ruleengineApi.ts
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config/config.data.ts
src/views/rule/linkedge/config/formatData.ts
--- a/src/api/device/deviceManager.ts
View file @8a5dc05
+++ b/src/api/device/deviceManager.ts
View file @8a5dc05
@@ -76,9 +76,10 @@ export const deleteDevice = (ids: string[]) => {
  * 查询设备配置
  * @param params pageSize page name
  */
-export const deviceProfile = () => {
+export const deviceProfile = (params) => {
   return defHttp.get({
     url: DeviceManagerApi.DEVICE_PROFILE_URL_ME,
+    params,
   });
 };
--- a/src/api/ruleengine/ruleengineApi.ts
View file @8a5dc05
+++ b/src/api/ruleengine/ruleengineApi.ts
View file @8a5dc05
@@ -21,7 +21,7 @@ enum ScreenManagerApi {
   // GET_ATTRBUTELIST = '/device/keys',
   GET_ATTRBUTELIST = '/device/attributes/',
   ALARM_PROFILE = '/alarm/profile/',
-  MASTER_GET_DEVICE = '/device/list/master',
+  MASTER_GET_DEVICE = '/device/list',
 }
 /**
@@ -125,8 +125,8 @@ export const byOrganizationIdGetMasterDevice = (params: {
 }) => {
   const { organizationId, deviceProfileId } = params;
   return defHttp.get({
-    url: `${ScreenManagerApi.MASTER_GET_DEVICE}/${organizationId}`,
-    params: { deviceProfileId },
+    url: `${ScreenManagerApi.MASTER_GET_DEVICE}`,
+    params: { deviceProfileId, organizationId },
   });
 };
 //TODO-fengtao
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @8a5dc05
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @8a5dc05
@@ -245,6 +245,7 @@
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
+            deviceType: trigger?.deviceType,
             deviceProfileId: trigger?.deviceProfileId,
             replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -325,6 +326,7 @@
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
+            deviceType: condition?.deviceType,
             deviceProfileId: condition?.deviceProfileId,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
@@ -397,6 +399,7 @@
             deviceId: action.deviceId,
             alarm_config: action.alarmProfileId,
             alarm_level: action.doContext.alarmLevel,
+            deviceType: action.deviceType,
           });
           // 如果是设备输出设置脚本值
           if (action.outTarget === 'DEVICE_OUT') {
@@ -436,6 +439,7 @@
                         .valueType,
                     detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
                     entityId: action.doContext.clearRule[index].entityId,
+                    deviceType: action.doContext.clearRule[index].entityId?.deviceType,
                     deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
                     replaceValue:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
--- a/src/views/rule/linkedge/config/config.data.ts
View file @8a5dc05
+++ b/src/views/rule/linkedge/config/config.data.ts
View file @8a5dc05
@@ -193,6 +193,7 @@ export const trigger_condition_schema: FormSchema[] = [
     field: 'triggered',
     label: '',
     component: 'Select',
+    defaultValue: 'SIMPLE',
     componentProps: {
       placeholder: '请选择触发类型',
       options: [
@@ -204,14 +205,44 @@ export const trigger_condition_schema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
-    field: 'deviceProfileId',
+    field: 'deviceType',
     label: '',
     component: 'ApiSelect',
     colProps: { span: 6 },
+    defaultValue: 'SENSOR',
     componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'device_type',
+        },
+        placeholder: '请选择类型',
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+        onChange(e) {
+          if (e) {
+            setFieldsValue({ deviceProfileId: '' });
+          }
+        },
+      };
+    },
+  },
+  {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formActionType, formModel }) => {
       const { updateSchema, setFieldsValue } = formActionType;
+      const deviceType = formModel['deviceType'];
       return {
         api: deviceProfile,
+        params: {
+          deviceType,
+        },
+        showSearch: true,
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',
@@ -372,14 +403,38 @@ export const actionSchema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
+    field: 'deviceType',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    defaultValue: 'SENSOR',
+    componentProps: () => {
+      return {
+        api: findDictItemByCode,
+        params: {
+          dictCode: 'device_type',
+        },
+        placeholder: '请选择类型',
+        labelField: 'itemText',
+        valueField: 'itemValue',
+        getPopupContainer: () => document.body,
+      };
+    },
+    ifShow: ({ values }) => isDeviceOut(values.outTarget),
+  },
+  {
     field: 'deviceProfileId',
     label: '',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    componentProps: ({ formActionType }) => {
+    componentProps: ({ formActionType, formModel }) => {
       const { setFieldsValue } = formActionType;
+      const deviceType = formModel['deviceType'];
       return {
         api: deviceProfile,
+        params: {
+          deviceType,
+        },
         placeholder: '请选择产品',
         labelField: 'name',
         valueField: 'id',
--- a/src/views/rule/linkedge/config/formatData.ts
View file @8a5dc05
+++ b/src/views/rule/linkedge/config/formatData.ts
View file @8a5dc05
@@ -18,6 +18,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     timeUnit,
     replaceValue,
     deviceProfileId,
+    deviceType,
   } = triggerData;
   const mapPredicate = predicate?.map((item) => {
     return {
@@ -45,6 +46,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     triggerType,
     entityType: device,
     entityId: entityId?.length ? entityId : null,
+    deviceType,
     triggerCondition: {
       alarmDetails: detail,
       condition: {
@@ -83,6 +85,7 @@ export const genActionData = (actionData) => {
     callType,
     service,
     thingsModelId,
+    deviceType,
   } = actionData;
   const clearRule = clearRules.map((item) => {
     const mapPredicate = item.predicate.map((pred) => {
@@ -117,6 +120,7 @@ export const genActionData = (actionData) => {
       triggerType: item.triggerType,
       entityType: item.device,
       entityId: item.device === 'PART' ? item.entityId : null,
+      deviceType,
       deviceProfileId: item.deviceProfileId,
       triggerCondition: {
         alarmDetails: item.detail,
@@ -138,6 +142,7 @@ export const genActionData = (actionData) => {
     {
       alarmProfileId: alarm_config,
       outTarget,
+      deviceType,
       entityType: device ?? 'ALL',
       deviceId: device === 'PART' ? deviceId : null,
       deviceProfileId,