ws抽离

package-lock.json

@@ -784,7 +784,7 @@
     },
     "@types/jquery": {
       "version": "3.5.6",
-      "resolved": "https://registry.nlark.com/@types/jquery/download/@types/jquery-3.5.6.tgz?cache=0&sync_timestamp=1629708196495&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fjquery%2Fdownload%2F%40types%2Fjquery-3.5.6.tgz",
+      "resolved": "https://registry.nlark.com/@types/jquery/download/@types/jquery-3.5.6.tgz",
       "integrity": "sha1-l6yONtzNitjtPz87SJM2FNn9jPA=",
       "dev": true,
       "requires": {
@@ -822,7 +822,7 @@
     },
     "@types/sizzle": {
       "version": "2.3.3",
-      "resolved": "https://registry.nlark.com/@types/sizzle/download/@types/sizzle-2.3.3.tgz?cache=0&sync_timestamp=1629709217852&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fsizzle%2Fdownload%2F%40types%2Fsizzle-2.3.3.tgz",
+      "resolved": "https://registry.nlark.com/@types/sizzle/download/@types/sizzle-2.3.3.tgz?cache=0&sync_timestamp=1621243834244&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fsizzle%2Fdownload%2F%40types%2Fsizzle-2.3.3.tgz",
       "integrity": "sha1-/14vGQKWnTBSJaBHyKD9XJFc6+8=",
       "dev": true
     },
@@ -1396,6 +1396,41 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "atmosphere.js": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/atmosphere.js/download/atmosphere.js-2.3.6.tgz",
+      "integrity": "sha1-177Y28qZHNOhQ8XzAjDJCU3/Zfs=",
+      "requires": {
+        "eventsource": "^0.1.6",
+        "npm": "^6.2.0",
+        "ws": "^1.0.1",
+        "xmlhttprequest": "^1.8.0"
+      },
+      "dependencies": {
+        "eventsource": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz?cache=0&sync_timestamp=1616041716084&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feventsource%2Fdownload%2Feventsource-0.1.6.tgz",
+          "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+          "requires": {
+            "original": ">=0.0.5"
+          }
+        },
+        "ultron": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npm.taobao.org/ultron/download/ultron-1.0.2.tgz",
+          "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
+        },
+        "ws": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmmirror.com/ws/download/ws-1.1.5.tgz?cache=0&sync_timestamp=1633200058938&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fws%2Fdownload%2Fws-1.1.5.tgz",
+          "integrity": "sha1-y9nm514J/F0skAFfIfDECHXg3VE=",
+          "requires": {
+            "options": ">=0.0.5",
+            "ultron": "1.0.x"
+          }
+        }
+      }
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fatob%2Fdownload%2Fatob-2.1.2.tgz",
@@ -5244,7 +5279,7 @@
     },
     "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/jquery/download/jquery-3.6.0.tgz?cache=0&sync_timestamp=1614705838607&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.6.0.tgz",
       "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA="
     },
     "js-tokens": {
@@ -9862,11 +9897,15 @@
         }
       }
     },
+    "options": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npm.taobao.org/options/download/options-0.0.6.tgz",
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
+    },
     "original": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/original/download/original-1.0.2.tgz",
       "integrity": "sha1-5EKmHP/hxf0gpl8yYcJmY7MD8l8=",
-      "dev": true,
       "requires": {
         "url-parse": "^1.4.3"
       }
@@ -10660,8 +10699,7 @@
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.nlark.com/querystringify/download/querystringify-2.2.0.tgz",
-      "integrity": "sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=",
-      "dev": true
+      "integrity": "sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y="
     },
     "randombytes": {
       "version": "2.1.0",
@@ -10905,8 +10943,7 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
       "version": "1.20.0",
@@ -12755,7 +12792,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npm.taobao.org/url-parse/download/url-parse-1.5.1.tgz",
       "integrity": "sha1-1fqYkK+KXh8nSiyYN2UQ9kJfbjs=",
-      "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -13660,6 +13696,11 @@
       "integrity": "sha1-vpuuHIoEbnazESdyY0fQrXACvrM=",
       "dev": true
     },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npm.taobao.org/xmlhttprequest/download/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
+    },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
       "resolved": "https://registry.nlark.com/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fxmlhttprequest-ssl%2Fdownload%2Fxmlhttprequest-ssl-1.5.5.tgz",

package.json

@@ -24,6 +24,7 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
+    "atmosphere.js": "2.3.6",
     "core-js": "^3.18.2",
     "crypto-js": "^3.3.0",
     "datatables.net": "^1.11.3",

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

@@ -0,0 +1,106 @@
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketIndexService {
+  constructor() {}
+  private lockReconnect = false; //避免ws重复连接
+  ws; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
+  private subject;
+  // 连接websocket
+  connectWs(url, data): Observable<any> {
+    this.url = url;
+    this.urlParams = data;
+    this.subject = new Subject<any>();
+    let request: any = {
+      url,
+      contentType: "application/json",
+      shared: true, // 标签共享
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        // alert(message);
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
+        }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
+      }
+    };
+
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(), this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    request.onError = (response) => {
+      console.log("ws连接错误", this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
+  }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 60000, //1分钟发一次心跳
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        _this.ws.push("ping");
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
+
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    this.ws.close();
+  }
+}

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

@@ -0,0 +1,106 @@
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketMainService {
+  constructor() {}
+  private lockReconnect = false; //避免ws重复连接
+  ws; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
+  private subject;
+  // 连接websocket
+  connectWs(url, data): Observable<any> {
+    this.url = url;
+    this.urlParams = data;
+    this.subject = new Subject<any>();
+    let request: any = {
+      url,
+      contentType: "application/json",
+      shared: true, // 标签共享
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        // alert(message);
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
+        }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
+      }
+    };
+
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    request.onError = (response) => {
+      console.log("ws连接错误",this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
+  }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 60000, //1分钟发一次心跳
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        _this.ws.push("ping");
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
+
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    this.ws.close();
+  }
+}

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

@@ -0,0 +1,106 @@
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketNurseService {
+  constructor() {}
+  private lockReconnect = false; //避免ws重复连接
+  ws; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
+  private subject;
+  // 连接websocket
+  connectWs(url, data): Observable<any> {
+    this.url = url;
+    this.urlParams = data;
+    this.subject = new Subject<any>();
+    let request: any = {
+      url,
+      contentType: "application/json",
+      shared: true, // 标签共享
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        // alert(message);
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
+        }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
+      }
+    };
+
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    request.onError = (response) => {
+      console.log("ws连接错误",this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
+  }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 60000, //1分钟发一次心跳
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        _this.ws.push("ping");
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
+
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    this.ws.close();
+  }
+}

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

@@ -1,65 +1,106 @@
-import { Injectable } from '@angular/core';
-import { Subject, Observable, from } from 'rxjs';
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: "root",
 })
 export class WebsocketPhoneService {
-
-  constructor() { }
-
-
-  ws: WebSocket;//定义websocket
+  constructor() {}
+  private lockReconnect = false; //避免ws重复连接
+  ws; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
   private subject;
-  flag = 1;//是否自动重连,1,正常,2，关闭，3，重连
   // 连接websocket
   connectWs(url, data): Observable<any> {
-    var postData = data;
-    if (this.ws != null) { this.ws.close() };
-    if (this.subject) { this.subject = null };
-    this.ws = new WebSocket(url);
+    this.url = url;
+    this.urlParams = data;
     this.subject = new Subject<any>();
-    let that = this;
-    this.ws.onopen = function (event) {
-      //socket 开启后执行，可以向后端传递信息
-      var sendData = JSON.stringify(postData)
-      that.ws.send(sendData);
-      console.log('open')
-    }
-    this.ws.onmessage = function (event) {
-      //socket 获取后端传递到前端的信息
-      console.log('onmessage')
-      if (event.data && event.data.length > 1) {
-        try {
-          that.subject.next(JSON.parse(event.data));
-        } catch (error) {
-          console.error('返回的值是'+event.data+'，无法解析');
+    let request: any = {
+      url,
+      contentType: "application/json",
+      shared: true, // 标签共享
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        // alert(message);
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
         }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
       }
-    }
+    };
 
-    this.ws.onerror = function (event) {
-      //socket error信息
-      console.log('error')
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
 
-    }
-    this.ws.onclose = function (event) {
-      //socket 关闭后执行
-      console.log('close')
-      console.log('websocket 断开: ' + event.code + ' ' + event.reason + ' ' + event.wasClean)
-      if(event.wasClean){
-        that.flag = 2;
-      }else{
-        that.flag = 3;
+    request.onError = (response) => {
+      console.log("ws连接错误",this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
       }
-    }
+    };
 
-    return that.subject.asObservable();
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
   }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 60000, //1分钟发一次心跳
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        _this.ws.push("ping");
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
 
-  // 断开websocket,true关闭，false，断线重连
-  closeWs() {
-    this.ws.close()
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    this.ws.close();
   }
 }
-

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

@@ -0,0 +1,106 @@
+import { Injectable } from "@angular/core";
+import { Subject, Observable, from } from "rxjs";
+import * as Atmosphere from "atmosphere.js";
+
+@Injectable({
+  providedIn: "root",
+})
+export class WebsocketSerService {
+  constructor() {}
+  private lockReconnect = false; //避免ws重复连接
+  ws; //定义websocket
+  private url = ""; //ws连接地址
+  private urlParams; //ws连接传参
+  private isHandler = false; //是否手动
+  private subject;
+  // 连接websocket
+  connectWs(url, data): Observable<any> {
+    this.url = url;
+    this.urlParams = data;
+    this.subject = new Subject<any>();
+    let request: any = {
+      url,
+      contentType: "application/json",
+      shared: true, // 标签共享
+      trackMessageLength: true, //校验数据完整性
+      transport: "websocket",
+    };
+
+    request.onOpen = (response) => {
+      console.log("ws连接成功" + new Date().toLocaleString());
+      this.heartCheck.reset().start(this);
+      this.ws.push(JSON.stringify(data));
+    };
+
+    request.onMessage = (response) => {
+      this.heartCheck.reset().start(this);
+      let message = response.responseBody;
+      try {
+        // alert(message);
+        console.log("收到消息" + message);
+        if (message !== "pong") {
+          this.subject.next(JSON.parse(message));
+        }
+      } catch (e) {
+        console.log("This doesn't look like a valid JSON: ", message);
+        return;
+      }
+    };
+
+    request.onClose = (response) => {
+      console.log("ws连接关闭" + new Date().toLocaleString(),this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    request.onError = (response) => {
+      console.log("ws连接错误",this.isHandler);
+      this.heartCheck.reset();
+      if (!this.isHandler) {
+        this.reconnect(this.url, this.urlParams);
+      }
+    };
+
+    this.ws = Atmosphere.subscribe(request);
+    return this.subject.asObservable();
+  }
+  //断线重连
+  private reconnect(url, data) {
+    if (this.lockReconnect) return;
+    this.lockReconnect = true;
+    setTimeout(() => {
+      //没连接上会一直重连，设置延迟避免请求过多
+      this.connectWs(url, data);
+      this.lockReconnect = false;
+    }, 15000);
+  }
+  private heartCheck = {
+    timeout: 60000, //1分钟发一次心跳
+    timeoutObj: null,
+    serverTimeoutObj: null,
+    reset: function () {
+      clearTimeout(this.timeoutObj);
+      clearTimeout(this.serverTimeoutObj);
+      return this;
+    },
+    start: function (_this) {
+      this.timeoutObj = setTimeout(() => {
+        //这里发送一个心跳，后端收到后，返回一个心跳消息，
+        //onmessage拿到返回的心跳就说明连接正常
+        _this.ws.push("ping");
+        this.serverTimeoutObj = setTimeout(() => {
+          //如果超过一定时间还没重置，说明后端主动断开了
+          _this.closeWs(); //如果onclose会执行reconnect，我们执行ws.close()就行了.如果直接执行reconnect 会触发onclose导致重连两次
+        }, this.timeout);
+      }, this.timeout);
+    },
+  };
+
+  // 断开websocket
+  closeWs(flag: boolean = false) {
+    this.isHandler = flag;
+    this.ws.close();
+  }
+}

src/app/services/websocket.service.ts

@@ -1,56 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Subject, Observable } from 'rxjs';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class WebsocketService {
-
-  constructor() { }
-  ws: WebSocket;//定义websocket
-  private subject;
-  // 连接websocket
-  connectWs(url, data): Observable<any> {
-    var postData = data;
-    if (this.ws != null) { this.ws.close() };
-    if (this.subject) { this.subject = null };
-    this.ws = new WebSocket(url);
-    this.subject = new Subject<any>();
-    let that = this;
-    this.ws.onopen = function (event) {
-      //socket 开启后执行，可以向后端传递信息
-      var sendData = JSON.stringify(postData)
-      that.ws.send(sendData);
-      console.log('open')
-    }
-    this.ws.onmessage = function (event) {
-      //socket 获取后端传递到前端的信息
-      console.log('onmessage')
-      if (event.data && event.data.length > 1) {
-        that.subject.next(JSON.parse(event.data));
-      }
-    }
-
-    this.ws.onerror = function (event) {
-      //socket error信息
-      console.log('error')
-
-    }
-    this.ws.onclose = function (event) {
-      //socket 关闭后执行
-      console.log('close')
-    }
-
-    return that.subject.asObservable();
-  }
-
-  // 断开websocket
-  closeWs() {
-    this.ws.close()
-  }
-
-
-
-
-
-}

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

@@ -9,8 +9,8 @@ import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 
 import { MainService } from "../../services/main.service";
-import { WebsocketService } from "../../services/websocket.service";
 import { WebsocketPhoneService } from "../../services/websocket-phone.service";
+import { WebsocketSerService } from "../../services/websocket-ser.service";
 import http from "../../../assets/js/http";
 
 import { NzMessageService } from "ng-zorro-antd/message";
@@ -104,8 +104,8 @@ export class FuwutaiComponent implements OnInit {
     private mainService: MainService,
     private msg: NzMessageService,
     private notification: NzNotificationService,
-    private webs: WebsocketService,
-    private phones: WebsocketPhoneService
+    private phones: WebsocketPhoneService,
+    private sers: WebsocketSerService
   ) {}
   validateFormZy!: FormGroup;
   validateFormQt!: FormGroup;
@@ -521,7 +521,7 @@ export class FuwutaiComponent implements OnInit {
       workOrderRemark: [null], //工单备注
     });
 
-    this.getWebsocket();
+    this.getWebsocketSer();
     this.initRole();
     this.initLogin();
     this.retract();
@@ -539,12 +539,12 @@ export class FuwutaiComponent implements OnInit {
     this.getUnassignedBuilding2();
   }
   ngOnDestroy() {
-    console.log("关闭ser", this.webs.ws);
     clearInterval(this.refreshTimerId);
-    clearInterval(this.timerWS);
-    this.webs.closeWs();
     if (this.phones.ws) {
-      this.phones.closeWs();
+      this.phones.closeWs(true);
+    }
+    if (this.sers.ws) {
+      this.sers.closeWs(true);
     }
   }
   unassignedSearchCon: string = ""; //未分派搜索框内容
@@ -608,39 +608,25 @@ export class FuwutaiComponent implements OnInit {
   }
 
   // 连接websocket
-  getWebsocket() {
-    let that = this;
-    this.webs
-      .connectWs(http.fwtWs, { userCount: that.user.user.account })
-      .subscribe((data) => {
-        console.log(data);
-        if (data && data.content) {
-          that.createBasicNotification(data);
+  getWebsocketSer() {
+    this.sers
+      .connectWs(http.fwtWs, { userCount: this.user.user.account })
+      .subscribe((result) => {
+        console.log(result);
+        if (result && result.content) {
+          this.createBasicNotification(result);
         }
-        that.windowResize();
+        this.windowResize();
       });
   }
-  // 监听ws
-  timerWS = null;
-  listenWs() {
-    clearInterval(this.timerWS);
-    this.timerWS = setInterval(() => {
-      console.log(this.phones.flag);
-      if (this.phones.flag == 3) {
-        this.getWebsocketPhone();
-      }
-    }, 15000);
-  }
   // 连接websocket---phone
   getWebsocketPhone() {
-    this.listenWs();
     let userCount =
       this.user.user.account + "|" + this.phoneNumListSelected.join("_");
     this.phones.connectWs(http.phoneWs, { userCount }).subscribe((data) => {
-      // data = { status: 201, phone: '013581394342' };//ceshi
+      // data = { status: 201, phone: '013581394341' };//ceshi
       console.log(data);
       if (data.status == 200 && data.phone) {
-        this.phones.flag = 1;
         localStorage.setItem("phones", data.phone);
         this.phoneNumListBind = data.phone.split("_");
         this.phoneNumListBind.forEach((item) => {
@@ -697,16 +683,18 @@ export class FuwutaiComponent implements OnInit {
   //确定绑定
   bindingOk() {
     if (this.phoneNumListSelected.length > 0) {
-      // setInterval(() => {
-      this.getWebsocketPhone(); //ceshi
-      // }, 5000)
+      if (this.phones.ws) {
+        this.phones.closeWs(true);
+      }
+      this.getWebsocketPhone();
     } else {
+      localStorage.removeItem("phones");
       this.binding = 3;
       this.phoneNumList.forEach((item) => {
         item.checked = false;
       });
       if (this.phones.ws) {
-        this.phones.closeWs();
+        this.phones.closeWs(true);
       }
     }
   }
@@ -2187,7 +2175,7 @@ export class FuwutaiComponent implements OnInit {
           that.showPromptModal("保存", true, "");
           // 关闭phone的websocket
           if (this.phones.ws) {
-            this.phones.closeWs();
+            this.phones.closeWs(true);
           }
           this.getPhoneNum(false);
           that.user.user.scope = data.data;

src/app/views/home/home.component.ts

@@ -1,90 +1,77 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from "@angular/router"
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 
 import { MainService } from "../../services/main.service";
-import { MyServiceService } from "../../services/my-service.service";
+// import { MyServiceService } from "../../services/my-service.service";
+import { WebsocketIndexService } from "../../services/websocket-index.service";
 import http from "../../../assets/js/http";
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
-import { ToolService } from '../../services/tool.service';
-
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
 
 @Component({
-  selector: 'app-home',
-  templateUrl: './home.component.html',
-  styleUrls: ['./home.component.less']
+  selector: "app-home",
+  templateUrl: "./home.component.html",
+  styleUrls: ["./home.component.less"],
 })
 export class HomeComponent implements OnInit {
-  @ViewChild('osComponentRef1', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef1: OverlayScrollbarsComponent;
-  @ViewChild('osComponentRef2', { read: OverlayScrollbarsComponent, static: false })
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
   osComponentRef2: OverlayScrollbarsComponent;
-  constructor(private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private mainService: MainService, private myService: MyServiceService, private tool: ToolService) {
-  }
+  constructor(
+    private fb: FormBuilder,
+    private router: Router,
+    private mainService: MainService,
+    // private myService: MyServiceService,
+    private myService: WebsocketIndexService,
+    private tool: ToolService
+  ) {}
 
   ngOnInit() {
     let that = this;
-    that.initForm()
-    that.getAllHos()
-    that.connectWs()
+    that.initForm();
+    that.getAllHos();
+    // that.connectWs();
+    this.getWebsocketIndex();
   }
 
-  ws: WebSocket;//定义websocket
-  validateForm: FormGroup;//新增/编辑表单
-
-  promptContent: string;//操作提示框提示信息
-  ifSuccess: boolean;//操作成功/失败
-  promptInfo: string;//操作结果提示信息
-  promptModalShow: boolean;//操作提示框是否展示
-
-
-  //socket连接
-  wsData;//socket返回的数据
-  groupOrders = [];//当前各小组工单执行情况
-  userSituation: any = {};//用户信息
-  orderSituation: any = {};//工单信息
-  connectWs() {
-    if (this.ws != null) { this.ws.close() };
-    this.ws = new WebSocket(http.homeWs);
-    let that = this;
-    this.ws.onopen = function (event) {
-      //socket 开启后执行，可以向后端传递信息
-      var data = JSON.stringify({ hosIds: that.hosIds })
-      that.ws.send(data);
-    }
-    this.ws.onmessage = function (event) {
-      //socket 获取后端传递到前端的信息
-      if (event.data && event.data.length > 1) {
-        that.wsData = JSON.parse(event.data)
-        if (that.wsData.groupOrders && that.wsData.groupOrders.status == 200) {
-          that.groupOrders = that.wsData.groupOrders.data;
+  validateForm: FormGroup; //新增/编辑表单
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  //连接ws
+  groupOrders = []; //当前各小组工单执行情况
+  userSituation: any = {}; //用户信息
+  orderSituation: any = {}; //工单信息
+  getWebsocketIndex() {
+    this.myService
+      .connectWs(http.homeWs, { hosIds: this.hosIds })
+      .subscribe((result) => {
+        console.log(result);
+        if (result.groupOrders && result.groupOrders.status == 200) {
+          this.groupOrders = result.groupOrders.data;
         }
-        if (that.wsData.userSituation) {
-          that.userSituation = that.wsData.userSituation;
+        if (result.userSituation) {
+          this.userSituation = result.userSituation;
         }
-        if (that.wsData.orderSituation) {
-          that.orderSituation = that.wsData.orderSituation;
+        if (result.orderSituation) {
+          this.orderSituation = result.orderSituation;
         }
-      }
-    }
-
-    this.ws.onerror = function (event) {
-      //socket error信息
-      console.log('error')
-    }
-    this.ws.onclose = function () {
-      //socket 关闭后执行
-      setTimeout(() => {
-        that.connectWs();
-      }, 15000);
-    }
+      });
   }
-
   ngOnDestroy() {
-    clearInterval(this.moveId)
-    clearInterval(this.moveId1)
-    console.log('首页关闭')
-    this.ws.close()
+    clearInterval(this.moveId);
+    clearInterval(this.moveId1);
+    this.myService.closeWs(true);
   }
   // 小组好评
   groupInfo = [];
@@ -95,18 +82,20 @@ export class HomeComponent implements OnInit {
       hosIds: that.hosIds,
     };
     this.loading1 = true;
-    that.mainService.postCustom('index', 'groupEvaTop', postData).subscribe(data => {
-      this.loading1 = false;
-      that.groupInfo = data.data || []
-      if (data.data && data.data.length) {
-        data.data.forEach(e => {
-          e.value = e.percent
-        });
-        this.groupChart(data.data)
-      } else {
-        this.groupChart([])
-      }
-    })
+    that.mainService
+      .postCustom("index", "groupEvaTop", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        that.groupInfo = data.data || [];
+        if (data.data && data.data.length) {
+          data.data.forEach((e) => {
+            e.value = e.percent;
+          });
+          this.groupChart(data.data);
+        } else {
+          this.groupChart([]);
+        }
+      });
   }
   // 好评Echarts
   groupOption;
@@ -114,12 +103,12 @@ export class HomeComponent implements OnInit {
     let labels = [];
     let nums = [];
     if (datas.length) {
-      datas.forEach(e => {
-        labels.push(e.name)
-        nums.push(e.percent - 0)
+      datas.forEach((e) => {
+        labels.push(e.name);
+        nums.push(e.percent - 0);
       });
     }
-    console.log(labels, nums)
+    console.log(labels, nums);
     var dataShadow = [];
 
     for (var i = 0; i < datas.length; i++) {
@@ -127,140 +116,137 @@ export class HomeComponent implements OnInit {
     }
     this.groupOption = {
       grid: {
-        left: '10',
-        right: '100',
-        top: '0',
-        bottom: '0',
-        containLabel: true
+        left: "10",
+        right: "100",
+        top: "0",
+        bottom: "0",
+        containLabel: true,
       },
       xAxis: {
-        show: ''
+        show: "",
       },
       yAxis: {
-        type: 'category',
+        type: "category",
         data: labels,
         axisLabel: {
           margin: 15,
           textStyle: {
-            color: '#666'
-          }
+            color: "#666",
+          },
         },
         axisTick: {
           lineStyle: {
-            color: '#fff'
-          }
+            color: "#fff",
+          },
         },
         axisLine: {
           lineStyle: {
-            color: '#fff'
-          }
-        }
+            color: "#fff",
+          },
+        },
       },
       series: [
-        { // For shadow
-          type: 'bar',
+        {
+          // For shadow
+          type: "bar",
           itemStyle: {
-            color: 'rgba(0,0,0,0.04)'
+            color: "rgba(0,0,0,0.04)",
           },
-          barGap: '-100%',
-          barCategoryGap: '26',
-          barWidth: '26',
+          barGap: "-100%",
+          barCategoryGap: "26",
+          barWidth: "26",
           data: dataShadow,
-          animation: false
+          animation: false,
         },
         {
-          name: '建单总数',
-          type: 'bar',
+          name: "建单总数",
+          type: "bar",
           data: nums,
           label: {
             show: true,
-            position: 'right',
-            formatter: '{c} % '
+            position: "right",
+            formatter: "{c} % ",
           },
           itemStyle: {
             normal: {
               //每根柱子颜色设置
-              color: '#49b856'
-            }
+              color: "#49b856",
+            },
           },
-          barCategoryGap: '26',
-          barWidth: '26'
-        }
-      ]
+          barCategoryGap: "26",
+          barWidth: "26",
+        },
+      ],
     };
   }
 
-
   // 近一周异常工单
   abOrders: Array<any> = [];
   loading2 = false;
   getAbnormityOrders() {
     let that = this;
     this.loading2 = true;
-    that.mainService.postCustom('index', 'abnormityOrders', { hosIds: that.hosIds }).subscribe(data => {
-      this.loading2 = false;
-      that.abOrders = data.data || [];
-    })
+    that.mainService
+      .postCustom("index", "abnormityOrders", { hosIds: that.hosIds })
+      .subscribe((data) => {
+        this.loading2 = false;
+        that.abOrders = data.data || [];
+      });
   }
 
   // 工单详情
   // 查看
   orderDetail(id) {
-    this.router.navigateByUrl('/main/home/orderDetail/' + id);
+    this.router.navigateByUrl("/main/home/orderDetail/" + id);
   }
 
-
-
   // swiper 轮播图
-  swiperArr = []
+  swiperArr = [];
   swiperTop: number = 0;
   moveId: any;
   index: number = 0;
   startSwiper(length) {
     let that = this;
-    clearInterval(that.moveId)
+    clearInterval(that.moveId);
     setInterval(() => {
       that.index++;
-      clearInterval(that.moveId)
+      clearInterval(that.moveId);
       that.moveId = setInterval(() => {
-        if (that.swiperTop > (-32 * that.index)) {
+        if (that.swiperTop > -32 * that.index) {
           that.swiperTop--;
         }
-        if (that.swiperTop <= length * (-32)) {
-          that.swiperTop = 0
-          that.index = 0
-          clearInterval(that.moveId)
+        if (that.swiperTop <= length * -32) {
+          that.swiperTop = 0;
+          that.index = 0;
+          clearInterval(that.moveId);
         }
       }, 20);
     }, 2000);
-
   }
 
-  swiperArr1 = [1, 2, 3]
+  swiperArr1 = [1, 2, 3];
   swiperTop1: number = 0;
   moveId1: any;
   index1: number = 0;
   startSwiper1(length) {
     let that = this;
-    clearInterval(that.moveId1)
+    clearInterval(that.moveId1);
     setInterval(() => {
       that.index1++;
-      clearInterval(that.moveId1)
+      clearInterval(that.moveId1);
       that.moveId1 = setInterval(() => {
-        if (that.swiperTop1 > (-32 * that.index1)) {
+        if (that.swiperTop1 > -32 * that.index1) {
           that.swiperTop1--;
         }
-        if (that.swiperTop1 <= length * (-32)) {
-          that.swiperTop1 = 0
-          that.index1 = 0
-          clearInterval(that.moveId1)
+        if (that.swiperTop1 <= length * -32) {
+          that.swiperTop1 = 0;
+          that.index1 = 0;
+          clearInterval(that.moveId1);
         }
       }, 20);
     }, 2000);
-
   }
 
-
   // 切换工单差评/最新意见
   thisTab = 1;
   checkTab(tab) {
@@ -272,7 +258,7 @@ export class HomeComponent implements OnInit {
 
   // 展开收起
   isOpen: boolean = false;
-  coopOpenId;//当前展开/收起id
+  coopOpenId; //当前展开/收起id
   more(id) {
     if (this.coopOpenId == id) {
       this.isOpen = !this.isOpen;
@@ -283,37 +269,36 @@ export class HomeComponent implements OnInit {
   }
 
   // 获取当前登录人所有院区
-  hosIds: string = '';//院区id
-  hosName: string = '';//当前院区名称
+  hosIds: string = ""; //院区id
+  hosName: string = ""; //当前院区名称
   getAllHos() {
     let hos: any = this.tool.getCurrentHospital();
     this.hosName = hos.hosName;
-    this.hosIds = hos.id + '';
-    this.refreshList()
-    this.getGroupCount()
-    this.getAbnormityOrders()
+    this.hosIds = hos.id + "";
+    this.refreshList();
+    this.getGroupCount();
+    this.getAbnormityOrders();
   }
 
-
   // 翻页获取当前列表
   getPageList() {
     if (this.thisTab == 1) {
-      this.getBadList()
+      this.getBadList();
     } else if (this.thisTab == 2) {
-      this.getAdviceList()
+      this.getAdviceList();
     }
   }
   // 刷新页面右侧列表
   refreshList() {
-    this.getAdviceList()
-    this.getBadList()
+    this.getAdviceList();
+    this.getBadList();
   }
   // 差评表格数据
   listIdx = 1;
   listLength = 0;
-  badNum = 0;//差评数量
-  badList = [];//差评列表
-  Loading: boolean = true;//差评loading
+  badNum = 0; //差评数量
+  badList = []; //差评列表
+  Loading: boolean = true; //差评loading
   getBadList() {
     var that = this;
     that.Loading = true;
@@ -322,40 +307,41 @@ export class HomeComponent implements OnInit {
       sum: 10,
       badEvaluationHandle: {
         hosIds: that.hosIds,
-        handleStatus: { id: "286" }//未调解
+        handleStatus: { id: "286" }, //未调解
       },
-    }
-    that.mainService.getFetchDataList('adviceCollection', 'badEvaluationHandle', data).subscribe(data => {
-      that.badList = data.list;
-      that.Loading = false;
-      that.listLength = that.badNum = data.totalNum;
-    })
-
+    };
+    that.mainService
+      .getFetchDataList("adviceCollection", "badEvaluationHandle", data)
+      .subscribe((data) => {
+        that.badList = data.list;
+        that.Loading = false;
+        that.listLength = that.badNum = data.totalNum;
+      });
   }
 
-
   // 意见列表
   adviceList = [];
-  adviceNum = 0;//意见数量
+  adviceNum = 0; //意见数量
   getAdviceList() {
     this.Loading = true;
     let data = {
       idx: this.listIdx - 1,
       sum: 10,
       advice: {
-        replaceFlag: 0,//未回复
-        hosIds: this.hosIds
+        replaceFlag: 0, //未回复
+        hosIds: this.hosIds,
       },
-    }
+    };
 
-    this.mainService.getFetchDataList('adviceCollection', 'advice', data).subscribe(data => {
-      this.adviceList = data.list;
-      this.Loading = false;
-      this.listLength = this.adviceNum = data.totalNum;
-    })
+    this.mainService
+      .getFetchDataList("adviceCollection", "advice", data)
+      .subscribe((data) => {
+        this.adviceList = data.list;
+        this.Loading = false;
+        this.listLength = this.adviceNum = data.totalNum;
+      });
   }
 
-
   // 初始化新增form表单
   initForm() {
     this.validateForm = this.fb.group({
@@ -375,31 +361,28 @@ export class HomeComponent implements OnInit {
       badEvaluationHandle: {
         id: that.coopId,
         mediationUser: { id: that.validateForm.value.user },
-      }
-    }
-    that.mainService.postCustom('adviceCollection', 'updData/badEvaluationHandle', postData).subscribe(data => {
-      that.hideDesModal()
-      that.btnLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal('指派', true, '');
-        that.initForm()
-        that.listIdx = 1;
-
-        that.getBadList()
-      } else {
-        that.showPromptModal('指派', false, data.msg);
-      }
-    })
-
-
+      },
+    };
+    that.mainService
+      .postCustom("adviceCollection", "updData/badEvaluationHandle", postData)
+      .subscribe((data) => {
+        that.hideDesModal();
+        that.btnLoading = false;
+        if (data.status == 200) {
+          that.showPromptModal("指派", true, "");
+          that.initForm();
+          that.listIdx = 1;
+
+          that.getBadList();
+        } else {
+          that.showPromptModal("指派", false, data.msg);
+        }
+      });
   }
 
-
-
-
   // 回复弹框
-  modal: boolean = false;//回复模态框
-  replyCon: any;//意见内容
+  modal: boolean = false; //回复模态框
+  replyCon: any; //意见内容
   reply(data) {
     this.modal = true;
     this.replyCon = data;
@@ -408,14 +391,15 @@ export class HomeComponent implements OnInit {
     this.modal = false;
   }
 
-
   // 指派人员
-  allDesUser: any = [];//所有支助人员
+  allDesUser: any = []; //所有支助人员
   getAllDesUser(id) {
     let that = this;
-    that.mainService.getHosUser('getUsersByPermission', id).subscribe(data => {
-      that.allDesUser = data.data || []
-    })
+    that.mainService
+      .getHosUser("getUsersByPermission", id)
+      .subscribe((data) => {
+        that.allDesUser = data.data || [];
+      });
   }
 
   // 指派
@@ -424,7 +408,7 @@ export class HomeComponent implements OnInit {
   designate(id, hosId) {
     this.desModal = true;
     this.coopId = id;
-    this.getAllDesUser(hosId)
+    this.getAllDesUser(hosId);
   }
   hideDesModal() {
     this.desModal = false;
@@ -432,12 +416,13 @@ export class HomeComponent implements OnInit {
 
   // 调解
   detail(id) {
-    this.router.navigate(['/main/home/appraiseDetail/' + id], { fragment: 'tj' });
+    this.router.navigate(["/main/home/appraiseDetail/" + id], {
+      fragment: "tj",
+    });
   }
 
-
   // 回复
-  adviceSubContent: string;//回复内容
+  adviceSubContent: string; //回复内容
   btnLoading: boolean = false;
   submitReplyForm() {
     let that = this;
@@ -447,30 +432,32 @@ export class HomeComponent implements OnInit {
       advice: {
         id: that.replyCon.id,
         replyUser: { id: that.replyCon.createUser.id },
-        replyContent: that.adviceSubContent
-      }
-    }
-    that.mainService.postCustom('adviceCollection', 'updData/advice', postData).subscribe(data => {
-      that.btnLoading = false;
-      that.adviceSubContent = '';
-      if (data.status == 200) {
-        that.showPromptModal('回复', true, '');
-        that.hideModal()
-        that.listIdx = 1;
-        that.getAdviceList()
-      } else {
-        that.showPromptModal('回复', false, data.msg);
-      }
-    })
+        replyContent: that.adviceSubContent,
+      },
+    };
+    that.mainService
+      .postCustom("adviceCollection", "updData/advice", postData)
+      .subscribe((data) => {
+        that.btnLoading = false;
+        that.adviceSubContent = "";
+        if (data.status == 200) {
+          that.showPromptModal("回复", true, "");
+          that.hideModal();
+          that.listIdx = 1;
+          that.getAdviceList();
+        } else {
+          that.showPromptModal("回复", false, data.msg);
+        }
+      });
   }
 
   // 跳转到指定页面
   toMenu(type, title) {
-    if (type == 'orderManagement') {
-      this.router.navigate(['/main/' + type], { fragment: 'yc' })
+    if (type == "orderManagement") {
+      this.router.navigate(["/main/" + type], { fragment: "yc" });
       return;
     }
-    this.router.navigateByUrl('/main/' + type);
+    this.router.navigateByUrl("/main/" + type);
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -15,7 +15,7 @@ import { Router } from "@angular/router";
 
 import http from "../../../assets/js/http";
 import { MainService } from "../../services/main.service";
-import { WebsocketService } from "../../services/websocket.service";
+import { WebsocketNurseService } from "../../services/websocket-nurse.service";
 
 import { NzMessageService } from "ng-zorro-antd/message";
 import { NzNotificationService } from "ng-zorro-antd/notification";
@@ -100,7 +100,7 @@ export class HushijiandanComponent implements OnInit {
     private mainService: MainService,
     private msg: NzMessageService,
     private notification: NzNotificationService,
-    private webs: WebsocketService,
+    private webs: WebsocketNurseService,
     private tool: ToolService
   ) {
     this.othersListOptions = {
@@ -193,13 +193,12 @@ export class HushijiandanComponent implements OnInit {
     // 工单列表倒计时 end
   }
   ngOnDestroy() {
-    console.log("关闭护士端", this.webs.ws);
     clearInterval(this.moveId);
     clearInterval(this.moveId1);
     clearInterval(this.msgTimerId);
     clearInterval(this.logTimer);
     clearInterval(this.orderListTimer);
-    this.webs.closeWs();
+    this.webs.closeWs(true);
   }
   loginUser: any = localStorage.getItem("user")
     ? JSON.parse(localStorage.getItem("user")).user

src/app/views/main/main.component.ts

@@ -3,7 +3,7 @@ import { NavigationEnd, Router } from "@angular/router";
 import { MainService } from "../../services/main.service";
 
 import { NzMessageService } from "ng-zorro-antd/message";
-import { WebsocketService } from "../../services/websocket.service";
+import { WebsocketMainService } from "../../services/websocket-main.service";
 import http from "../../../assets/js/http";
 
 import { NzNotificationService } from "ng-zorro-antd/notification";
@@ -38,7 +38,7 @@ export class MainComponent implements OnInit {
     private mainService: MainService,
     private msg: NzMessageService,
     private notification: NzNotificationService,
-    private webs: WebsocketService,
+    private webs: WebsocketMainService,
     private tool: ToolService
   ) {}
   ngOnInit() {
@@ -59,7 +59,7 @@ export class MainComponent implements OnInit {
     //取消路由监听
     this.routerEventsListener.unsubscribe();
     // 断掉连接
-    this.webs.closeWs();
+    this.webs.closeWs(true);
   }
   // 根据url高亮菜单baba
   highlightMenuByUrl() {