From f787bf4f4631b2ecb6bb6b46f52a9c7e3f8f8cc0 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期一, 26 十二月 2022 19:30:30 +0800
Subject: [PATCH] up

---
 src/samples/sockteStomp.ts |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index cb57715..9562ab6 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -17,7 +17,7 @@
     deviceName:string
     deviceType:string
 }
-
+let config={}
 let devices:Array<device>=[]
 let clientCode:string=''
 /**
@@ -151,7 +151,6 @@
 }
 const PatientCallback=function(message:any){
     if (message.body) {
-        console.log('00000000000000',message.body)
         const data=JSON.parse(message.body)
         console.log(data,'患者信息读取')
         writePatient(data)
@@ -177,32 +176,16 @@
     if(stompClient!==null){
         // 订阅患者信息事件
         stompClient.subscribe(`/queue/patient/info/${pcName}`,PatientCallback)
-        // 订阅配置文件事件
-        stompClient.subscribe(`/queue/workstation/config/set/${clientCode}/${pcName}`,configCallback)
+        // 订阅配置文件事件已经弃用  现在不用更新本地配置文件了 
+        // stompClient.subscribe(`/queue/workstation/config/set/${clientCode}/${pcName}`,configCallback)
         // 发送配置文件到服务端
-        stompClient.send(`/app/workstation/config/set/${clientCode}/${pcName}`,{},JSON.stringify({"clientCode":clientCode,"machineName":pcName}))
+        stompClient.send(`/app/workstation/config/set/${clientCode}/${pcName}`,{},
+        JSON.stringify(config))
         
     }
     // 更新sockte链接状态
     sockteStore().setsockteIsLink(true)
     console.log(sockteStore().isLink)
-    // sockte订阅服务关闭完全有post 来代替
-    // if(devices!==undefined &&devices!=null&&devices.length>0){
-    //     // 更新sockte链接状态
-    //     sockteStore().setsockteIsLink(true) 
-    //     console.log(sockteStore().isLink)
-    //     console.log(devices)
-    //     if(devices!==undefined&&devices!=null &&devices!=null &&devices.length>0){
-    //         devices.forEach(de=>{
-    //             if(stompClient!==null){
-    //                 console.log()
-    //                 stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/result`,callback)
-    //                 stompClient.subscribe(`/queue/${clientCode}/${de.deviceName}/keepalive`,callbackState)
-    //                 stompClient.send(`/app/device/request/${clientCode}/${de.deviceName}`, {}, JSON.stringify({"deviceNumber":de.deviceName}));
-    //             } 
-    //         })
-    //     }
-    // }
 }
 
 const error_callback=function(error:any){
@@ -219,9 +202,10 @@
     },60000)
 }
 // 创建客户端链接
-const creatorClient=(devices2:any,clientCode2:any)=>{
-    devices=devices2
-    clientCode=clientCode2
+const creatorClient=(configObj:any)=>{
+    config=configObj
+    devices=configObj.deviceList
+    clientCode=configObj.clientCode
     console.log(devices,'设备列表','chong')
     const socket = new WebSocket('ws://hemobs.icoldchain.cn/broadcast')
     stompClient = Stomp.over(socket)

--
Gitblit v1.8.0