1.

王通
1 parent 8050bb6c
Showing 4 changed files with 52 additions and 40 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/real_control_v2/main.html
@@ -19,6 +19,7 @@ import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
 import com.bsth.service.traffic.YgcBasicDataService;
+import com.bsth.util.IpUtils;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.org.tempuri.Results;
@@ -528,7 +529,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			try {
 				//发送邮件
 				EmailBean mail = new EmailBean();
-				mail.setSubject(InetAddress.getLocalHost().getHostAddress()+":路单日志数据"+date);
+				mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
 				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
 				sendEmailController.sendMail(emailSendToAddress, mail);
 				logger.info("setLD-sendMail:邮件发送成功！");
@@ -633,7 +634,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					/**
 					 * 如果car==null，则说明该车辆是从线调中换车功能中加进去的，
 					 * 在cars基础信息中查不到车辆的信息，所以忽略该车辆
- 					 */
+					 */
 					if(car == null){
 						continue;
 					}
@@ -922,14 +923,14 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路班次时刻表数据
 	 */
 	@Override
-	public String setSKB(String ids) {
+	public String setSKB(String ids, String qyrqs) {
 		String result = "上传失败，";
 		StringBuffer sBuffer = new StringBuffer("<SKBs>");
 		DecimalFormat df = new DecimalFormat("######0.000");
 		Map<String,String> lsStationCode2NameMap = null;
 		Map<String, Integer> lsStationName2YgcNumber = null;
 		try {
-			String[] idArray = ids.split(",");
+			String[] idArray = ids.split(","), qyrqArray = qyrqs.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
 			double zlc,yylc,singleLc,emptyLc;// 总里程、营运里程、单程、空放里程
 			String bcType,sxx;// 班次类型、上下行
@@ -1000,7 +1001,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
 					sBufferB = new StringBuffer();
 					sBufferC = new StringBuffer();
-					sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
+					sBufferB.append("<KSRQ>").append(qyrqArray[i]).append("</KSRQ>");
 					// 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
 					sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
 					sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
@@ -1093,22 +1094,22 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
-            String state;// 是否上传成功
-            if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-                result = "上传成功";
-                state = "1";
-            }else{// 上传失败
-                result = "上传失败";
-                state = "0";
-            }
-            // 保存运管处上传记录
-            saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
+			String state;// 是否上传成功
+			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+				result = "上传成功";
+				state = "1";
+			}else{// 上传失败
+				result = "上传失败";
+				state = "0";
+			}
+			// 保存运管处上传记录
+			saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
 			e.printStackTrace();
 		}finally{
-            logger.info("setSKB:"+sBuffer.toString());
-            logger.info("setSKB:"+result);
+			logger.info("setSKB:"+sBuffer.toString());
+			logger.info("setSKB:"+result);
 		}
 		return result;
 	}
@@ -62,7 +62,7 @@
 			rel="stylesheet" type="text/css" />
 	<!-- table 表格控件 -->
 	<!--<link rel="stylesheet"-->
-		  <!--href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
+		  <!--href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"-->
 		  <!--type="text/css" />-->
 	<link href="/metronic_v4.5.4/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet" type="text/css"/>
 	<!-- handsontable样式 -->
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				浦东公交调度系统 </a>
+				临港公交调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -431,6 +431,29 @@
 	});
 	$(function () {
+		$.ajax({
+			url: '/user/isWeakCipher',
+			type: 'POST',
+			async: false,
+			success: function (result,status,xhr) {
+				if (result.data == 1) {
+					$.get('/pages/permission/user/forceChangePWD.html', function (content) {
+						layer.open({
+							type: 1,
+							area: ['600px', '360px'],
+							content: content,
+							title: '修改密码',
+							shift: 5,
+							scrollbar: false,
+							closeBtn: 0,
+							success: function () {
+							}
+						});
+					});
+				}
+			}
+		});
+
 		$.get('/user/currentUser', function (user) {
 			$('#indexTopUName').text(user.userName);
 		});
@@ -613,22 +636,22 @@
 <!-- 地图相关 -->
 <!-- 百度 -->
 <script
-		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
+		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"
 		data-exclude=1></script>
 <script
-		src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
+		src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"
 		data-exclude=1></script>
 <script type="text/javascript"
-		src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
+		src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"
 		data-exclude=1></script>
 <script type="text/javascript"
-		src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
+		src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "
 		data-exclude=1></script>
 <script src="/assets/js/baidu/TextIconOverlay.js" data-exclude=1></script>
 <script src="/assets/js/baidu//MarkerClusterer.js" data-exclude=1></script>
 <!-- 高德  -->
 <script
-		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
+		src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
 <!-- echarts4 -->
 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">浦东公交调度系统</h3>
+        <h3 class="logo-text">临港公交调度系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -343,7 +343,7 @@
             }
             $.get('/user/login/captchaStatus', {userName: t}, function(rs){
-                if(rs >= 3)
+                if(rs > 1)
                     _captcha.show();
                 else
                     hide();
@@ -353,8 +353,8 @@
                 if(!$("#captchaWrap").is(":hidden")){
                     _captcha.hide();
                     //隐藏提示消息
-                    msgAlert.html('');
-                    $('#loginPanel').removeClass('show_msg');
+                    //msgAlert.html('');
+                    //$('#loginPanel').removeClass('show_msg');
                 }
             }
         }
@@ -244,24 +244,12 @@
         </div>
     </div>
 </script>
-<script id="mt_plat_msg_template" type="text/html">
-    <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}}">
-        <div>
-            <span class="title">维修保养计划</span>
-            <span class="text"> {{zbh}}&nbsp;&nbsp;{{timeStr}}&nbsp;&nbsp;进场保养</span>
-            <span class="desc">--浦东公交维修库</span>
-        </div>
-    </div>
-</script>
 <script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <script src="/real_control_v2/js/con_plan/conPlan.js"  merge="custom_js"></script>
-<script src="/real_control_v2/js/mt_plan/mtPlan.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
 <!-- 打电话 -->
-<script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script>
-<script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script>
 <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
 <script id="voip_call_info_panel-temp" type="text/html">