定时器统计班次公里线程修改

廖磊
1 parent cc698739
Showing 7 changed files with 56 additions and 25 deletions
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
src/main/resources/static/pages/oil/list_ph.html
@@ -38,25 +38,35 @@ public class CalcOilThread extends Thread{
     @Override
     public void run() {
+        logger.info("开始计算油量平衡表....");
         try{
-            logger.info("开始计算路单里程加注量....");
             ylbService.obtainDsq();
+//          logger.info("开始计算班次准点率....");
+//			sheetService.saveSheetList("");
+//          logger.info("计算班次准点率结束！");
+        } catch(Exception e){
+            logger.error("计算油量平衡表失败",e);
+        }
+        try{
+            logger.info("开始计算电量平衡表....");
             dlbService.obtainDsq();
+        } catch(Exception e){
+            logger.error("计算电量平衡表失败",e);
+        }
+        
+        try{
             logger.info("计算路单里程加注量结束！");
-            logger.info("开始计算班次准点率....");
-            //sheetService.saveSheetList("");
-            logger.info("计算班次准点率结束！");
-
-            logger.info("开始保存重新统计数据....");
             calcWaybillService.autoGenerate("", "");
-            logger.info("重新统计保存结束！");
-            logger.info("开始保存统计日报....");
-            calcWaybillService.calcDaily("", "");
-            logger.info("统计日报保存结束！");
-        } catch(Exception e){
-            logger.error("计算路单里程加注量失败",e);
+        }catch(Exception e){
+            logger.error("计算路单里程失败",e);
+        }
+        
+        logger.info("开始保存统计日报....");
+        try{
+        	calcWaybillService.calcDaily("", "");
+        }catch(Exception e){
+            logger.error("统计日报失败",e);
         }
-
         //清除指令数据
         dayOfDirectives.clearAll();
         //清除安全驾驶数据
@@ -209,14 +209,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							}else{
 								addList.add(t);
 							}
-							
 						}
 				}
 			} 
 			if(addList.size()>0){ 
 				try {
-					
 					new BatchSaveUtils<Ylb>().saveList2(addList, Ylb.class); 
 				} catch (Exception e) {
 					// TODO: handle exception
@@ -585,8 +585,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 										}
 									}
 								}
-								
-
 							}
 						} else {
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -598,7 +596,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									if (!childTaskPlan.isDestroy()) {
 										Float jhgl = childTaskPlan.getMileage() == null ? 0
 												: childTaskPlan.getMileage();
-										
 										if(item.equals("zgf")){
 											if(fcsj>=zgf1 && fcsj<=zgf2){
 												sjgl = Arith.add(sjgl, jhgl);
@@ -467,7 +467,7 @@
 				 divFrom2 = window.document.getElementById('forms_1');
 				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
-			$.get('/realSchedule/realScheduleList_zrw',{line:line,date:date,type:"query"},function(result){
+			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);
@@ -513,7 +513,7 @@
 			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
-			params['genre'] = 'zrw';
+			params['genre'] = '';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
 				if(date.length == 10)
 					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");
@@ -308,14 +308,20 @@
 			jGh = params[0].split("\\")[1];
 			var id = params[3];
 			var obj = $(this);
-			$get('/realSchedule/MapById',{id:id},function(result){
+			  $get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
-			});
+			});  
 			$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-			    getTime(result);
+				getTime(result);
+				/* $get('/realSchedule/MapById',{id:result[0].id},function(result){
+				    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
+					var ludan_1 = template('ludan_1',result);
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .ludan_1').html(ludan_1);
+				}); */
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_2').html(ludan_2);
@@ -228,14 +228,30 @@
 		function getTime(list){
             $.each(list, function(i, obj) {
                 if(obj.zdsj != null && obj.zdsjActual != null ){
-                    var zdsjActual = (obj.zdsjActual).split(":");
+                   /*  var zdsjActual = (obj.zdsjActual).split(":");
                     var zdsj = (obj.zdsj).split(":");
                     if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
                         obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
                     }
                     else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
                         obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
-                    }
+                    } */
+                	 var zdsjActual = (obj.zdsjActual).split(":");
+                     var zdsj = (obj.zdsj).split(":");
+                     if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                     	if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
+                     		obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
+                     	} else {
+                         	obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                     	}
+                     }
+                     else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                     	if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
+                     		obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
+                     	} else {
+                         	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                     	}
+                     }
                 }
             }); 
 		}
@@ -185,6 +185,7 @@
 						<td width="8%">日期</td>
 						<td width="5%">公司</td>
 						<td width="8%">线路</td>
+						<td width="2%">路牌</td>
 						<td width="5%">自编号</td>
 						<td width="7%">驾驶员</td>
 						<td width="4%">加油量</td>
@@ -250,6 +251,9 @@
 			{{/if}}
         </td>
+		<td  width="2%">
+            {{obj.lp}}
+        </td>
         <td width="5%">
 			<lable data-id="{{obj.id}}" class="in_carpark_nbbm">{{obj.nbbm}}</lable>