潘钊 / bsth_control · Commits

Commit 2e7ee9814fde841c423bc913cc3b6698385a6a13

Authored by 王通
1 parent 535956d2
build: skipped

1.国际化查漏补缺

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