Merge branch 'feat/device-batch' into feat/account-role-manage

dev001
2 parents aef83c96 c72b1b08
Showing 8 changed files with 242 additions and 8 deletions
src/api/device/deviceManager.ts
src/api/device/model/deviceModel.ts
src/components/Form/src/components/LockControlGroup.vue
src/views/device/list/config/data.ts
src/views/device/list/config/detail.config.ts
src/views/device/list/cpns/modal/OrgModal.vue
src/views/device/list/cpns/step/DeviceStep1.vue
src/views/device/list/index.vue
--- a/src/api/device/deviceManager.ts
View file @9ac8875
+++ b/src/api/device/deviceManager.ts
View file @9ac8875
@@ -57,6 +57,21 @@ enum DeviceManagerApi {
    * @description 批量变更产品
    */
   BATCH_UPDATE_PRODUCT = '/device/batch/update',
+
+  /**
+   * @description 批量公开设备
+   */
+  BATCH_PUBLIC_DEVICE = '/batch/customer/public/device/',
+
+  /**
+   * @description 批量私有设备
+   */
+  BATCH_PRIVATE_DEVICE = '/batch/customer/device/',
+
+  /**
+   * @description 批量修改设备
+   */
+  BATCH_UPDATE_DEVICE = '/device/batch/update',
 }
 export const devicePage = (params: DeviceQueryParam) => {
@@ -398,3 +413,43 @@ export const doBatchUpdateProduct = (params: { deviceIds: string[]; deviceProfil
     { joinPrefix: false }
   );
 };
+
+/**
+ *
+ * @param deviceIds tbDeviceId分割的字符串
+ * @returns
+ */
+export const doBatchPublicDevice = (deviceIds: string) => {
+  return defHttp.post(
+    {
+      url: `${DeviceManagerApi.BATCH_PUBLIC_DEVICE}?deviceIds=${deviceIds}`,
+    },
+    { joinPrefix: false }
+  );
+};
+
+/**
+ *
+ * @param deviceIds tbDeviceId分割的字符串
+ * @returns
+ */
+export const doBatchPrivateDevice = (deviceIds: string) => {
+  return defHttp.post(
+    {
+      url: `${DeviceManagerApi.BATCH_PRIVATE_DEVICE}?deviceIds=${deviceIds}`,
+    },
+    { joinPrefix: false }
+  );
+};
+
+/**
+ *
+ * @param orgId
+ * @returns
+ */
+export const doBatchUpdateDevice = (orgId: string, data: Recordable[]) => {
+  return defHttp.post({
+    url: `${DeviceManagerApi.BATCH_UPDATE_DEVICE}?orgId=${orgId}`,
+    data,
+  });
+};
--- a/src/api/device/model/deviceModel.ts
View file @9ac8875
+++ b/src/api/device/model/deviceModel.ts
View file @9ac8875
@@ -53,6 +53,7 @@ export interface DeviceModel {
   customerId?: string;
   alias?: string;
   tbDeviceId?: string;
+  customerName?: string;
 }
 export interface DeviceProfileModel {
@@ -207,6 +208,8 @@ export interface DeviceRecord {
     manufacturer: string;
     streamMode: string;
   };
+  customerName?: string;
+  customerId?: string;
 }
 export interface DeviceModelOfMatterAttrs {
--- a/src/components/Form/src/components/LockControlGroup.vue
View file @9ac8875
+++ b/src/components/Form/src/components/LockControlGroup.vue
View file @9ac8875
@@ -102,7 +102,11 @@
       class="flex-auto"
       :disabled="controlDisableStatus"
     />
-    <Popconfirm v-model:visible="popconfirmVisible" v-bind="getPopConfirmProps">
+    <Popconfirm
+      :disabled="disabled"
+      v-model:visible="popconfirmVisible"
+      v-bind="getPopConfirmProps"
+    >
       <Button type="primary" :disabled="disabled">
         <Icon
           :icon="controlDisableStatus ? 'ant-design:lock-outlined' : 'ant-design:unlock-outlined'"
--- a/src/views/device/list/config/data.ts
View file @9ac8875
+++ b/src/views/device/list/config/data.ts
View file @9ac8875
@@ -36,7 +36,7 @@ const updateProductHelpMessage = [
   '修改设备产品时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
 ];
-const updateOrgHelpMessage = [
+export const updateOrgHelpMessage = [
   '注意:',
   '1、修改设备组织时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
   '2、网关设备在修改组织时，其关联网关子设备组织归属于网关组织及以下不用修改，否则将同步更新网关子设备组织为网关组织。',
@@ -314,6 +314,12 @@ export const step1Schemas: FormSchema[] = [
     ifShow: false,
   },
   {
+    field: 'customerId',
+    label: '用来判断编辑时禁用组织修改',
+    component: 'Input',
+    ifShow: false,
+  },
+  {
     field: 'organizationId',
     label: '所属组织',
     component: 'LockControlGroup',
@@ -327,6 +333,7 @@ export const step1Schemas: FormSchema[] = [
       return {
         component: 'OrgTreeSelect',
         defaultLockStatus: !!formModel?.isUpdate,
+        disabled: !!formModel?.customerId,
         componentProps: {
           apiTreeSelectProps: {
             params: {
--- a/src/views/device/list/config/detail.config.ts
View file @9ac8875
+++ b/src/views/device/list/config/detail.config.ts
View file @9ac8875
 import { formatToDateTime } from '/@/utils/dateUtil';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getCustomerList } from '/@/api/device/deviceManager';
@@ -7,12 +7,15 @@ import { DescItem } from '/@/components/Description/index';
 import moment from 'moment';
 import { CSSProperties, h } from 'vue';
 import { Button, Tooltip } from 'ant-design-vue';
-import { TypeEnum } from './data';
+import { TypeEnum, updateOrgHelpMessage } from './data';
 import { PageEnum } from '/@/enums/pageEnum';
 import { useGo } from '/@/hooks/web/usePage';
 import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { isNullOrUnDef } from '/@/utils/is';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 // 设备详情的描述
 export const descSchema = (emit: EmitType): DescItem[] => {
@@ -407,3 +410,16 @@ export const customerForm: FormSchema[] = [
     colProps: { span: 12 },
   },
 ];
+
+export const orgForm: FormSchema[] = [
+  {
+    field: 'organizationId',
+    component: 'OrgTreeSelect',
+    helpMessage: updateOrgHelpMessage,
+    label: '选择组织',
+    required: true,
+    componentProps: {
+      placeholder: '请选择',
+    },
+  },
+];
--- a/src/views/device/list/cpns/modal/OrgModal.vue 0 → 100644
View file @9ac8875
+++ b/src/views/device/list/cpns/modal/OrgModal.vue 0 → 100644
View file @9ac8875
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="registerModal"
+    title="批量修改设备"
+    :canFullscreen="false"
+    centered
+    @ok="dispatchCustomer"
+    @cancel="resetFields"
+    :minHeight="300"
+    okText="确认"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { orgForm } from '../../config/detail.config';
+  import { doBatchUpdateDevice } from '/@/api/device/deviceManager';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  export default defineComponent({
+    name: 'AlarmDetailModal',
+    components: {
+      BasicModal,
+      BasicForm,
+    },
+    emits: ['reload', 'register'],
+    setup(_, { emit }) {
+      const { createMessage } = useMessage();
+
+      const record = ref([]);
+
+      const [registerModal, { closeModal, setModalProps }] = useModalInner((data) => {
+        record.value = data;
+      });
+
+      const [registerForm, { validate, resetFields }] = useForm({
+        labelWidth: 100,
+        showActionButtonGroup: false,
+        schemas: orgForm,
+      });
+
+      // 分配组织
+      const dispatchCustomer = async () => {
+        setModalProps({ loading: true });
+        try {
+          const value = await validate();
+          if (!value) return;
+          await doBatchUpdateDevice(value.organizationId, record.value);
+          closeModal();
+          resetFields();
+          emit('reload');
+        } finally {
+          setModalProps({ loading: false });
+          createMessage.success('操作成功');
+        }
+      };
+
+      return {
+        registerModal,
+        registerForm,
+        dispatchCustomer,
+        resetFields,
+      };
+    },
+  });
+</script>
--- a/src/views/device/list/cpns/step/DeviceStep1.vue
View file @9ac8875
+++ b/src/views/device/list/cpns/step/DeviceStep1.vue
View file @9ac8875
@@ -418,6 +418,7 @@
           code: data?.code,
           addressCode: data?.code,
           isUpdate: unref(isUpdate1),
+          customerId: data?.customerId,
         });
       }
       // 父组件调用获取字段值的方法
--- a/src/views/device/list/index.vue
View file @9ac8875
+++ b/src/views/device/list/index.vue
View file @9ac8875
@@ -23,13 +23,14 @@
           >
             <AuthDropDown
               v-if="authBtn(role)"
-              :disabled="!isExistOption"
+              :disabled="isPublicAndPrivateFlag || !isExistOption"
               :dropMenuList="[
                 {
                   text: '删除设备',
                   auth: DeviceListAuthEnum.DELETE,
                   icon: 'ant-design:delete-outlined',
                   event: '',
+                  disabled: !batchPrivateFlag,
                   popconfirm: {
                     title: '您确定要批量删除数据',
                     onConfirm: () => handleDelete(),
@@ -40,6 +41,7 @@
                   auth: DeviceListAuthEnum.ASSIGN,
                   icon: 'mdi:account-arrow-left',
                   event: '',
+                  disabled: !batchPrivateFlag,
                   onClick: handleBatchAssign.bind(null),
                 },
                 {
@@ -47,12 +49,35 @@
                   auth: DeviceListAuthEnum.UPDATE_PRODUCT,
                   icon: 'clarity:note-edit-line',
                   event: '',
-                  disabled: batchUpdateProductFlag,
+                  disabled: !batchPrivateFlag || batchUpdateProductFlag,
                   onClick: handelOpenBatchUpdateProductModal,
                 },
+                {
+                  text: '批量公开',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: !batchPrivateFlag,
+                  onClick: handleBatchPublic.bind(null),
+                },
+                {
+                  text: '批量私有',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: batchPrivateFlag,
+                  onClick: handleBatchPrivate.bind(null),
+                },
+                {
+                  text: '批量修改组织',
+                  icon: 'ant-design:wallet-outlined',
+                  event: '',
+                  disabled: !batchPrivateFlag,
+                  onClick: handleBatchOrg.bind(null),
+                },
               ]"
             >
-              <Button type="primary" :disabled="!isExistOption">批量操作</Button>
+              <Button type="primary" :disabled="isPublicAndPrivateFlag || !isExistOption"
+                >批量操作</Button
+              >
             </AuthDropDown>
           </Authority>
         </template>
@@ -225,6 +250,7 @@
       <DeviceModal @register="registerModal" @success="handleSuccess" @reload="handleSuccess" />
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
+      <OrgModal @register="registerOrgModal" @reload="handleReload" />
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
@@ -254,6 +280,8 @@
     getGATEWAY,
     privateDevice,
     publicDevice,
+    doBatchPublicDevice,
+    doBatchPrivateDevice,
   } from '/@/api/device/deviceManager';
   import { PageEnum } from '/@/enums/pageEnum';
   import { useGo } from '/@/hooks/web/usePage';
@@ -264,6 +292,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import CustomerModal from './cpns/modal/CustomerModal.vue';
+  import OrgModal from './cpns/modal/OrgModal.vue';
   import BatchImportModal from './cpns/modal/BatchImportModal/index.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
@@ -292,6 +321,7 @@
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
   const [registerModal, { openModal }] = useModal();
   const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
+  const [registerOrgModal, { openModal: openOrgodal }] = useModal();
   const [registerDetailDrawer, { openDrawer }] = useDrawer();
   const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
   const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
@@ -326,6 +356,10 @@
   const batchUpdateProductFlag = ref(true);
+  const isPublicAndPrivateFlag = ref(false);
+
+  const batchPrivateFlag = ref(true);
+
   const [
     registerTable,
     {
@@ -376,7 +410,7 @@
     rowSelection: {
       type: 'checkbox',
       getCheckboxProps: (record: DeviceModel) => {
-        return { disabled: !!record.customerId };
+        return { disabled: !!record.customerId && record.customerName !== 'Public' };
       },
       onSelect(_record, _selected, selectedRows) {
         const [firstItem] = selectedRows as DeviceRecord[];
@@ -384,6 +418,11 @@
         batchUpdateProductFlag.value =
           !selectedRows.length ||
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+
+        batchPrivateFlag.value = selectedRows.some((item: DeviceRecord) => !item?.customerId);
+        isPublicAndPrivateFlag.value =
+          selectedRows.some((item: DeviceRecord) => !item?.customerId) &&
+          selectedRows.some((item: DeviceRecord) => item?.customerAdditionalInfo?.isPublic);
       },
       onSelectAll(_selected, selectedRows) {
         const [firstItem] = selectedRows as DeviceRecord[];
@@ -391,6 +430,11 @@
         batchUpdateProductFlag.value =
           !selectedRows.length ||
           !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+
+        batchPrivateFlag.value = selectedRows.some((item) => !item?.customerId);
+        isPublicAndPrivateFlag.value =
+          selectedRows.some((item) => !item?.customerId) &&
+          selectedRows.some((item) => item?.customerAdditionalInfo?.isPublic);
       },
     },
   });
@@ -492,6 +536,39 @@
     openCustomerModal(true, options);
   };
+  const handleBatchOrg = () => {
+    const options = getSelectRows();
+    openOrgodal(true, options);
+  };
+
+  // 批量公开设备
+  const handleBatchPublic = async () => {
+    setLoading(true);
+    try {
+      const options = getSelectRows();
+      const tbDeviceIdJoinStr = options.map((item) => item.tbDeviceId).join(',');
+      const res = await doBatchPublicDevice(tbDeviceIdJoinStr);
+      createMessage.success(res);
+    } finally {
+      handleReload();
+      setLoading(false);
+    }
+  };
+
+  // 批量私有设备
+  const handleBatchPrivate = async () => {
+    setLoading(true);
+    try {
+      const options = getSelectRows();
+      const tbDeviceIdJoinStr = options.map((item) => item.tbDeviceId).join(',');
+      const res = await doBatchPrivateDevice(tbDeviceIdJoinStr);
+      createMessage.success(res);
+    } finally {
+      handleReload();
+      setLoading(false);
+    }
+  };
+
   const handleDelete = async (record?: DeviceRecord) => {
     let ids: string[] = [];
     if (record) {