Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/services/websocket-incoming.service.ts

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-09-24 16:34:47
  * @LastEditors: seimin
- * @LastEditTime: 2024-09-29 15:41:54
+ * @LastEditTime: 2024-11-28 03:12:59
  * @Description: 来电弹屏websocket服务
  */
 import { Injectable } from "@angular/core";
@@ -24,8 +24,8 @@ export class WebsocketIncomingService {
 
   // 连接websocket { userCount }
   private user = JSON.parse(localStorage.getItem("user")); //用户信息
-  connectWs(): Observable<any> {
-    let userCount = this.user.user.account + "|" + this.getPhoneNumber();
+  connectWs(phoneNumber): Observable<any> {
+    let userCount = this.user.user.account + "|" + phoneNumber;
     if(this.getSign() === 'box'){
       return this.phoneService.connectWs(http.phoneWs, { userCount });
     }

src/app/services/websocket-phone.service.ts

@@ -2,7 +2,7 @@
  * @Author: seimin
  * @Date: 2024-03-11 11:11:09
  * @LastEditors: seimin
- * @LastEditTime: 2024-09-24 16:38:23
+ * @LastEditTime: 2024-11-28 03:03:38
  * @Description: 录音盒websocket服务
  */
 import { Injectable } from "@angular/core";
@@ -60,15 +60,17 @@ export class WebsocketPhoneService {
       console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
       this.ws = null;
       console.log(response)
-      if (!this.isHandler && response.status === 408) {
+      if (!this.isHandler && response.status === 408 && sessionStorage.getItem('phoneNumber')) {
         this.reconnect(this.url, this.urlParams);
+      }else{
+        this.updateProperty(false);
       }
     };
 
     request.onError = (response) => {
       console.log("ws连接错误", this.isHandler);
       this.ws = null;
-      if (response.status === 0) {
+      if (response.status === 0 && sessionStorage.getItem('phoneNumber')) {
         this.reconnect(this.url, this.urlParams);
       }
     };
@@ -119,4 +121,17 @@ export class WebsocketPhoneService {
       this.ws.close();
     }
   }
+
+  // 创建一个Subject来发送和接收数据
+  private updateData = new Subject<any>();
+
+  // 提供一个方法来发送数据
+  updateProperty(data: any) {
+    this.updateData.next(data);
+  }
+
+  // 提供一个方法来订阅数据
+  getDataUpdate(): Subject<any> {
+    return this.updateData;
+  }
 }

src/app/views/fuwutai/fuwutai.component.html

@@ -926,7 +926,7 @@
           </button>
         </div>
       </div>
-      <div class="fixedMenu" *ngIf="!websocketLoading && !incomingService.getPhoneNumber()">
+      <div class="fixedMenu" *ngIf="!incomingService.getPhoneNumber()">
         <div class="menuItems">
           <button nz-button nzType="link" class="item itemLink" (click)="showBindExtensionNumber()">
             绑定分机

src/app/views/fuwutai/fuwutai.component.ts

@@ -116,7 +116,12 @@ export class FuwutaiComponent implements OnInit {
     private http: HttpClient,
     public route: ActivatedRoute,
     public incomingService: WebsocketIncomingService,
-  ) {}
+  ) {
+    // 在组件中订阅服务的Observable
+    this.phones.getDataUpdate().subscribe(data => {
+      this.websocketLoading = data;
+    });
+  }
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
   // ---------------------------------------
@@ -804,6 +809,7 @@ export class FuwutaiComponent implements OnInit {
     TLWSA.onOpenreturn = (err) => {
       err = Number(err);
       if (!err) {
+        _this.incomingService.setPhoneNumber(TLWSA.phoneNumber);
         _this.websocketLoading = false;
         _this.cancelBindExtensionNumber();
         console.log('呼叫中心连接成功-----seimin');
@@ -888,12 +894,17 @@ export class FuwutaiComponent implements OnInit {
       clearTimeout(timer);
       if(location.hash === '#/dispatchingDesk'){
         console.log('与服务器网络连接中断-----seimin');
-        _this.msg.info('与服务器网络连接中断,2分钟后重连')
-        console.log('2分钟后自动重连-----seimin')
-        timer = setTimeout(function () {
-          //连接
-          tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
-        }, 120000)
+        if(this.incomingService.getPhoneNumber()){
+          _this.msg.info('与服务器网络连接中断,2分钟后重连')
+          console.log('2分钟后自动重连-----seimin')
+          timer = setTimeout(function () {
+            //连接
+            TLWSA.phoneNumber = _this.incomingService.getPhoneNumber();
+            tlwsa.tlaOpen(_this.incomingService.getSocketUrl());
+          }, 120000)
+        }else{
+          _this.websocketLoading = false;
+        }
       }
     }
     //签入回调函数
@@ -1349,14 +1360,15 @@ export class FuwutaiComponent implements OnInit {
 
   showBindExtensionNumber() {
     this.showBindExtensionNumberModal = true;
+    this.websocketLoading = false;
   }
 
   // 保存绑定分机-签入
   checkIn(phoneNumber){
     this.websocketLoading = true;
-    this.incomingService.setPhoneNumber(phoneNumber);
+    // this.incomingService.setPhoneNumber(phoneNumber);
     this.incomingService.closeWs(true);
-    this.getWebsocketPhone();
+    this.getWebsocketPhone(phoneNumber);
   }
 
   // 签出
@@ -1385,11 +1397,11 @@ export class FuwutaiComponent implements OnInit {
     // tel1: '',//目的号码对象
     // tel2: '',//转接坐席对象
   }
-  getWebsocketPhone() {
+  getWebsocketPhone(phoneNumber) {
     const sign = this.incomingService.getSign();
     if(sign === 'box'){
       // 录音盒
-      this.incomingService.connectWs().subscribe((data) => {
+      this.incomingService.connectWs(phoneNumber).subscribe((data) => {
         // data = { status: 201, phone: '013581394341' };//ceshi
         console.log(data);
         console.log(this.incidentModel);
@@ -1397,6 +1409,7 @@ export class FuwutaiComponent implements OnInit {
 
         // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
+          this.incomingService.setPhoneNumber(phoneNumber);
           this.incidentModel = {};
           this.incidentMsg = {};
           this.incidentModel.callID = data.callId || undefined;
@@ -1426,6 +1439,7 @@ export class FuwutaiComponent implements OnInit {
       // 呼叫中心----start
       this.preState = '';
       //连接
+      TLWSA.phoneNumber = phoneNumber;
       tlwsa.tlaOpen(this.incomingService.getSocketUrl());
     }else{
       this.websocketLoading = false;
@@ -2485,7 +2499,7 @@ export class FuwutaiComponent implements OnInit {
       this.incomingService.removePhoneNumber();
     }
     if (this.incomingService.getPhoneNumber()) {
-      this.getWebsocketPhone();
+      this.getWebsocketPhone(this.incomingService.getPhoneNumber());
     }else{
       this.websocketLoading = false;
     }