From df70027d5bd443ea9138713a2f4173251c7ec9d6 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Tue, 7 Jan 2025 01:42:22 +0800
Subject: [PATCH] =?UTF-8?q?iot=E6=97=A5=E5=BF=97=E5=92=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=91=E9=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/EqIotDeviceController.java  |  2 +-
 .../web/utils/WebSocketBusinessHandler.java    | 18 ++++++++++--------
 .../common/core/utils/MessageUtils.java        |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
index 9e6bd4bac..7527dbdce 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
@@ -142,7 +142,7 @@ public class EqIotDeviceController extends BaseController {
     @SaIgnore
     @PostMapping("/sendDeviceMsg2")
     public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo) throws InterruptedException {
-        Thread.sleep(1000);
+//        Thread.sleep(1000);
         /*String status = eqEquipmentLogBo.getStatus() + "";
         String statusCache = tokenCache.getIfPresent("status");
         if (StringUtils.isEmpty(statusCache)){
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java b/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java
index b3c06d4c6..517264561 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java
@@ -82,14 +82,16 @@ public class WebSocketBusinessHandler implements WebSocketApi {
     }
 
     private void initLanguage(Long userId) {
-        EqUserConfigBo userConfigBo = new EqUserConfigBo();
-        userConfigBo.setUserId(userId);
-        List<EqUserConfigVo> eqUserConfigVos = userConfigService.queryList(userConfigBo);
-        if(!eqUserConfigVos.isEmpty()){
-            EqUserConfigVo eqUserConfigVo = eqUserConfigVos.get(0);
-            String languageType = eqUserConfigVo.getLanguageType();
-            String[] languages = languageType.split("_");
-            LocaleContextHolder.setDefaultLocale(new Locale(languages[0], languages[1]));
+        synchronized (this){
+            EqUserConfigBo userConfigBo = new EqUserConfigBo();
+            userConfigBo.setUserId(userId);
+            List<EqUserConfigVo> eqUserConfigVos = userConfigService.queryList(userConfigBo);
+            if(!eqUserConfigVos.isEmpty()){
+                EqUserConfigVo eqUserConfigVo = eqUserConfigVos.get(0);
+                String languageType = eqUserConfigVo.getLanguageType();
+                String[] languages = languageType.split("_");
+                LocaleContextHolder.setDefaultLocale(new Locale(languages[0], languages[1]));
+            }
         }
     }
 
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
index a11ffb86e..cf10d28b4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
@@ -30,6 +30,7 @@ public class MessageUtils {
     public static String message(String code, Object... args) {
         try {
             Locale locale = LocaleContextHolder.getLocale();
+            log.info("获取国际化资源文件: {}~{}", locale.toLanguageTag(), code);
 //            if (locale.toLanguageTag().equals("en")) locale = Locale.CHINA;//zc change with userid because socket I18n
             return MESSAGE_SOURCE.getMessage(code, args, locale);
         } catch (NoSuchMessageException e) {