From a7fef2846505b08e0711345b17902e7381612d23 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 25 三月 2025 14:02:16 +0800
Subject: [PATCH] 查询锁的蓝牙开启时间段记录添加area_path
---
src/main/java/com/whyc/webSocket/HomeSocket.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/webSocket/HomeSocket.java b/src/main/java/com/whyc/webSocket/HomeSocket.java
index 1698ca7..810ebcc 100644
--- a/src/main/java/com/whyc/webSocket/HomeSocket.java
+++ b/src/main/java/com/whyc/webSocket/HomeSocket.java
@@ -45,12 +45,12 @@
@OnOpen
public void onOpen(Session session, EndpointConfig config) {
this.session = session;
- //HttpSession httpSession = (HttpSession) config.getUserProperties().get("httpSession");
- //UserInf user = (UserInf) httpSession.getAttribute("user");
- //final int userId = user.getUid();
- //final int urole = user.getUrole();
- final int userId = 10001;
- final int urole = 1;
+ HttpSession httpSession = (HttpSession) config.getUserProperties().get("httpSession");
+ UserInf user = (UserInf) httpSession.getAttribute("user");
+ final int userId = user.getUid();
+ final int urole = user.getUrole();
+ /*final int userId = 10001;
+ final int urole = 1;*/
Thread thread = new Thread("Thread_HomeSocket") {
@Override
public void run() {
@@ -76,7 +76,7 @@
Map<String, Object> res = new HashMap<>();
try {
ThreadPoolExecutor poolExecutor = ThreadPoolExecutorFactory.getPoolExecutor();
- CountDownLatch latch = new CountDownLatch(5);
+ CountDownLatch latch = new CountDownLatch(6);
poolExecutor.execute(() -> {
//閿佺殑宸ヤ綔鐘舵��
Response resLockState = ainfService.getLockState(userId,urole);
@@ -107,6 +107,12 @@
res.put("resAllCtlLog", resAllCtlLog);
latch.countDown();
});
+ poolExecutor.execute(() -> {
+ //鍦板浘椤堕儴鐨勭鐞嗙殑鍖哄煙鍖呭惈瀛愬尯鍩�
+ Response resAllAinf = ainfService.getHomeAllAinf(userId,urole);
+ res.put("resAllAinf", resAllAinf);
+ latch.countDown();
+ });
latch.await(4, TimeUnit.MINUTES);
} catch (InterruptedException e) {
e.printStackTrace();
--
Gitblit v1.9.1