双语增加

‘liusuyi’

2023-11-29 7be7a5444edd5a3b62343757b3a0faf31a8be739

双语增加

 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);
        }

 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

 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

 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

 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必须是zh-CN格式的，中间的-必须要完整，不能只传递zh或en
            log.debug("当前语言={}", language);