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 |   37 ++++++++++++-------------------------
 1 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 028efb5..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=''
 /**
@@ -123,7 +123,8 @@
         deviceCode:resultInfo.deviceCode===null?"":resultInfo.deviceCode,
         hemoCode:resultInfo.hemoCode===null?"":resultInfo.hemoCode,
         pureWeight:resultInfo.pureWeight===null?"":resultInfo.pureWeight,
-        datetime:da  
+        datetime:da,
+        isScheduled:resultInfo.isScheduled
     }
     // 写入vuex里
     patientInfoStore().setpatientInfo(info)
@@ -175,31 +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)
-    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){
-                    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){
@@ -216,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)
@@ -248,4 +235,4 @@
         stompClient.send(`/app/patient/info/set`,{},JSON.stringify(mode))
     }
 }
-export {creatorClient,sendPationCode,sendPationSet}
+export {creatorClient,sendPationCode,sendPationSet,writeResult}

--
Gitblit v1.8.0