Merge branch 'sqy_dev' into 'main'

fix:调整设备取消分配客户的接口与设备列表客户展示

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

@@ -156,6 +156,13 @@ export const dispatchCustomer = (data) => {
     }
     }
   );
   );
 };
 };
+// 检查设备是否被占用
+export const checkDeviceOccupied = (id) => {
+  return defHttp.get({
+    url: `/device/used/${id}`,
+  });
+};
+
 // 取消分配客户
 // 取消分配客户
 export const cancelDispatchCustomer = (data) => {
 export const cancelDispatchCustomer = (data) => {
   const { tbDeviceId } = data;
   const { tbDeviceId } = data;

@@ -36,6 +36,10 @@ export const columns: BasicColumn[] = [
     dataIndex: 'organizationDTO.name',
     dataIndex: 'organizationDTO.name',
   },
   },
   {
   {
+    title: '客户',
+    dataIndex: 'customerName',
+  },
+  {
     title: '标签',
     title: '标签',
     dataIndex: 'label',
     dataIndex: 'label',
     width: 180,
     width: 180,

@@ -163,6 +163,7 @@
   import {
   import {
     deleteDevice,
     deleteDevice,
     devicePage,
     devicePage,
+    checkDeviceOccupied,
     cancelDispatchCustomer,
     cancelDispatchCustomer,
     getGATEWAY,
     getGATEWAY,
   } from '/@/api/device/deviceManager';
   } from '/@/api/device/deviceManager';
@@ -209,6 +210,7 @@
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
+
       const [registerTable, { reload, setSelectedRowKeys, setProps }] = useTable({
       const [registerTable, { reload, setSelectedRowKeys, setProps }] = useTable({
         title: '设备列表',
         title: '设备列表',
         api: devicePage,
         api: devicePage,
@@ -265,8 +267,16 @@
       }
       }
       // 取消分配客户
       // 取消分配客户
       async function handleCancelDispatchCustomer(record: Recordable) {
       async function handleCancelDispatchCustomer(record: Recordable) {
-        await cancelDispatchCustomer(record);
-        handleReload();
+        try {
+          // 该设备是否正在被场景联动使用中？
+          const isEnabled = await checkDeviceOccupied(record.id);
+          if (!isEnabled) {
+            await cancelDispatchCustomer(record);
+            handleReload();
+          } else {
+            createMessage.warn('该设备正在使用中~');
+          }
+        } catch {}
       }
       }
 
 
       function handleDetail(record: Recordable) {
       function handleDetail(record: Recordable) {