From fe2618c213d59d2fe3cbef757cfe593ba46a56e5 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期五, 24 一月 2025 11:12:29 +0800
Subject: [PATCH] 优化本地人脸识别逻辑
---
src/samples/sockteStomp.ts | 165 ++++++++++++++++++++----------------------------------
1 files changed, 61 insertions(+), 104 deletions(-)
diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index fa4e428..5f6a3f9 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -1,13 +1,10 @@
import Stomp from 'stompjs'
import os from 'os'
-import { ipcRenderer } from 'electron'
let stompClient: Stomp.Client | null=null
-import { userInfoStore } from '@/stores/userInfo'
+import { confingInfoStore } from '@/stores/StoresConfing'
import { patientInfoStore } from '@/stores/patient'
import {sockteStore} from '@/stores/sockteInfo'
-import { result } from 'lodash'
-const sound = require("sound-play");
let sockteNum=0
@@ -17,7 +14,7 @@
deviceName:string
deviceType:string
}
-
+let config={}
let devices:Array<device>=[]
let clientCode:string=''
/**
@@ -30,18 +27,23 @@
return de.deviceName===resultInfo.deviceNumber
})
console.log(deviceInfo,'更具设备number查找到的设备')
+ console.log(resultInfo)
if(deviceInfo!==undefined){
switch(deviceInfo.deviceType){
case '读卡器':
- sockteStore().setdkqSockte(
- {
- deviceName:resultInfo.deviceNumber,
- type:"读卡器",
- result:resultInfo.result,
- resultTime:resultInfo.resultTime,
- state:2
- }
- )
+ console.log('读卡器收到消息')
+ 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,'体重秤')
@@ -49,7 +51,7 @@
{
deviceName:resultInfo.deviceNumber,
type:"体重秤",
- result:resultInfo.result,
+ result:Number(resultInfo.result).toString(),
resultTime:resultInfo.resultTime,
state:2
}
@@ -74,59 +76,42 @@
}
}
-const writeStatu=(resultInfo:any)=>{
- if(devices.length>0){
- const deviceInfo=devices.find(de=>{
- console.log(de.deviceName,resultInfo.deviceName)
- return de.deviceName===resultInfo.deviceName
- })
- if(deviceInfo!==undefined){
- switch(deviceInfo.deviceType){
- case '读卡器':
- sockteStore().setdkqSockte(
- {
- deviceName:resultInfo.deviceName,
- type:"读卡器",
- result:resultInfo.result,
- resultTime:resultInfo.resultTime,
- state:0
- }
- )
- break
- case "体重秤":
- sockteStore().setweightState(resultInfo.status)
- break
- case "血压计":
- sockteStore().setXtjState(resultInfo.status)
- break
- default:
- console.log('有配置类型没有匹配')
- }
- }
- }
-
-}
const writePatient=(resultInfo:any)=>{
+ // 给一个时间变化
+ const da=new Date()
+ console.log(da)
const info={
id:resultInfo.patientInfo===null?0:resultInfo.patientInfo.id,
code:resultInfo.patientInfo===null?'':resultInfo.patientInfo.code,
- name:resultInfo.patientInfo===null?0:resultInfo.patientInfo.patientName,
- patientAvatarIcon:resultInfo.patientInfo===null?0:resultInfo.patientInfo.patientAvatarIcon,
+ name:resultInfo.patientInfo===null?'':resultInfo.patientInfo.patientName,
+ patientAvatarIcon:resultInfo.patientInfo===null?'':resultInfo.patientInfo.patientAvatarIcon,
deviceCode:resultInfo.deviceCode===null?"":resultInfo.deviceCode,
+ patientGender:resultInfo.patientInfo.patientGender,
hemoCode:resultInfo.hemoCode===null?"":resultInfo.hemoCode,
- pureWeight:resultInfo.pureWeight===null?"":resultInfo.pureWeight
+ pureWeight:resultInfo.pureWeight===null?"":resultInfo.pureWeight,
+ datetime:da,
+ clothesWeight:resultInfo.clothesWeight===null?0:resultInfo.clothesWeight,
+ isScheduled:resultInfo.isScheduled,
+ isAfterMed:resultInfo.isAfterMed,
+ deviceNo:resultInfo.deviceNo,
+ preWeight:resultInfo.preWeight,
+ // s上次体重
+ lastTimeAfterWeight:resultInfo.lastTimeAfterWeight,
+ // 上次血压
+ lastTimeAfterBP:resultInfo.lastTimeAfterBP,
+ txq:resultInfo.txq,
+ medMethod:resultInfo.medMethod,
+ glq:resultInfo.glq,
+ preBP:resultInfo.preBP,
+ nextRecordDate:resultInfo.nextRecordDate,
+ actuallyClliang:resultInfo.actuallyClliang
}
// 写入vuex里
patientInfoStore().setpatientInfo(info)
- console.log('播放声音')
- // sound.play("https://dhcdn.leon056.com/hemo/autoselfsign/step2.mp3")
-
-
}
// 订阅结果事件返回函数
const callback = function(message:any) {
- console.log('接收到数据-----',message.body)
if (message.body!==undefined) {
const data=JSON.parse(message.body)
writeResult(data)
@@ -135,15 +120,6 @@
alert("接收数据异常");
}
};
-const callbackState=function(message:any) {
- if (message.body) {
- const data=JSON.parse(message.body)
- if(data){
- writeStatu(data)
- }
- console.log(data,'设备心跳包数据')
- }
-}
const PatientCallback=function(message:any){
if (message.body) {
const data=JSON.parse(message.body)
@@ -153,73 +129,54 @@
}
}
-const configCallback =function(message:any){
- if(message.body){
- const data=JSON.parse(message.body)
- console.log(data,'配置文件读取')
- ipcRenderer.send('setConfingData',data)
-
- }
-}
var isErrConnectBackCalled = false;
const connectCallback=function(){
isErrConnectBackCalled = true
const pcName= sockteStore().pcName
console.log("链接成功",stompClient,pcName)
+ sockteStore().setsockteIsLink(true)
// 订阅患者信息服务
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)
+ devices.forEach(el=>{
+ if(stompClient!==null)
+ stompClient.subscribe(`/queue/${clientCode}/${el.deviceName}/result`,callback)
+ })
// 发送配置文件到服务端
- 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.length>0){
- // 更新sockte链接状态
- sockteStore().setsockteIsLink(true)
- console.log(sockteStore().isLink)
- console.log(devices)
- if(devices!==undefined&&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 disconnectCallBack=function(){
- console.log("disconnect");
}
const error_callback=function(error:any){
console.log('链接错误',error);
+ sockteStore().setsockteIsLink(false)
setTimeout(()=>{
- console.log('10秒之后重连',sockteNum++)
+ console.log('60秒之后重连',sockteNum++)
const socket = new WebSocket('ws://hemobs.icoldchain.cn/broadcast')
- stompClient?.disconnect(disconnectCallBack,{})
- stompClient = Stomp.over(socket)
- stompClient.connect({}, connectCallback,error_callback)
+ stompClient?.disconnect(()=>{
+ console.log("disconnected!");
+ stompClient = Stomp.over(socket)
+ stompClient.connect({}, connectCallback,error_callback)
+ },{})
},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)
stompClient.connect({}, connectCallback,error_callback)
-
}
/**
* 发送患者卡号返回患者信息
@@ -244,4 +201,4 @@
stompClient.send(`/app/patient/info/set`,{},JSON.stringify(mode))
}
}
-export {creatorClient,sendPationCode,sendPationSet}
+export {creatorClient,sendPationCode,sendPationSet,writeResult,writePatient}
--
Gitblit v1.8.0