From 84e14a34a082e00aa2d47a64ee36398088c12aec Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 16 九月 2022 14:37:51 +0800
Subject: [PATCH] 添加http服务功能、取消网络和sockte链接检查

---
 src/samples/sockteStomp.ts |   59 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index 90db1c3..ce6e898 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -35,15 +35,18 @@
             switch(deviceInfo.deviceType){
                 case '读卡器':
                     console.log('读卡器收到消息')
-                    sockteStore().setdkqSockte(
-                        {
-                            deviceName:resultInfo.deviceNumber,
-                            type:"读卡器",
-                            result:resultInfo.result,
-                            resultTime:resultInfo.resultTime,
-                            state:2
-                        }
-                    )
+                    const res=JSON.parse(resultInfo.result)
+                    if(res.clientCode!==null){
+                        sockteStore().setdkqSockte(
+                            {
+                                deviceName:resultInfo.deviceNumber,
+                                type:"读卡器",
+                                result:resultInfo.result,
+                                resultTime:resultInfo.resultTime,
+                                state:2
+                            }
+                        )
+                    }
                     break
                 case "体重秤":
                     console.log(resultInfo,'体重秤')
@@ -51,7 +54,7 @@
                         {
                             deviceName:resultInfo.deviceNumber,
                             type:"体重秤",
-                            result:resultInfo.result,
+                            result:Number(resultInfo.result).toString(),
                             resultTime:resultInfo.resultTime,
                             state:2
                         }
@@ -128,7 +131,6 @@
 
 // 订阅结果事件返回函数
 const  callback = function(message:any) {
-    console.log('接收到数据-----',message.body)
     if (message.body!==undefined) {
         const data=JSON.parse(message.body)
         writeResult(data)
@@ -182,22 +184,23 @@
     // 更新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}));
-
-                } 
-            })
-        }
-    }
+    // 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){
@@ -246,4 +249,4 @@
         stompClient.send(`/app/patient/info/set`,{},JSON.stringify(mode))
     }
 }
-export {creatorClient,sendPationCode,sendPationSet}
+export {creatorClient,sendPationCode,sendPationSet,writeResult}

--
Gitblit v1.8.0