opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

iot日志和状态发送修改

Browse Source
This commit is contained in:
zzc 2025-01-07 01:42:22 +08:00
parent 3f820f20b0
commit df70027d5b
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
View File

@ -142,7 +142,7 @@ public class EqIotDeviceController extends BaseController {
@SaIgnore @SaIgnore
@PostMapping("/sendDeviceMsg2") @PostMapping("/sendDeviceMsg2")
public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo) throws InterruptedException { public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo) throws InterruptedException {
Thread.sleep(1000); // Thread.sleep(1000);
/*String status = eqEquipmentLogBo.getStatus() + ""; /*String status = eqEquipmentLogBo.getStatus() + "";
String statusCache = tokenCache.getIfPresent("status"); String statusCache = tokenCache.getIfPresent("status");
if (StringUtils.isEmpty(statusCache)){ if (StringUtils.isEmpty(statusCache)){

18
ruoyi-admin/src/main/java/org/dromara/web/utils/WebSocketBusinessHandler.java
View File

@ -82,14 +82,16 @@ public class WebSocketBusinessHandler implements WebSocketApi {
} }
private void initLanguage(Long userId) { private void initLanguage(Long userId) {
EqUserConfigBo userConfigBo = new EqUserConfigBo(); synchronized (this){
userConfigBo.setUserId(userId); EqUserConfigBo userConfigBo = new EqUserConfigBo();
List<EqUserConfigVo> eqUserConfigVos = userConfigService.queryList(userConfigBo); userConfigBo.setUserId(userId);
if(!eqUserConfigVos.isEmpty()){ List<EqUserConfigVo> eqUserConfigVos = userConfigService.queryList(userConfigBo);
EqUserConfigVo eqUserConfigVo = eqUserConfigVos.get(0); if(!eqUserConfigVos.isEmpty()){
String languageType = eqUserConfigVo.getLanguageType(); EqUserConfigVo eqUserConfigVo = eqUserConfigVos.get(0);
String[] languages = languageType.split("_"); String languageType = eqUserConfigVo.getLanguageType();
LocaleContextHolder.setDefaultLocale(new Locale(languages[0], languages[1])); String[] languages = languageType.split("_");
LocaleContextHolder.setDefaultLocale(new Locale(languages[0], languages[1]));
}
} }
} }

1
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
View File

@ -30,6 +30,7 @@ public class MessageUtils {
public static String message(String code, Object... args) { public static String message(String code, Object... args) {
try { try {
Locale locale = LocaleContextHolder.getLocale(); Locale locale = LocaleContextHolder.getLocale();
log.info("获取国际化资源文件: {}~{}", locale.toLanguageTag(), code);
// if (locale.toLanguageTag().equals("en")) locale = Locale.CHINA;//zc change with userid because socket I18n // if (locale.toLanguageTag().equals("en")) locale = Locale.CHINA;//zc change with userid because socket I18n
return MESSAGE_SOURCE.getMessage(code, args, locale); return MESSAGE_SOURCE.getMessage(code, args, locale);
} catch (NoSuchMessageException e) { } catch (NoSuchMessageException e) {