Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents dd9f6345 05c07a0b
Showing 8 changed files with 111 additions and 35 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/report/inoutstation.html
src/main/resources/static/pages/report/oil/oilListMonth.html
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -114,15 +114,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					if(zdsj < fcsj)
 						zdsj += 1440l;
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -130,7 +130,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -138,7 +138,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						if(schedule.getFcsjActualTime() != null && zdsjA < schedule.getFcsjActualTime())
 							zdsjA += 1440l;
@@ -648,7 +648,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&dfsj<23*60)
 							dfsj += 1440l;
 						schedule.setDfsj(dfsj/60 + ":" + dfsj%60);
 						schedule.setDfsjT(dfsj);
@@ -656,7 +656,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getFcsjActual() != null){
 						String[] split2 = schedule.getFcsjActual().split(":");
 						long fcsjA = Long.valueOf(split2[0]) * 60 + Long.valueOf(split2[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&fcsjA<23*60)
 							fcsjA += 1440l;
 						schedule.setFcsjActual(fcsjA/60 + ":" + fcsjA%60);
 						schedule.setFcsjActualTime(fcsjA);
@@ -664,7 +664,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getZdsjActual() != null){
 						String[] split4 = schedule.getZdsjActual().split(":");
 						long zdsjA = Long.valueOf(split4[0]) * 60 + Long.valueOf(split4[1]);
-						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate()))
+						if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())&&zdsjA<23*60)
 							zdsjA += 1440l;
 						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
@@ -675,8 +675,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
-						fcsj += 1440l;
-						zdsj += 1440l;
+						if(fcsj<23*60)	fcsj += 1440l;
+						if(zdsj<23*60)	zdsj += 1440l;
 					}
 					schedule.setFcsj(fcsj/60 + ":" + fcsj%60);
 					schedule.setZdsj(zdsj/60 + ":" + zdsj%60);
@@ -773,6 +773,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			Map<Long, ScheduleRealInfo> sortMap = new HashMap<Long, ScheduleRealInfo>();
 			List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 			List<Long> keyList = new ArrayList<Long>();
+			List<Long> keyList2 = new ArrayList<Long>();
 			List<ScheduleRealInfo> list2 = keyMap.get(key);
 			long jhyysj = 0, sjyysj = 0;
 			long jhyssj = 0, sjyssj = 0;
@@ -794,6 +795,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					keyList.add(fcsj);
 				}
 				sortMap.put(fcsj, schedule);
+
 			}
 			Collections.sort(keyList);
@@ -884,12 +886,20 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					mapList.add(m);
 				}
 			}
-			for(int i = 1; i < mapList.size(); i++){
-				Map<String, Object> m1 = mapList.get(i - 1);
-				Map<String, Object> m2 = mapList.get(i);
-				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
-					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
-					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+
+			for(Map<String, Object> m : mapList){
+				if(m.get("fcsj") != null && m.get("fcsj").toString().trim().length()!=0){
+					keyList2.add(Long.valueOf(m.get("fcsj").toString()));
+				}
+			}
+			Collections.sort(keyList2);
+			for(long l : keyList2){
+				System.out.println(l);
+			}
+			for(int i = 1; i < keyList2.size(); i++){
+				long fcsj1 = keyList2.get(i - 1);
+				long fcsj2 = keyList2.get(i);
+				if(fcsj2 - fcsj1 < 90){
 					if(sfqr == 1 && time1 > fcsj1){
 						sjyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -898,7 +908,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						sjyysj += fcsj2 - fcsj1;
 					}
 					sjyysj1 += fcsj2 - fcsj1;
+					System.out.println("---"+(fcsj2-fcsj1)+"---"+sjyysj+"---"+sjyysj1);
 				}
+			}
+			
+			for(int i = 1; i < mapList.size(); i++){
+				Map<String, Object> m1 = mapList.get(i - 1);
+				Map<String, Object> m2 = mapList.get(i);
+//				if(m1.get("fcsj") != null && m2.get("fcsj") != null){
+//					long fcsj2 = Long.valueOf(m2.get("fcsj").toString());
+//					long fcsj1 = Long.valueOf(m1.get("fcsj").toString());
+//					if(sfqr == 1 && time1 > fcsj1){
+//						sjyysj += fcsj2 - time1;
+//					}else if(sfqr == 1 && time2 < fcsj2){
+//						sjyysj += time2 - fcsj1;
+//					}else{
+//						sjyysj += fcsj2 - fcsj1;
+//					}
+//					sjyysj1 += fcsj2 - fcsj1;
+//				}
 				if(m2.get("fcsj") != null && m2.get("zdsj") != null){
 					long zdsj = Long.valueOf(m2.get("zdsj").toString());
 					long fcsj = Long.valueOf(m2.get("fcsj").toString());
@@ -311,7 +311,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
 					// 获取线路是否使用标识，如果未使用，则不查该线路数据
 					line = lineRepository.findByLineCode(schRealInfo.get("xlBm")+"");
-					if(line.getInUse() == null || line.getInUse() == 0){
+					if(line == null || line.getInUse() == null || line.getInUse() == 0){
 						continue;
 					}
 					sf.append("<DLD>");
@@ -194,7 +194,7 @@ public class ReportUtils {
 				// 创建新行
 				newRow = sheet.createRow(index + k++);
 				// 把新行的内容换成和模板行一样
-				copyRow(wb, orgRow, newRow, true);
+				copyRow(wb, orgRow, newRow, true, wb.createCellStyle());
 				tmpCellNum = newRow.getLastCellNum();
 				for (int l = 0; l < tmpCellNum; l++) {
 					cell = newRow.getCell(l);
@@ -357,11 +357,11 @@ public class ReportUtils {
 	 * @param toRow
 	 */
 	private void copyRow(HSSFWorkbook wb, HSSFRow fromRow, HSSFRow toRow,
-			boolean copyValueFlag) {
+			boolean copyValueFlag, HSSFCellStyle style) {
 		for (Iterator<Cell> cellIt = fromRow.cellIterator(); cellIt.hasNext();) {
 			HSSFCell tmpCell = (HSSFCell) cellIt.next();
 			HSSFCell newCell = toRow.createCell(tmpCell.getColumnIndex(), 0);
-			copyCell(wb, tmpCell, newCell, copyValueFlag);
+			copyCell(wb, tmpCell, newCell, copyValueFlag, style);
 		}
 	}
@@ -374,8 +374,8 @@ public class ReportUtils {
 	 *            true则连同cell的内容一起复制
 	 */
 	public void copyCell(HSSFWorkbook wb, HSSFCell srcCell, HSSFCell distCell,
-			boolean copyValueFlag) {
-		HSSFCellStyle newstyle = wb.createCellStyle();
+			boolean copyValueFlag, HSSFCellStyle newstyle) {
+//		HSSFCellStyle newstyle = wb.createCellStyle();
 		copyCellStyle(wb, srcCell.getCellStyle(), newstyle);
 		// 样式
 		distCell.setCellStyle(newstyle);
@@ -49,24 +49,24 @@
 					</div>
 					<br/>
 					<div>
-						<div id="bczxDiv" style="display: inline-block;margin-left: 15px;">
-							<div style="display: inline-block;margin-left: 15px;">
+						<div id="bczxDiv" style="display: inline-block;margin-left: 10px;">
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">时间: </span>
 								<input class="form-control" type="text" id="date" style="width: 180px;"/>
 							</div>
-							<div style="display: inline-block;margin-left: 15px;">
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">车辆: </span>
 								<select class="form-control"  id="nbbm" style="width: 180px;"></select>
 							</div>
 						</div>
-						<div id="clzdDiv" style="display:none ;margin-left: 15px;" >
-							<div style="display: inline-block;margin-left: 15px;">
+						<div id="clzdDiv" style="display:none ;margin-left: 10px;" >
+							<div style="display: inline-block;margin-left: 5px;">
 								<span class="item-label" style="width: 80px;">时间: </span>
 								<input class="form-control" type="text" id="date1" style="width: 180px;"/>
-								<span class="item-label" style="width: 60px;">至: </span>
+								<span class="item-label" style="width: 60px;margin-left: 19px;">至: </span>
 								<input class="form-control" type="text" id="date2" style="width: 180px;"/>
 								<span class="item-label" style="width: 80px;">站点: </span>
-								<select id="zdlx" class="sreach-zd" > 
+								<select class="form-control" id="zdlx" class="sreach-zd" > 
 										<option value="">请选择</option>
 										<option value="0">上行</option>
 										<option value="1">下行</option>
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+<!--                         <input class="btn btn-default" type="button" id="export" value="导出"/> -->
                     </div>
 				</form>
 			</div>
@@ -97,6 +97,8 @@
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
+		if(day < 10)
+			day = "0"+day;
 		if(month > 9){
 			$("#date").val(year + "-" + month + "-" + day);
 		} else {
@@ -335,3 +335,21 @@
     margin: 0 5px;
     width: 110px;
 }
+
+
+#navbar_user_detail_link:hover{
+    background-color: transparent;
+    color: #444;
+    outline: 0;
+    position: relative;
+    z-index: 1;
+    border-left-color: rgba(0,0,0,.1);
+    border-right-color: rgba(0,0,0,.1);
+    border-top-color: rgba(0,0,0,.1);
+    box-shadow: inset 0 2px 4px rgba(0,0,0,.1);
+}
+
+.user_detail_tip .qtip-content{
+    width: 300px;
+    height: 220px;
+}
 \ No newline at end of file
@@ -46,10 +46,39 @@ var gb_northToolbar = (function () {
             window.location.href = '/pages/control/lineallot/allot.html';
         });
-        //点击用户名
-        $('#navbar_user_detail_link').on('click', function () {
-            //alert('1111');
-        });
+        //鼠标悬停用户名
+/*        $(document).on('mouseenter', '#navbar_user_detail_link', function() {
+            $(this).qtip({
+                show: {
+                    ready: true,
+                    delay: 300
+                },
+                content: {
+                    text: function() {
+
+                        return '';//temps['sch-table-task-tootip-temp']({tasks: array});
+                    }
+                },
+                position: {
+                    viewport: $(window),
+                    my: 'top center',
+                    at: 'bottom center'
+                },
+                style: {
+                    classes: 'qtip-light qtip-shadow user_detail_tip'
+                },
+                hide: {
+                    fixed: true,
+                    delay: 300
+                },
+                events: {
+                    hidden: function(event, api) {
+                        //destroy dom
+                        $(this).qtip('destroy', true);
+                    }
+                }
+            });
+        });*/
     });
     $(document).on('click', '#north_toolbar_panel li.event a', function () {
@@ -104,7 +104,6 @@ var gb_sch_websocket = (function () {
      * @param msg
      */
     var autoWdtz = function (msg) {
-        debugger
         var schId = msg.id;
         var minute = msg.minute;
         var lineCode = msg.lineCode;