计算烂班详细忽略空驶主任务下的营运子任务

调度日报对同车相同发车时间进行排序

计算烂班详细忽略空驶主任务下的营运子任务
调度日报对同车相同发车时间进行排序
廖磊
1 parent 975edcaa
Showing 3 changed files with 174 additions and 16 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/statement/historyMessage.html
@@ -3210,6 +3210,62 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String zdsj1 = "";
         String zdsjActual1 = "";
         List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleDdrb(line, date);
+        
+        /*
+         * 对计划发车时间相同的班次进行排序 out最前 in最后
+         */
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String minfcsj = "02:00";
+        List<Line> lineList = lineRepository.findLineByCode(line);
+        if (lineList.size() > 0) {
+            String sqlMinYysj = "select start_opt from bsth_c_line_config where "
+                    + " id = ("
+                    + "select max(id) from bsth_c_line_config where line ='" + lineList.get(0).getId() + "'"
+                    + ")";
+            minfcsj = jdbcTemplate.queryForObject(sqlMinYysj, String.class);
+        }
+        String[] minSjs = minfcsj.split(":");
+        Long minSj = Long.parseLong(minSjs[0]) * 60 + Long.parseLong(minSjs[1]);
+        for (int i = 0; i < listInfo.size(); i++) {
+            ScheduleRealInfo s = listInfo.get(i);
+            if (s.getBcType().equals("out")) {
+                s.setRemark("1");
+            } else if (s.getBcType().equals("in")) {
+                s.setRemark("3");
+            } else {
+                s.setRemark("2");
+            }
+            String[] fcsj = s.getFcsj().split(":");
+            Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+
+            Long fscjT = 0L;
+            if (fcsjL < minSj) {
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(s.getScheduleDate());
+                calendar.add(calendar.DATE, 1);
+                s.setScheduleDate(calendar.getTime());
+                try {
+                    fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+
+            } else {
+                try {
+                    fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+                } catch (ParseException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                ;
+            }
+            s.setFcsjT(fscjT);
+        }
+        List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
+        listInfo2.addAll(listInfo);
+        Collections.sort(listInfo, new compareLpFcsjType());
+        Collections.sort(listInfo2,new compareDirLpFcsjType());
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
             if (!lpName.equals(t.getLpName())) {
@@ -3228,8 +3284,44 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             lpName = t.getLpName();
             list.add(t);
         }
-
+/*
         List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleDdrb2(line, date);
+        for (int i = 0; i < listInfo2.size(); i++) {
+        	 ScheduleRealInfo s = listInfo2.get(i);
+             if (s.getBcType().equals("out")) {
+                 s.setRemark("1");
+             } else if (s.getBcType().equals("in")) {
+                 s.setRemark("3");
+             } else {
+                 s.setRemark("2");
+             }
+             String[] fcsj = s.getFcsj().split(":");
+             Long fcsjL = Long.parseLong(fcsj[0]) * 60 + Long.parseLong(fcsj[1]);
+
+             Long fscjT = 0L;
+             if (fcsjL < minSj) {
+                 Calendar calendar = new GregorianCalendar();
+                 calendar.setTime(s.getScheduleDate());
+                 calendar.add(calendar.DATE, 1);
+                 s.setScheduleDate(calendar.getTime());
+                 try {
+                     fscjT = sdf.parse(sdf.format(s.getScheduleDate()) + " " + s.getFcsj()).getTime();
+                 } catch (ParseException e) {
+                     // TODO Auto-generated catch block
+                     e.printStackTrace();
+                 }
+
+             } else {
+                 try {
+                     fscjT = sdf.parse(s.getScheduleDateStr() + " " + s.getFcsj()).getTime();
+                 } catch (ParseException e) {
+                     // TODO Auto-generated catch block
+                     e.printStackTrace();
+                 }
+                 ;
+             }
+             s.setFcsjT(fscjT);
+		}*/
         List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
         List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
@@ -5612,6 +5704,23 @@ class AccountXlbm implements Comparator&lt;Map&lt;String, Object&gt;&gt; {
     }
 }
+class compareLpFcsjType implements Comparator<ScheduleRealInfo> {
+    @Override
+    public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+        // TODO Auto-generated method stub
+        return (o1.getLpName()+o1.getFcsjT() + o1.getRemark()).compareTo(o2.getLpName()+o2.getFcsjT() + o2.getRemark());
+    }
+
+}
+
+class compareDirLpFcsjType implements Comparator<ScheduleRealInfo> {
+    @Override
+    public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+        // TODO Auto-generated method stub
+        return (o1.getXlDir()+o1.getFcsjT() + o1.getRemark()+o1.getLpName()).compareTo(o2.getXlDir()+o2.getFcsjT() + o2.getRemark()+o2.getLpName());
+    }
+
+}
 class compareFcsjType implements Comparator<ScheduleRealInfo> {
     @Override
     public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
@@ -863,6 +863,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             if (sch.isSflj())
                 continue;
             cts = sch.getcTasks();
+           if(isInOut(sch))
+                continue;
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
@@ -881,8 +883,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
                 	}
                 }
             }
-            else if(isInOut(sch))
-                continue;
+           
             //主任务烂班
             else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
@@ -159,30 +159,58 @@
 			var type = "query";
 			$(".hidden").removeClass("hidden");
 			var i = layer.load(2);
-			$get('/realSchedule/historyMessage',{line:line,date:date,code:code,type:type},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_history',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms tbody').html(tbodyHtml);
-				layer.close(i);
-				
-				if(result.length == 0)
-					$("#export").attr('disabled',"true");
-				else
-					$("#export").removeAttr("disabled");
+			console.log("code:"+code);
+			if(code==""||code==null){
+				$get('/realSchedule/historyMessage',{line:line,date:date,code:code,type:type},function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('list_history',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+					layer.close(i);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+					
+				});	
+			}else{
+				$get('/report/historyMessageList',{line:line,date:date,code:code,type:type},function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('list_history_msg',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms tbody').html(tbodyHtml);
+					layer.close(i);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+					
+				});	
+			}
-			});		
 		});
 		$("#export").on("click",function(){
 			var type = "export";
 			var i = layer.load(2);
-			$get('/realSchedule/historyMessage', {line:line,date:date,code:code,type:type}, function(result){
+			if(code==""||code==null){
+				$get('/realSchedule/historyMessage', {line:line,date:date,code:code,type:type}, function(result){
 				window.open("/downloadFile/download?fileName="
 						+moment(date).format("YYYYMMDD")
 						+"-"+lineName+"-调度历史消息");
 				layer.close(i);
 			});
+			}else{
+				$get('/report/historyMessageList',{line:line,date:date,code:code,type:"export_msg"},function(result){
+				window.open("/downloadFile/download?fileName="
+						+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度消息分析");
+				layer.close(i);
+
+			});
+
+			}
 		});
 	});
@@ -203,4 +231,24 @@
 			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
+</script>
+
+<script type="text/html" id="list_history_msg">
+   {{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj[0]}}</td>
+		<!--<td>{{obj[6]}}</td>-->
+			<td>{{obj[1]}}</td>
+			<td>{{obj[2]}}</td>
+			<td>{{obj[3]}}</td>
+			<td>{{obj[4]}}</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}	
+</script>
 </script>
 \ No newline at end of file