潘钊 / bsth_control · Commits

Commit d982c3dce388d5449786b83057846c28a718d132

Authored by 王通
1 parent 8050bb6c
build: skipped

1.

Inline Side-by-side
Showing 4 changed files with 52 additions and 40 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @d982c3d
... ... @@ -19,6 +19,7 @@ import com.bsth.repository.traffic.SKBUploadLoggerRepository;
19 19 import com.bsth.security.util.SecurityUtils;
20 20 import com.bsth.service.TrafficManageService;
21 21 import com.bsth.service.traffic.YgcBasicDataService;
  22 +import com.bsth.util.IpUtils;
22 23 import com.bsth.util.TimeUtils;
23 24 import com.bsth.util.db.DBUtils_MS;
24 25 import com.bsth.webService.trafficManage.org.tempuri.Results;
... ... @@ -528,7 +529,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
528 529 try {
529 530 //发送邮件
530 531 EmailBean mail = new EmailBean();
531   - mail.setSubject(InetAddress.getLocalHost().getHostAddress()+":路单日志数据"+date);
  532 + mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
532 533 mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
533 534 sendEmailController.sendMail(emailSendToAddress, mail);
534 535 logger.info("setLD-sendMail:邮件发送成功！");
... ... @@ -633,7 +634,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
633 634 /**
634 635 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
635 636 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
636   - */
  637 + */
637 638 if(car == null){
638 639 continue;
639 640 }
... ... @@ -922,14 +923,14 @@ public class TrafficManageServiceImpl implements TrafficManageService{
922 923 * 上传线路班次时刻表数据
923 924 */
924 925 @Override
925   - public String setSKB(String ids) {
  926 + public String setSKB(String ids, String qyrqs) {
926 927 String result = "上传失败，";
927 928 StringBuffer sBuffer = new StringBuffer("<SKBs>");
928 929 DecimalFormat df = new DecimalFormat("######0.000");
929 930 Map<String,String> lsStationCode2NameMap = null;
930 931 Map<String, Integer> lsStationName2YgcNumber = null;
931 932 try {
932   - String[] idArray = ids.split(",");
  933 + String[] idArray = ids.split(","), qyrqArray = qyrqs.split(",");
933 934 StringBuffer sBufferA ,sBufferB ,sBufferC ;
934 935 double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、空放里程
935 936 String bcType,sxx;// 班次类型、上下行
... ... @@ -1000,7 +1001,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1000 1001 sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
1001 1002 sBufferB = new StringBuffer();
1002 1003 sBufferC = new StringBuffer();
1003   - sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
  1004 + sBufferB.append("<KSRQ>").append(qyrqArray[i]).append("</KSRQ>");
1004 1005 // 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
1005 1006 sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
1006 1007 sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
... ... @@ -1093,22 +1094,22 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1093 1094 logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
1094 1095 }
1095 1096 sBuffer.append("</SKBs>");
1096   - String state;// 是否上传成功
1097   - if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
1098   - result = "上传成功";
1099   - state = "1";
1100   - }else{// 上传失败
1101   - result = "上传失败";
1102   - state = "0";
1103   - }
1104   - // 保存运管处上传记录
1105   - saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
  1097 + String state;// 是否上传成功
  1098 + if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
  1099 + result = "上传成功";
  1100 + state = "1";
  1101 + }else{// 上传失败
  1102 + result = "上传失败";
  1103 + state = "0";
  1104 + }
  1105 + // 保存运管处上传记录
  1106 + saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
1106 1107 } catch (Exception e) {
1107 1108 logger.error("setSKB:", e);
1108 1109 e.printStackTrace();
1109 1110 }finally{
1110   - logger.info("setSKB:"+sBuffer.toString());
1111   - logger.info("setSKB:"+result);
  1111 + logger.info("setSKB:"+sBuffer.toString());
  1112 + logger.info("setSKB:"+result);
1112 1113 }
1113 1114 return result;
1114 1115 }
... ...
src/main/resources/static/index.html
  View file @d982c3d
... ... @@ -62,7 +62,7 @@
62 62 rel="stylesheet" type="text/css" />
63 63 <!-- table 表格控件 -->
64 64 <!--<link rel="stylesheet"-->
65   - <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
  65 + <!--href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
66 66 <!--type="text/css" />-->
67 67 <link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
68 68 <!-- handsontable样式 -->
... ... @@ -220,7 +220,7 @@
220 220 <!-- LOGO -->
221 221 <div class="page-logo">
222 222 <a href="index.html" class="logo-default logo-default-text">
223   - 浦东公交调度系统 </a>
  223 + 临港公交调度系统 </a>
224 224 <div class="menu-toggler sidebar-toggler"></div>
225 225 </div>
226 226 <!-- END LOGO -->
... ... @@ -431,6 +431,29 @@
431 431 });
432 432  
433 433 $(function () {
  434 + $.ajax({
  435 + url: '/user/isWeakCipher',
  436 + type: 'POST',
  437 + async: false,
  438 + success: function (result,status,xhr) {
  439 + if (result.data == 1) {
  440 + $.get('/pages/permission/user/forceChangePWD.html', function (content) {
  441 + layer.open({
  442 + type: 1,
  443 + area: ['600px', '360px'],
  444 + content: content,
  445 + title: '修改密码',
  446 + shift: 5,
  447 + scrollbar: false,
  448 + closeBtn: 0,
  449 + success: function () {
  450 + }
  451 + });
  452 + });
  453 + }
  454 + }
  455 + });
  456 +
434 457 $.get('/user/currentUser', function (user) {
435 458 $('#indexTopUName').text(user.userName);
436 459 });
... ... @@ -613,22 +636,22 @@
613 636 <!-- 地图相关 -->
614 637 <!-- 百度 -->
615 638 <script
616   - src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
  639 + src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
617 640 data-exclude=1></script>
618 641 <script
619   - src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
  642 + src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
620 643 data-exclude=1></script>
621 644 <script type="text/javascript"
622   - src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
  645 + src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
623 646 data-exclude=1></script>
624 647 <script type="text/javascript"
625   - src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
  648 + src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
626 649 data-exclude=1></script>
627 650 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
628 651 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
629 652 <!-- 高德 -->
630 653 <script
631   - src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
  654 + src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
632 655 data-exclude=1></script>
633 656 <!-- echarts4 -->
634 657 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
... ...
src/main/resources/static/login.html
  View file @d982c3d
... ... @@ -181,7 +181,7 @@
181 181 <div class="wrapper ng-scope">
182 182 <div id="loginPanel" class="dialog dialog-shadow">
183 183 <br>
184   - <h3 class="logo-text">浦东公交调度系统</h3>
  184 + <h3 class="logo-text">临港公交调度系统</h3>
185 185 <hr>
186 186 <form style="padding: 0px 35px;">
187 187 <div class="form-group" style="margin-bottom: 0">
... ... @@ -343,7 +343,7 @@
343 343 }
344 344  
345 345 $.get('/user/login/captchaStatus', {userName: t}, function(rs){
346   - if(rs >= 3)
  346 + if(rs > 1)
347 347 _captcha.show();
348 348 else
349 349 hide();
... ... @@ -353,8 +353,8 @@
353 353 if(!$("#captchaWrap").is(":hidden")){
354 354 _captcha.hide();
355 355 //隐藏提示消息
356   - msgAlert.html('');
357   - $('#loginPanel').removeClass('show_msg');
  356 + //msgAlert.html('');
  357 + //$('#loginPanel').removeClass('show_msg');
358 358 }
359 359 }
360 360 }
... ...
src/main/resources/static/real_control_v2/main.html
  View file @d982c3d
... ... @@ -244,24 +244,12 @@
244 244 </div>
245 245 </div>
246 246 </script>
247   -<script id="mt_plat_msg_template" type="text/html">
248   - <div class="multi_plat_msg_pop uk-animation-slide-bottom" style="background-color: #0aae0a;" data-type="{{type}}" data-confirm="维修保养计划" data-line="{{line}}" data-zbh="{{zbh}}" data-bydj="{{bydj}}" data-bysj="{{dateTimeStr}}" data-bydd="{{bydd}}">
249   - <div>
250   - <span class="title">维修保养计划</span>
251   - <span class="text"> {{zbh}}&nbsp;&nbsp;{{timeStr}}&nbsp;&nbsp;进场保养</span>
252   - <span class="desc">--浦东公交维修库</span>
253   - </div>
254   - </div>
255   -</script>
256 247  
257 248 <script src="/real_control_v2/js/safe_driv/safeDriv.js" merge="custom_js"></script>
258 249 <script src="/real_control_v2/js/con_plan/conPlan.js" merge="custom_js"></script>
259   -<script src="/real_control_v2/js/mt_plan/mtPlan.js" merge="custom_js"></script>
260 250 <!-- #### 安全驾驶 end ### -->
261 251  
262 252 <!-- 打电话 -->
263   -<script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script>
264   -<script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script>
265 253 <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
266 254  
267 255 <script id="voip_call_info_panel-temp" type="text/html">
... ...