From 7be7a5444edd5a3b62343757b3a0faf31a8be739 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 29 十一月 2023 15:43:10 +0800
Subject: [PATCH] 双语增加
---
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties | 10 +++++++++-
ruoyi-admin/src/main/resources/i18n/messages.properties | 8 ++++++++
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties | 10 ++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java | 2 +-
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java | 7 +++++++
5 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
index 29965fa..c5961d1 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
@@ -86,11 +86,18 @@
StatisticalService statisticalService = SpringUtils.getBean(StatisticalService.class);
statisticalService.data(new String(message.getPayload(), StandardCharsets.UTF_8));
}
+ //鎺ユ敹闆疯揪寮哄埗寮曞鏁版嵁
if (topic.equals("radarForceGuide"))
{
ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
ardRadarService.forceGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
}
+ //鎺ユ敹闆疯揪寮曞杩借釜鏁版嵁
+ if (topic.equals("radarFollowGuide"))
+ {
+ ArdRadarService ardRadarService = SpringUtils.getBean(ArdRadarService.class);
+ ardRadarService.followGuide(new String(message.getPayload(), StandardCharsets.UTF_8));
+ }
} catch (Exception e) {
log.debug("澶勭悊mqtt娑堟伅寮傚父:" + e);
}
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties
index c3bf526..48315de 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -68,6 +68,9 @@
menu.tube=\u7BA1\u7EBF\u7BA1\u7406
menu.policeStation=\u8B66\u52A1\u5BA4\u7BA1\u7406
menu.peopleAndCar=\u4EBA\u5458\u53CA\u8F66\u8F86\u7BA1\u7406
+menu.userAndSanyi=\u4E09\u4E00\u8D26\u53F7\u6302\u63A5
+menu.sanYi=\u4E09\u4E00\u8F66\u8F86
+menu.sanyiCar=\u4E09\u4E00\u8F66\u8F86\u6302\u63A5
menu.inspect=\u89C6\u9891\u5DE1\u68C0
menu.inspectTask=\u89C6\u9891\u5DE1\u68C0\u4EFB\u52A1
menu.inspectRecord=\u89C6\u9891\u5DE1\u68C0\u8BB0\u5F55
@@ -99,6 +102,11 @@
menu.remove=\u5220\u9664
menu.export=\u5BFC\u51FA
menu.import=\u5BFC\u5165
+menu.plan=\u5E94\u6025\u7BA1\u7406
+menu.eplan=\u6F14\u7EC3\u9884\u6848\u63A8\u6F14
+menu.introduction=\u5382\u533A\u4ECB\u7ECD
+menu.oilTankerManage=\u6CB9\u7F50\u8F66\u7BA1\u7406
+menu.oilTankerFence=\u6CB9\u7F50\u8F66\u56F4\u680F\u7BA1\u7406
##\u5B57\u5178\u7C7B\u578B
dic.type.sys.user.sex=\u7528\u6237\u6027\u522B
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index 9fb30c5..6c93380 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -74,7 +74,10 @@
menu.elecFence=elecFence
menu.tube=tube
menu.policeStation=policeStation
-menu.peopleAndCar=peopleAndCar
+menu.peopleAndCar=Personnel and vehicle management
+menu.userAndSanyi=Trinity account connection
+menu.sanyiCar=Vehicle coupling
+menu.sanYi=sanyi
menu.inspect=inspect
menu.inspectTask=inspectTask
menu.inspectRecord=inspectRecord
@@ -107,6 +110,11 @@
menu.export=export
menu.import=import
+menu.plan=emergency
+menu.eplan=Emergency response drill
+menu.introduction=introduction
+menu.oilTankerManage=oilTankerManage
+menu.oilTankerFence=oilTankerFence
##\u5B57\u5178\u7C7B\u578B
dic.type.sys.user.sex=userSex
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
index be74d93..da2f4fa 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -75,6 +75,9 @@
menu.tube=\u7BA1\u7EBF\u7BA1\u7406
menu.policeStation=\u8B66\u52A1\u5BA4\u7BA1\u7406
menu.peopleAndCar=\u4EBA\u5458\u53CA\u8F66\u8F86\u7BA1\u7406
+menu.userAndSanyi=\u4E09\u4E00\u8D26\u53F7\u6302\u63A5
+menu.sanYi=\u4E09\u4E00\u8F66\u8F86
+menu.sanyiCar=\u4E09\u4E00\u8F66\u8F86\u6302\u63A5
menu.inspect=\u89C6\u9891\u5DE1\u68C0
menu.inspectTask=\u89C6\u9891\u5DE1\u68C0\u4EFB\u52A1
menu.inspectRecord=\u89C6\u9891\u5DE1\u68C0\u8BB0\u5F55
@@ -106,6 +109,13 @@
menu.remove=\u5220\u9664
menu.export=\u5BFC\u51FA
menu.import=\u5BFC\u5165
+
+menu.plan=\u5E94\u6025\u7BA1\u7406
+menu.eplan=\u6F14\u7EC3\u9884\u6848\u63A8\u6F14
+menu.introduction=\u5382\u533A\u4ECB\u7ECD
+menu.oilTankerManage=\u6CB9\u7F50\u8F66\u7BA1\u7406
+menu.oilTankerFence=\u6CB9\u7F50\u8F66\u56F4\u680F\u7BA1\u7406
+
##\u5B57\u5178\u7C7B\u578B
dic.type.sys.user.sex=\u7528\u6237\u6027\u522B
dic.type.sys.show.hide=\u83DC\u5355\u72B6\u6001
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java b/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
index b1f6b52..eff27c1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/filter/MyI18nInterceptor.java
@@ -23,7 +23,7 @@
String language = request.getHeader(key);
if (language == null) {
//String language = "en-US";
- language = "en-US";
+ language = "zh-CN";
}
// 鍓嶇浼犻�掔殑language蹇呴』鏄痾h-CN鏍煎紡鐨勶紝涓棿鐨�-蹇呴』瑕佸畬鏁达紝涓嶈兘鍙紶閫抸h鎴杄n
log.debug("褰撳墠璇█={}", language);
--
Gitblit v1.9.3