1.国际化查漏补缺

王通
1 parent 535956d2
Showing 10 changed files with 33 additions and 20 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/message_en_US.properties
src/main/resources/message_zh_CN.properties
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/fragments/north/nav/kl_config.html
src/main/resources/static/real_control_v2/js/data/data_toolbar.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -259,7 +259,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(whiteIpDataLoader, 0, 1, TimeUnit.MINUTES);//IP白名单数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
-        //DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
@@ -155,7 +155,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                 userName = RSAUtils.decryptBase64(userName);
                 password = RSAUtils.decryptBase64(password);
             } catch (RuntimeException e) {
-                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+                //return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+                return put(rs, "msg", "page is expired, refresh it and try again");
             }
             SysUser user = sysUserService.findByUserName(userName);
@@ -168,12 +169,14 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             // 校验用户状态
             if (!user.isEnabled()) {
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+                //return put(rs, "msg", "该用户已被锁定，请联系管理员");
+                return put(rs, "msg", "your account is locked, please contact administrator");
             }
             // 校验临时状态
             if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) {
-                return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+                //return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+                return put(rs, "msg", "your account is locked");
             }
             // 校验验证码
@@ -183,7 +186,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                     return put(rs, "msg", I18n.getInstance().getMessage("txt-2321"));
                 }
                 if (!verCode.equals(captcha)) {
-                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                    //return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                    return put(rs, "msg", I18n.getInstance().getMessage("captcha is error,please refresh and enter again"));
                 }
             }
@@ -217,7 +221,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             logger.error("用户:" + user.getUserName() + "登录");
         } catch (Exception e) {
             logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
+            //rs.put("msg", "服务器出现异常，请联系管理员");
+            rs.put("msg", "server is abnormal, please contact administrator");
         }
         return rs;
     }
@@ -208,7 +208,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-        String text = "切换为 " + (upDown == 0 ? I18n.getInstance().getMessage("txt-3858") : I18n.getInstance().getMessage("txt-3857")) + (state == 0 ? I18n.getInstance().getMessage("txt-3966") : I18n.getInstance().getMessage("txt-4457"));
+        String text = I18n.getInstance().getMessage("txt-4531") + (upDown == 0 ? I18n.getInstance().getMessage("txt-3858") : I18n.getInstance().getMessage("txt-3857")) + "/" + (state == 0 ? I18n.getInstance().getMessage("txt-3966") : I18n.getInstance().getMessage("txt-4457"));
         D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
         if (null == d60)
@@ -2930,7 +2930,7 @@ txt-2929=Station shift
 txt-2930=Comparison time
 txt-2931=
 txt-2932=
-txt-2933=Route scheduling
+txt-2933=Line scheduling
 txt-2934=Map monitoring
 txt-2935=Shift management
 txt-2936=Hydrogen use management
@@ -3176,7 +3176,7 @@ txt-3175=Based on shift
 txt-3176=Command type
 txt-3177=Abnormal type
 txt-3178=Modify type
-txt-3179=Program version
+txt-3179=Version
 txt-3180=License number:
 txt-3181=Run information
 txt-3182=Shift plan
@@ -4524,6 +4524,10 @@ txt-4524=Safe driving inquiry
 txt-4525=Format: 00:00
 txt-4526=Live
 txt-4527=Historical data
+txt-4528=Passenger flow showing setting
+txt-4529=Passenger flow
+txt-4530=There is a problem with the association between shifts and stations
+txt-4531=Switch: 
 txt-5000=Operation successfully
 txt-5001=Operation failed
@@ -4525,6 +4525,10 @@ txt-4524=安全驾驶查询
 txt-4525=格式: 00:00
 txt-4526=直播
 txt-4527=历史数据
+txt-4528=客流显示设置
+txt-4529=客流信息
+txt-4530=o(*￣▽￣*)o 班次和站点关联有点问题！！
+txt-4531=切换为 
 txt-5000=操作成功
 txt-5001=操作失败
@@ -76,7 +76,7 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="fbzdzx_config"> $$$$$${txt-1181}</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> $$$$$${txt-3116}</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> 客流信息</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> $$$$$${txt-4529}</label></li>
             </ul>
         </div>
         <div>
@@ -353,7 +353,7 @@
                     });
                 },
                 delete: function(device){
-                    alt_confirm(i18n('txt-73'), function(){
+                    alt_confirm(i18n('txt-73', [device]), function(){
                         gb_common.$post('/gps/removeRealGps', {device: device}, function(){
                             notify_succ(i18n('txt-2329'));
                             query();
@@ -2,22 +2,22 @@
     <div class="uk-modal-dialog" style="width: 530px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>客流显示设置</h2></div>
+            <h2>$$$$$${txt-4528}</h2></div>
         <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
             <small>
                 <i class="uk-icon-question-circle"> </i>
-                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+                $$$$$${txt-30}</small>
         </p>
         <form class="uk-form uk-form-horizontal">
             <div class="uk-grid">
                 <div class="uk-width-2-3 uk-container-center">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">是否启用</label>
+                        <label class="uk-form-label">$$$$$${txt-3199}</label>
                         <div class="uk-form-controls">
                             <select name="enable">
-                                <option value="1">启用</option>
-                                <option value="0">禁用</option>
+                                <option value="1">$$$$$${txt-3861}</option>
+                                <option value="0">$$$$$${txt-4160}</option>
                             </select>
                         </div>
                     </div>
@@ -25,8 +25,8 @@
             </div>
             <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
-                <button type="button" class="uk-button uk-modal-close">取消</button>
-                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+                <button type="button" class="uk-button uk-modal-close">$$$$$${txt-3817}</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;$$$$$${txt-3864}</button>
             </div>
         </form>
     </div>
@@ -188,7 +188,7 @@ var gb_data_menu = [
             },
             {
                 "id": 4.5,
-                "text": "客流信息",
+                "text": i18n('txt-4529'),
                 "event": "kl_config"
             }
@@ -875,7 +875,7 @@ var gb_schedule_table = (function () {
                 continue;
             $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap)
-                .html('o(*￣▽￣*)o 班次和站点关联有点问题！！').show();
+                .html(i18n('txt-4530')).show();
         }
         errorCodeData = data;