mdm-client 1.0.2 → 1.0.3

package/src/components/LiveMultipleMeeting/LiveMultipleMeeting.vue

@@ -441,18 +441,10 @@ export default {
       type: String,
       default: "launch",
     },
-    isCustomizeMiniInvitations: {
-      type: Boolean,
-      default: false,
-    },
     miniPagePath: {
       type: String,
       default: "",
     },
-    defaultInviteWay: {
-      type: String,
-      default: "identity",
-    },
     isInMeeting: {
       type: Boolean,
       default: false,
@@ -1120,16 +1112,16 @@ export default {
       if (this.inviteNum <= 0) {
         this.inviteList.push(userItem);
       } else {
-        if (this.judgePersonIsInvited(userItem.id) < 0) {
+        if (this.judgePersonIsInvited(userItem.phone) < 0) {
           this.inviteList.push(userItem);
         }
       }
     },
     // 判断是否已经在邀请列表中
-    judgePersonIsInvited(id) {
+    judgePersonIsInvited(phone) {
       if (this.inviteNum > 0) {
         let index = this.inviteList.findIndex((item) => {
-          return item.id === id;
+          return item.phone === phone;
         });
         return index;
       } else {
@@ -1367,16 +1359,27 @@ export default {
         this.$emit("meetingStart");
         if (this.joinType == "launch") {
           // 发送邀请信息
-          this.sendInviteMessage([], this.defaultInviteWay == "mini" ? 3 : 0);
+          this.sendInviteMessage([]);
           // 拉取监控设备
-          this.deviceNum > 0 &&
-            this.deviceList.forEach((item) => {
-              if (item.source == "监控") {
-                this.pullMonitorDevice(item.monitorID, item.label);
-              } else if (item.source == "设备") {
-                this.pullMonitorDevice(item.equipmentID, item.label);
-              }
-            });
+          // 使用批量外呼替换逐条外呼
+          if (this.deviceNum > 0 && this.deviceList) {
+            const deviceCalls = this.deviceList
+              .map(item => {
+                const id = item?.source === '监控' ? item?.monitorID : item?.equipmentID;
+                return id ? { dnis: id, name: item.label } : null;
+              })
+              .filter(Boolean);
+
+            if (deviceCalls.length > 0) {
+              this.liveClient.makeBatchCall(deviceCalls, 1)
+                .then(() => {
+                  this.showMessage.message('success', '监控设备批量外呼已发起');
+                })
+                .catch(err => {
+                  this.showMessage.message('error', `批量拉取监控设备失败: ${err?.message || err}`);
+                });
+            }
+          }
         }
         // 启动获取未入会和邀请人员轮询
         this.startUnjoinParticipantPolling();
@@ -1476,6 +1479,18 @@ export default {
           }
         }
       });
+      this.liveClient.on("resMeetingRefresh", this.handleResMeetingRefresh);
+    },
+    handleResMeetingRefresh: (e) => {
+      console.log('resMeetingRefresh事件触发', e);
+      
+      if(e.includes("queryAllInvite") || e.includes("queryUnjoined")) {
+        console.log('this', this, this.getUnjoinParticipant);
+        
+        this.getUnjoinParticipant();
+        this.queryAllInviteParticipant();
+        this.startUnjoinParticipantPolling();
+      }
     },
     handleRoomDataReceived(e) {
       switch (e.topic) {
@@ -1765,73 +1780,199 @@ export default {
         clearInterval(this.unjoinParticipantInterval);
         this.unjoinParticipantInterval = null;
       }
-
-      // 立即执行一次
-      this.getUnjoinParticipant();
-      this.queryAllInviteParticipant();
       // 设置5秒间隔的轮询
       this.unjoinParticipantInterval = setInterval(() => {
         this.getUnjoinParticipant();
         this.queryAllInviteParticipant();
-      }, 6000);
+      }, 30000);
     },
     initLiveClient() {
       this.liveClient = window["liveClient"];
       this.initLiveClientEvent();
     },
-    sendInviteMessage(tempList = [], inviteWay = 0) {
-      if (tempList.length <= 0) {
-        if (this.tempInviteList.length > 0) {
-          this.liveClient
-            .inviteParticipant(
-              this.meetingNum,
-              this.tempInviteList.map((item) => {
-                return {
-                  userName: item.label,
-                  identity: item?.loginCode ? item.loginCode : item.phone,
-                  phone: item.phone,
-                };
-              }),
-              false,
-              inviteWay
-            )
-            .then((res) => {
-              if (res.code == 200) {
-                this.showMessage.message("success", "成功发送邀请");
-                this.tempInviteList.forEach((item) => {
-                  this.addToInviteList(item);
-                });
-                this.getUnjoinParticipant();
-                this.queryAllInviteParticipant();
+    sendInviteMessage(tempList = []) {
+      // 确定使用的邀请列表
+      const inviteList = tempList.length <= 0 ? this.tempInviteList : tempList;
+      
+      if (!inviteList || inviteList.length <= 0) {
+        console.log('没有邀请人员');
+        return;
+      }
+
+      // 去重处理：按 phone 字段去重，按优先级保留
+      const deduplicatedList = [];
+      const phoneMap = new Map();
+
+      // 定义优先级：人员 > 组织架构/外部 > volte > 常用分组 > 未知
+      const getPriority = (source) => {
+        if (source === '人员') return 1;
+        if (source === '组织架构' || source === '外部') return 2;
+        if (source === 'volte') return 3;
+        if (source === '常用分组') return 4;
+        return 5; // 未知类型优先级最低
+      };
+
+      // 第一轮：处理非常用分组的项目，建立 phoneMap
+      inviteList.forEach((item, index) => {
+        const phone = item.phone;
+        if (!phone) {
+          // 没有 phone 字段的直接加入
+          deduplicatedList.push(item);
+          return;
+        }
+
+        // 如果是常用分组，先跳过，后续单独处理
+        if (item.source === '常用分组') {
+          return;
+        }
+
+        const existing = phoneMap.get(phone);
+        if (!existing) {
+          // 第一次遇到这个 phone
+          phoneMap.set(phone, { item, index });
+        } else {
+          // 已存在相同 phone，比较优先级
+          const existingPriority = getPriority(existing.item.source);
+          const currentPriority = getPriority(item.source);
+          
+          if (currentPriority < existingPriority) {
+            // 当前项优先级更高，替换
+            phoneMap.set(phone, { item, index });
+          } else if (currentPriority === existingPriority && index < existing.index) {
+            // 优先级相同，保留顺序靠前的
+            phoneMap.set(phone, { item, index });
+          }
+          // 否则保持原有的
+        }
+      });
+
+      // 第二轮：处理常用分组项目，根据 original 字段分类
+      const commonGroupItems = inviteList.filter(item => item.source === '常用分组');
+      commonGroupItems.forEach((item, index) => {
+        const phone = item.phone;
+        if (!phone) {
+          // 没有 phone 字段的直接加入
+          deduplicatedList.push(item);
+          return;
+        }
+
+        // 如果 phone 已经在 phoneMap 中，跳过（已有更高优先级的项）
+        if (phoneMap.has(phone)) {
+          return;
+        }
+
+        // 根据 original 字段确定实际的 source
+        let actualSource = item.original;
+        
+        // 如果 original 字段无效，默认为组织架构
+        if (!actualSource || !['人员', '组织架构', 'volte', '外部'].includes(actualSource)) {
+          actualSource = '组织架构';
+        }
+
+        // 创建新的项目，使用 original 作为实际 source
+        const processedItem = {
+          ...item,
+          source: actualSource
+        };
+
+        // 添加到 phoneMap
+        phoneMap.set(phone, { item: processedItem, index: index + inviteList.length });
+      });
+
+      // 将去重后的项添加到结果列表
+      phoneMap.forEach(({ item }) => {
+        if (!deduplicatedList.find(existing => existing.phone === item.phone)) {
+          deduplicatedList.push(item);
+        }
+      });
+
+      // 按 source 分组处理
+      const personList = [];
+      const orgAndExternalList = [];
+      const volteList = [];
+
+      deduplicatedList.forEach(item => {
+        if (item.source === '人员') {
+          personList.push(item);
+        } else if (item.source === '组织架构' || item.source === '外部') {
+          orgAndExternalList.push(item);
+        } else if (item.source === 'volte') {
+          volteList.push(item);
+        }
+      });
+
+      // 发送邀请
+      const promises = [];
+
+      // 处理人员邀请（invitationMethod = 0）
+      if (personList.length > 0) {
+        const personInviteData = personList.map(item => ({
+          userName: item.label,
+          identity: item?.loginCode ? item.loginCode : item.phone,
+          phone: item.phone
+        }));
+        
+        promises.push(
+          this.liveClient.inviteParticipant(this.meetingNum, personInviteData, false, 0)
+            .then(res => {
+              if (res.code === 200) {
+                personList.forEach(item => this.addToInviteList(item));
               } else {
-                this.showMessage.message("error", res?.msg);
+                this.showMessage.message("error", `邀请人员失败: ${res?.msg}`);
               }
-            });
-        }
-      } else {
-        this.liveClient
-          .inviteParticipant(
-            this.meetingNum,
-            tempList.map((item) => {
-              return {
-                userName: item.label,
-                identity: item?.loginCode ? item.loginCode : item.phone,
-                phone: item.phone,
-              };
-            }),
-            false,
-            inviteWay
-          )
-          .then((res) => {
-            if (res.code == 200) {
-              this.showMessage.message("success", "成功发送邀请");
-              this.getUnjoinParticipant();
-              this.queryAllInviteParticipant();
-            } else {
-              this.showMessage.message("error", res?.msg);
-            }
-          });
+            })
+            .catch(err => {
+              this.showMessage.message("error", `邀请人员失败: ${err.message}`);
+            })
+        );
+      }
+
+      // 处理组织架构和外部邀请（invitationMethod = 3）
+      if (orgAndExternalList.length > 0) {
+        const orgInviteData = orgAndExternalList.map(item => ({
+          userName: item.label,
+          identity: item?.loginCode ? item.loginCode : item.phone,
+          phone: item.phone
+        }));
+        
+        promises.push(
+          this.liveClient.inviteParticipant(this.meetingNum, orgInviteData, false, 3)
+            .then(res => {
+              if (res.code === 200) {
+                orgAndExternalList.forEach(item => this.addToInviteList(item));
+              } else {
+                this.showMessage.message("error", `邀请组织/外部人员失败: ${res?.msg}`);
+              }
+            })
+            .catch(err => {
+              this.showMessage.message("error", `邀请组织/外部人员失败: ${err.message}`);
+            })
+        );
+      }
+
+      // 处理 volte 呼叫
+      if (volteList.length > 0) {
+        // 构建批量外呼数据
+        const volteCalls = volteList.map(item => ({
+          dnis: item.phone,
+          name: item.label
+        }));
+        
+        promises.push(
+          this.liveClient.makeBatchCall(volteCalls)
+            .then(() => {
+              volteList.forEach(item => this.addToInviteList(item));
+            })
+            .catch(err => {
+              this.showMessage.message("error", `批量呼叫失败: ${err.message}`);
+            })
+        );
       }
+
+      // 等待所有邀请完成后更新列表
+      Promise.allSettled(promises).then(() => {
+        // 可以在这里添加统一的后续处理，如刷新邀请列表
+      });
     },
     queryAllInviteParticipant() {
       this.liveClient.getAllInviteParticipant(this.meetingNum).then((res) => {
@@ -2897,7 +3038,7 @@ export default {
       this.liveClient.deleteUnjoinParticipant(this.meetingNum, item.identity).then((res) => {
         if (res.code == 200) {
           this.showMessage.message("success", "成功删除未入会人员");
-          this.getUnjoinParticipant();
+          // this.getUnjoinParticipant();
           this.removeFromInviteList(item.identity);
         } else {
           this.showMessage.message("error", res?.msg);
@@ -3188,28 +3329,8 @@ export default {
         e.forEach((item) => {
           this.addToInviteList(item);
         });
+        this.sendInviteMessage(e)
       }
-      let tempList = [];
-      let index = -1;
-      this.inviteList.forEach((item) => {
-        if (this.invitedNum > 0) {
-          index = this.tempInvitedList.findIndex((ele) => {
-            if (item?.loginCode) {
-              return ele.identity === item.loginCode;
-            } else {
-              return ele.identity === item.phone;
-            }
-          });
-          if (index < 0) {
-            // 当前人员尚未被邀请
-            tempList.push(item);
-          }
-        } else {
-          tempList.push(item);
-        }
-      });
-
-      this.sendInviteMessage(tempList, this.defaultInviteWay == "mini" ? 3 : 0);
     },
     async appendInviteDevice(e) {
       console.log("通讯录邀请设备", e);
@@ -3309,17 +3430,17 @@ export default {
     },
     appendInvite(e, inviteWay) {
       let tempList = [];
-      let tempDeviceList = [];
+      let tempDeviceList = []
       let index = -1;
       if (e && e.length > 0) {
         e.forEach((item) => {
-          if (item.source == "人员") {
+          if(item.source == "人员") {
             if (this.invitedNum > 0) {
               index = this.tempInvitedList.findIndex((ele) => {
-                if (item?.loginCode) {
-                  return ele.identity === item.loginCode;
+                if(item?.loginCode) {
+                  return ele.identity === item.loginCode
                 } else {
-                  return ele.identity === item.phone;
+                  return ele.identity === item.phone
                 }
               });
               if (index < 0) {
@@ -3331,21 +3452,87 @@ export default {
             }
             this.addToInviteList(item);
           } else {
-            tempDeviceList.push(item);
+            tempDeviceList.push(item)
           }
         });
         console.log("本次追加邀请人员", tempList);
         console.log("本次追加邀请设备", tempDeviceList);
-        this.sendInviteMessage(tempList, inviteWay == "mini" ? 3 : 0);
-        if (tempDeviceList.length > 0) {
-          tempDeviceList.forEach((item) => {
-            if (item.source == "设备") {
-              this.pullMonitorDevice(item.equipmentID, item.label);
-            } else if (item.source == "监控") {
-              this.pullMonitorDevice(item.monitorID, item.label);
-            }
+        // 追加邀请人员
+        if(tempList.length > 0) {
+          const promises = [];
+          if(inviteWay == "identity") {
+            const applicationInviteData = tempList.map(item => {
+              return {
+                userName: item?.label || item?.userName || '未知用户',
+                identity: item?.loginCode || item.phone,
+                phone: item.phone,
+              }
+            })
+            promises.push(
+              this.liveClient.inviteParticipant(this.meetingNum, applicationInviteData, false, 0)
+                .then(res => {
+                  if (res.code === 200) {
+                    console.log("邀请用户成功", applicationInviteData);
+                  } else {
+                    this.showMessage.message("error", `邀请用户失败: ${res?.msg}`);
+                  }
+                })
+                .catch(err => {
+                  this.showMessage.message("error", `邀请用户失败: ${err.message}`);
+                })
+            );
+          } else if(inviteWay == "volte") {
+            const volteCalls = tempList.map(item => {
+              return {
+                dnis: item.phone,
+                name: item?.label || item?.userName || '未知用户'
+              }
+            })
+            promises.push(
+              this.liveClient.makeBatchCall(volteCalls)
+                .then(() => {
+                  console.log("批量呼叫成功", volteCalls);
+                })
+                .catch(err => {
+                  this.showMessage.message("error", `批量呼叫失败: ${err.message}`);
+                })
+            );
+          } else if(inviteWay == "mini") {
+            const miniInviteData = tempList.map(item => {
+              return {
+                userName: item?.label || item?.userName || '未知用户',
+                phone: item.phone,
+                identity: item?.loginCode || item.phone,
+              }
+            })
+            promises.push(
+              this.liveClient.inviteParticipant(this.meetingNum, miniInviteData, false, 3)
+                .then(res => {
+                  if (res.code === 200) {
+                    console.log("邀请用户成功", miniInviteData);
+                  } else {
+                    this.showMessage.message("error", `邀请用户失败: ${res?.msg}`);
+                  }
+                })
+                .catch(err => {
+                  this.showMessage.message("error", `邀请用户失败: ${err.message}`);
+                })
+            )
+          }
+          Promise.allSettled(promises).then(() => {
+            // 添加邀请成功后统一的后续处理
           });
         }
+        // 追加邀请设备
+        if(tempDeviceList.length > 0) {
+          tempDeviceList.forEach(item => {
+            if(item.source == "设备") {
+              pullMonitorDevice(item.equipmentID, item.label)
+            } else if(item.source == "监控") {
+              pullMonitorDevice(item.monitorID, item.label)
+            }
+          })
+        }
       }
     },
     pullMonitorDevice(monitorID, monitorName) {
@@ -3365,51 +3552,113 @@ export default {
 
     async sendAppendInviteMessage(uninviteList = []) {
       // 政协项目新增
-      if (this.isCustomizeMiniInvitations) {
-        this.$emit("inviteMessageSend", {
-          inviteUserList: uninviteList,
-          meetingName: this.meetingName,
-          meetingNum: this.meetingNum,
-          fromUser: this.userData.username,
+      if (uninviteList.length > 0) {
+        // 按 platformID 分组处理
+        const platformGroup = {
+          '1_2': [], // platformID 为 1 或 2
+          '7': [],   // platformID 为 7
+          '4': []    // platformID 为 4
+        };
+
+        uninviteList.forEach(item => {
+          const { userName, identity, phone, platformID } = item;
+          
+          if (platformID === 30) {
+            platformGroup['1_2'].push({ userName, identity, phone });
+          } else if (platformID === 7) {
+            platformGroup['7'].push({ userName, identity, phone });
+          } else if (platformID === 4) {
+            platformGroup['4'].push({ userName, identity, phone });
+          }
         });
-      } else {
-        if (uninviteList.length > 0) {
-          this.liveClient
-            .inviteParticipant(
-              this.meetingNum,
-              uninviteList.map((item) => {
-                return {
-                  userName: item.userName,
-                  identity: item.identity,
-                  phone: item.phone,
-                };
+
+        const promises = [];
+
+        // 处理 platformID 为 1 或 2 的邀请（invitationMethod = 0）
+        if (platformGroup['1_2'].length > 0) {
+          promises.push(
+            this.liveClient.inviteParticipant(this.meetingNum, platformGroup['1_2'], false, 0)
+              .then(res => {
+                if (res.code === 200) {
+                  platformGroup['1_2'].forEach(item => {
+                    const inviteItem = uninviteList.find(u => u.identity === item.identity);
+                    if (inviteItem) this.addToInviteList(inviteItem);
+                  });
+                } else {
+                  this.showMessage.message("error", `邀请用户失败 (platformID 1/2): ${res?.msg}`);
+                }
               })
-            )
-            .then((res) => {
-              if (res.code == 200) {
-                this.showMessage.message("success", "成功发送邀请");
-                this.getUnjoinParticipant();
-              } else {
-                this.showMessage.message("error", res?.msg);
-              }
-            });
+              .catch(err => {
+                this.showMessage.message("error", `邀请用户失败 (platformID 1/2): ${err.message}`);
+              })
+          );
+        }
+
+        // 处理 platformID 为 7 的邀请（invitationMethod = 3）
+        if (platformGroup['7'].length > 0) {
+          promises.push(
+            this.liveClient.inviteParticipant(this.meetingNum, platformGroup['7'], false, 3)
+              .then(res => {
+                if (res.code === 200) {
+                  platformGroup['7'].forEach(item => {
+                    const inviteItem = uninviteList.find(u => u.identity === item.identity);
+                    if (inviteItem) this.addToInviteList(inviteItem);
+                  });
+                } else {
+                  this.showMessage.message("error", `邀请用户失败 (platformID 7): ${res?.msg}`);
+                }
+              })
+              .catch(err => {
+                this.showMessage.message("error", `邀请用户失败 (platformID 7): ${err.message}`);
+              })
+          );
+        }
+
+        // 处理 platformID 为 4 的呼叫
+        if (platformGroup['4'].length > 0) {
+          // 构建批量外呼数据
+          const volteCalls = platformGroup['4'].map(item => ({
+            dnis: item.phone,
+            name: item.userName
+          }));
+          
+          promises.push(
+            this.liveClient.makeBatchCall(volteCalls)
+              .then(() => {
+                platformGroup['4'].forEach(item => {
+                  const inviteItem = uninviteList.find(u => u.identity === item.identity);
+                  if (inviteItem) this.addToInviteList(inviteItem);
+                });
+              })
+              .catch(err => {
+                this.showMessage.message("error", `批量呼叫失败 (platformID 4): ${err.message}`);
+              })
+          );
         }
+
+        // 等待所有邀请完成后更新列表
+        Promise.allSettled(promises).then(() => {
+          // 可以在这里添加统一的后续处理，如刷新邀请列表
+        });
       }
     },
     phoneCall(num) {
       this.liveClient.makeCall(num, num);
     },
     async miniCall(num) {
-      if (this.isCustomizeMiniInvitations) {
-        this.$emit("miniInviteSend", {
-          inviteMobile: num,
-          fromUser: this.userData.username,
-          meetingName: this.meetingName,
-          meetingNum: this.meetingNum,
-        });
-      } else {
-        this.showMessage.message("info", "当前功能暂未实现");
-      }
+      this.liveClient.inviteParticipant(this.meetingNum, [{
+        userName: num,
+        phone: num,
+        identity: num,
+      }], false, 3).then(res => {
+        if (res.code === 200) {
+          this.showMessage.message("success", "成功邀请小程序用户");
+        } else {
+          this.showMessage.message("error", `邀请小程序用户失败: ${res?.msg}`);
+        }
+      }).catch(err => {
+        this.showMessage.message("error", `邀请小程序用户失败: ${err.message}`);
+      });
     },
     sleep(waitTimeInMs) {
       return new Promise((resolve) => setTimeout(resolve, waitTimeInMs));
@@ -4113,10 +4362,11 @@ export default {
             this.liveClient.off(eventName);
           });
         }
+        this.liveClient.off("resMeetingRefresh", this.handleResMeetingRefresh);
       }
-    },
+    }
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>