潘钊 / bsth_control · Commits

Commit 1fe557a5b59596c9129a7958f315ec9b2f2aa688

Authored by 廖磊
2 parents 86d763ba a4a93d14
build: skipped

Merge branch 'minhang' of 

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Inline Side-by-side
Showing 30 changed files with 2548 additions and 1624 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 30 of 45 files are displayed.

src/main/java/com/bsth/XDApplication.java
  View file @1fe557a
@@ -94,9 +94,9 @@ public class XDApplication implements CommandLineRunner { @@ -94,9 +94,9 @@ public class XDApplication implements CommandLineRunner {
94 //抓取GPS数据 94 //抓取GPS数据
95 gpsDataLoader.setFlag(-1); 95 gpsDataLoader.setFlag(-1);
96 //dayOfSchedule.dataRecovery(); 96 //dayOfSchedule.dataRecovery();
97 - sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS); 97 + //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
98 //实际排班更新线程 98 //实际排班更新线程
99 - sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS); 99 + //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
100 //实际排班延迟入库线程 100 //实际排班延迟入库线程
101 //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS); 101 //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
102 //班次修正日志延迟入库 102 //班次修正日志延迟入库
src/main/java/com/bsth/controller/directive/DirectiveController.java
  View file @1fe557a
@@ -173,15 +173,10 @@ public class DirectiveController { @@ -173,15 +173,10 @@ public class DirectiveController {
173 } 173 }
174 174
175 @RequestMapping(value = "/c0a4", method = RequestMethod.POST) 175 @RequestMapping(value = "/c0a4", method = RequestMethod.POST)
176 - public int c0a4(@RequestParam String nbbm){ 176 + public Map<String, Object> c0a4(@RequestParam String nbbm){
177 return directiveService.sendC0A4(nbbm); 177 return directiveService.sendC0A4(nbbm);
178 } 178 }
179 179
180 -// @RequestMapping(value = "/c0a3", method = RequestMethod.POST)  
181 -// public int c0a3(@RequestParam DC0_A4 c0a4){  
182 -// return directiveService.sendC0A3(c0a4);  
183 -// }  
184 -  
185 @RequestMapping(value = "/c0a3", method = RequestMethod.POST) 180 @RequestMapping(value = "/c0a3", method = RequestMethod.POST)
186 public int c0a3(String json){ 181 public int c0a3(String json){
187 json = StringEscapeUtils.unescapeHtml4(json); 182 json = StringEscapeUtils.unescapeHtml4(json);
@@ -192,7 +187,18 @@ public class DirectiveController { @@ -192,7 +187,18 @@ public class DirectiveController {
192 @RequestMapping(value = "/c0a5", method = RequestMethod.POST) 187 @RequestMapping(value = "/c0a5", method = RequestMethod.POST)
193 public int c0a5(String json){ 188 public int c0a5(String json){
194 json = StringEscapeUtils.unescapeHtml4(json); 189 json = StringEscapeUtils.unescapeHtml4(json);
195 - //DC0_A3 c0a3 = JSON.toJavaObject(JSONObject.parseObject(json), DC0_A3.class);  
196 return directiveService.sendC0A5(json); 190 return directiveService.sendC0A5(json);
197 } 191 }
  192 +
  193 + /**
  194 + * 设备参数查询
  195 + * @return
  196 + */
  197 + @RequestMapping(value = "/deviceCofigList", method = RequestMethod.GET)
  198 + public Map<String, Object> deviceCofigList(
  199 + @RequestParam Map<String, String> map,
  200 + @RequestParam(defaultValue = "0") int page,
  201 + @RequestParam(defaultValue = "10") int size){
  202 + return directiveService.deviceCofigList(map, page, size);
  203 + }
198 } 204 }
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
  View file @1fe557a
1 package com.bsth.controller.directive; 1 package com.bsth.controller.directive;
2 2
  3 +import org.apache.commons.lang3.StringUtils;
3 import org.slf4j.Logger; 4 import org.slf4j.Logger;
4 import org.slf4j.LoggerFactory; 5 import org.slf4j.LoggerFactory;
5 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +60,8 @@ public class UpstreamEntrance { @@ -59,7 +60,8 @@ public class UpstreamEntrance {
59 case 0x26: 60 case 0x26:
60 // 驾驶员上报 61 // 驾驶员上报
61 D80 d80 = JSON.toJavaObject(jsonParam, D80.class); 62 D80 d80 = JSON.toJavaObject(jsonParam, D80.class);
62 - pilotReport.report(d80); 63 + if(d80!=null && StringUtils.isNotEmpty(d80.getDeviceId()))
  64 + pilotReport.report(d80);
63 break; 65 break;
64 66
65 case 0xA4: 67 case 0xA4:
@@ -67,9 +69,9 @@ public class UpstreamEntrance { @@ -67,9 +69,9 @@ public class UpstreamEntrance {
67 data.put("posPort", data.getString("posPort").trim()); 69 data.put("posPort", data.getString("posPort").trim());
68 data.put("posIpAddress", data.getString("posIpAddress").trim()); 70 data.put("posIpAddress", data.getString("posIpAddress").trim());
69 data.put("ipAddress", data.getString("ipAddress").trim()); 71 data.put("ipAddress", data.getString("ipAddress").trim());
70 - 72 +
71 DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class); 73 DC0_A4 c0a4 = JSON.toJavaObject(jsonParam, DC0_A4.class);
72 - System.out.println(c0a4); 74 + pilotReport.report(c0a4);
73 break; 75 break;
74 } 76 }
75 77
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
  View file @1fe557a
@@ -101,4 +101,14 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{ @@ -101,4 +101,14 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
101 //System.out.println(map); 101 //System.out.println(map);
102 return lineConfigService.yjtkSet(map); 102 return lineConfigService.yjtkSet(map);
103 } 103 }
  104 +
  105 + /**
  106 + * 修改场既是站的 停车场 和 站点
  107 + * @param map
  108 + * @return
  109 + */
  110 + @RequestMapping(value = "/parkAndStationSet", method = RequestMethod.POST)
  111 + public Map<String, Object> parkAndStationSet(@RequestParam Map<String, String> map){
  112 + return lineConfigService.parkAndStationSet(map);
  113 + }
104 } 114 }
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @1fe557a
@@ -294,6 +294,21 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -294,6 +294,21 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
294 return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line); 294 return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
295 } 295 }
296 296
  297 + /**
  298 + * 路单公里统计 （闵行审计专用）
  299 + * @param jGh
  300 + * @param clZbh
  301 + * @param lpName
  302 + * @param date
  303 + * @param line
  304 + * @return
  305 + */
  306 + @RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
  307 + public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
  308 + ,@RequestParam String date,@RequestParam String line){
  309 + return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
  310 + }
  311 +
297 @RequestMapping(value="/findKMBCQp",method = RequestMethod.GET) 312 @RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
298 public Map<String,Object> findKMBCQp(@RequestParam String clZbh 313 public Map<String,Object> findKMBCQp(@RequestParam String clZbh
299 ,@RequestParam String date,@RequestParam String line){ 314 ,@RequestParam String date,@RequestParam String line){
@@ -337,6 +352,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -337,6 +352,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
337 return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line); 352 return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
338 } 353 }
339 354
  355 + /**
  356 + * @Title queryListWaybill
  357 + * @Description 查询行车路单列表（闵行审计专用路单）
  358 + * @param jName 驾驶员名字
  359 + * @param clZbh 车辆自编号（内部编号）
  360 + * @param lpName 路牌
  361 + * @return
  362 + */
  363 + @RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
  364 + public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
  365 + ,@RequestParam String date,@RequestParam String line){
  366 + return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
  367 + }
  368 +
340 @RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET) 369 @RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
341 public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh, 370 public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
342 @RequestParam String date,@RequestParam String line){ 371 @RequestParam String date,@RequestParam String line){
@@ -349,6 +378,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -349,6 +378,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
349 return scheduleRealInfoService.statisticsDaily(line, date, xlName, type); 378 return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
350 } 379 }
351 380
  381 + @RequestMapping(value="/statisticsDaily_mh_2")
  382 + public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
  383 + @RequestParam String xlName, @RequestParam String type){
  384 + return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
  385 + }
  386 +
352 @RequestMapping(value="/statisticsDailyTj") 387 @RequestMapping(value="/statisticsDailyTj")
353 public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){ 388 public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
354 String gsdm=""; 389 String gsdm="";
@@ -404,6 +439,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -404,6 +439,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
404 return scheduleRealInfoService.realScheduleList(line,date); 439 return scheduleRealInfoService.realScheduleList(line,date);
405 } 440 }
406 441
  442 + @RequestMapping(value="/realScheduleList_mh_2")
  443 + public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
  444 + return scheduleRealInfoService.realScheduleList_mh_2(line,date);
  445 + }
  446 +
407 @RequestMapping(value="/realScheduleListQp") 447 @RequestMapping(value="/realScheduleListQp")
408 public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){ 448 public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
409 return scheduleRealInfoService.realScheduleListQp(line,date); 449 return scheduleRealInfoService.realScheduleListQp(line,date);
src/main/java/com/bsth/data/directive/DirectiveCreator.java
  View file @1fe557a
1 package com.bsth.data.directive; 1 package com.bsth.data.directive;
2 2
3 -import java.text.SimpleDateFormat;  
4 -import java.util.Date;  
5 -import java.util.HashMap;  
6 -import java.util.Map;  
7 -  
8 -import org.slf4j.Logger;  
9 -import org.slf4j.LoggerFactory;  
10 -  
11 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
12 import com.bsth.data.BasicData; 4 import com.bsth.data.BasicData;
13 import com.bsth.entity.directive.D60; 5 import com.bsth.entity.directive.D60;
14 import com.bsth.entity.directive.D60.D60Data; 6 import com.bsth.entity.directive.D60.D60Data;
15 import com.bsth.entity.directive.D64; 7 import com.bsth.entity.directive.D64;
16 import com.bsth.entity.directive.D64.D64Data; 8 import com.bsth.entity.directive.D64.D64Data;
  9 +import org.slf4j.Logger;
  10 +import org.slf4j.LoggerFactory;
  11 +
  12 +import java.text.SimpleDateFormat;
  13 +import java.util.Date;
  14 +import java.util.HashMap;
  15 +import java.util.Map;
17 16
18 /** 17 /**
19 * 18 *
@@ -81,7 +80,7 @@ public class DirectiveCreator { @@ -81,7 +80,7 @@ public class DirectiveCreator {
81 } 80 }
82 81
83 82
84 - public D60 createD60_02(String nbbm, String text, int upDown, int state, Date alarmTime){ 83 + public D60 createD60_01(String nbbm, String text, int upDown, int state, Date alarmTime){
85 SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm"); 84 SimpleDateFormat sdfMMddHHmm = new SimpleDateFormat("MMddHHmm");
86 85
87 Long timestamp = System.currentTimeMillis(); 86 Long timestamp = System.currentTimeMillis();
@@ -102,7 +101,7 @@ public class DirectiveCreator { @@ -102,7 +101,7 @@ public class DirectiveCreator {
102 directive.setMsgId(msgId); 101 directive.setMsgId(msgId);
103 // 构造数据 102 // 构造数据
104 data.setDeviceId(deviceId); 103 data.setDeviceId(deviceId);
105 - data.setDispatchInstruct((short) 0x02); 104 + data.setDispatchInstruct((short) 0x01);
106 data.setTimestamp(timestamp); 105 data.setTimestamp(timestamp);
107 data.setCompanyCode(company); 106 data.setCompanyCode(company);
108 data.setMsgId(msgId); 107 data.setMsgId(msgId);
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
  View file @1fe557a
@@ -307,4 +307,28 @@ public class GpsEntity { @@ -307,4 +307,28 @@ public class GpsEntity {
307 public void setSource(int source) { 307 public void setSource(int source) {
308 this.source = source; 308 this.source = source;
309 } 309 }
  310 +
  311 + public void offline(){
  312 + this.setAbnormalStatus("offline");
  313 + }
  314 +
  315 + public boolean isOnline(){
  316 + if(isOffline())
  317 + return false;
  318 +
  319 + long t = System.currentTimeMillis();
  320 +
  321 + if((t - this.getTimestamp()) > 1000 * 60){
  322 + return false;
  323 + }
  324 +
  325 + if((this.getTimestamp() - t) > 1000 * 60 * 3){
  326 + return false;
  327 + }
  328 + return true;
  329 + }
  330 +
  331 + public boolean isOffline(){
  332 + return this.getAbnormalStatus() != null && this.getAbnormalStatus().equals("offline");
  333 + }
310 } 334 }
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
  View file @1fe557a
@@ -96,10 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{ @@ -96,10 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{
96 } 96 }
97 97
98 //从站内到另一个站内 98 //从站内到另一个站内
99 - if(prev.getInstation() > 0 && gps.getInstation() > 0 99 + if(prev.getInstation() == 1 && gps.getInstation() == 1
100 && !prev.getStopNo().equals(gps.getStopNo()) 100 && !prev.getStopNo().equals(gps.getStopNo())
101 && !prev.getStation().getName().equals(gps.getStation().getName())) 101 && !prev.getStation().getName().equals(gps.getStation().getName()))
102 return true; 102 return true;
  103 +
  104 + //从场内到站内
  105 + if(prev.getInstation() == 2 && gps.getInstation() == 1){
  106 + return true;
  107 + }
103 return false; 108 return false;
104 } 109 }
105 110
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
  View file @1fe557a
@@ -45,7 +45,7 @@ public class OfflineMonitorThread extends Thread{ @@ -45,7 +45,7 @@ public class OfflineMonitorThread extends Thread{
45 continue; 45 continue;
46 46
47 if (t - gps.getTimestamp() > LOSE_TIME){ 47 if (t - gps.getTimestamp() > LOSE_TIME){
48 - gps.setAbnormalStatus("offline"); 48 + gps.offline();
49 49
50 //通知页面有设备掉线 50 //通知页面有设备掉线
51 sendUtils.deviceOffline(gps); 51 sendUtils.deviceOffline(gps);
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @1fe557a
@@ -8,13 +8,16 @@ import com.bsth.data.msg_queue.DirectivePushQueue; @@ -8,13 +8,16 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
8 import com.bsth.data.schedule.DayOfSchedule; 8 import com.bsth.data.schedule.DayOfSchedule;
9 import com.bsth.entity.Line; 9 import com.bsth.entity.Line;
10 import com.bsth.entity.directive.D80; 10 import com.bsth.entity.directive.D80;
  11 +import com.bsth.entity.directive.DC0_A4;
11 import com.bsth.entity.realcontrol.D80ReplyTemp; 12 import com.bsth.entity.realcontrol.D80ReplyTemp;
12 import com.bsth.entity.realcontrol.LineConfig; 13 import com.bsth.entity.realcontrol.LineConfig;
13 import com.bsth.entity.realcontrol.ScheduleRealInfo; 14 import com.bsth.entity.realcontrol.ScheduleRealInfo;
14 import com.bsth.repository.directive.D80Repository; 15 import com.bsth.repository.directive.D80Repository;
  16 +import com.bsth.repository.directive.DC0A4Repository;
15 import com.bsth.service.directive.DirectiveService; 17 import com.bsth.service.directive.DirectiveService;
16 import com.bsth.websocket.handler.SendUtils; 18 import com.bsth.websocket.handler.SendUtils;
17 import com.google.common.collect.ArrayListMultimap; 19 import com.google.common.collect.ArrayListMultimap;
  20 +import org.apache.commons.lang3.StringUtils;
18 import org.slf4j.Logger; 21 import org.slf4j.Logger;
19 import org.slf4j.LoggerFactory; 22 import org.slf4j.LoggerFactory;
20 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +30,7 @@ import java.util.List; @@ -27,7 +30,7 @@ import java.util.List;
27 /** 30 /**
28 * 31 *
29 * @ClassName: PilotReport 32 * @ClassName: PilotReport
30 - * @Description: TODO(驾驶员上报) 33 + * @Description: TODO(设备80协议上报处理)
31 * @author PanZhao 34 * @author PanZhao
32 * @date 2016年8月14日 下午11:37:51 35 * @date 2016年8月14日 下午11:37:51
33 * 36 *
@@ -37,31 +40,26 @@ public class PilotReport { @@ -37,31 +40,26 @@ public class PilotReport {
37 40
38 @Autowired 41 @Autowired
39 D80Repository d80Repository; 42 D80Repository d80Repository;
40 -  
41 @Autowired 43 @Autowired
42 DayOfSchedule dayOfSchedule; 44 DayOfSchedule dayOfSchedule;
43 -  
44 @Autowired 45 @Autowired
45 LineConfigData lineConfigData; 46 LineConfigData lineConfigData;
46 -  
47 @Autowired 47 @Autowired
48 DirectiveService directiveService; 48 DirectiveService directiveService;
49 -  
50 @Autowired 49 @Autowired
51 GpsRealData gpsRealData; 50 GpsRealData gpsRealData;
52 -  
53 @Autowired 51 @Autowired
54 SendUtils sendUtils; 52 SendUtils sendUtils;
55 -  
56 - //private static ScheduleComparator.FCNO schComp;  
57 - 53 +
  54 + @Autowired
  55 + DC0A4Repository dc0A4Repository;
  56 +
58 private static ArrayListMultimap<String, D80> d80MultiMap; 57 private static ArrayListMultimap<String, D80> d80MultiMap;
59 58
60 Logger logger = LoggerFactory.getLogger(PilotReport.class); 59 Logger logger = LoggerFactory.getLogger(PilotReport.class);
61 60
62 static{ 61 static{
63 d80MultiMap = ArrayListMultimap.create(); 62 d80MultiMap = ArrayListMultimap.create();
64 - //schComp = new ScheduleComparator.FCNO();  
65 } 63 }
66 64
67 public void report(D80 d80){ 65 public void report(D80 d80){
@@ -95,22 +93,31 @@ public class PilotReport { @@ -95,22 +93,31 @@ public class PilotReport {
95 93
96 case 0xA5: 94 case 0xA5:
97 //进场请求 95 //进场请求
98 - ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in"); 96 + //ScheduleRealInfo inSch = dayOfSchedule.nextByBcType(nbbm, "in");
99 //如果有对应出场班次 97 //如果有对应出场班次
100 - if(inSch != null){  
101 - d80.setRemarks("计划进场时间：" + inSch.getDfsj()); 98 + //if(inSch != null){
  99 + /*d80.setRemarks("计划进场时间：" + inSch.getDfsj());
102 //当前GPS位置 100 //当前GPS位置
103 GpsEntity gps = gpsRealData.get(d80.getDeviceId()); 101 GpsEntity gps = gpsRealData.get(d80.getDeviceId());
104 if(null != gps) 102 if(null != gps)
105 - d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));  
106 - }else  
107 - d80.setRemarks("没有进场计划"); 103 + d80.addRemarks("<br> 位置：" + coordHtmlStr(gps));*/
  104 + //}/*else
  105 + // d80.setRemarks("没有进场计划");*/
108 break; 106 break;
109 } 107 }
110 108
111 //推送到页面 109 //推送到页面
112 sendUtils.send80ToPage(d80); 110 sendUtils.send80ToPage(d80);
113 } 111 }
  112 +
  113 + public void report(DC0_A4 c0a4){
  114 + String deviceId = c0a4.getData().getDeviceId();
  115 + if(StringUtils.isNotEmpty(deviceId))
  116 + c0a4.setId(deviceId);
  117 +
  118 + //入库
  119 + dc0A4Repository.save(c0a4);
  120 + }
114 121
115 /** 122 /**
116 * 123 *
@@ -181,7 +188,7 @@ public class PilotReport { @@ -181,7 +188,7 @@ public class PilotReport {
181 sch.setZdsjActualAll(d80.getTimestamp()); 188 sch.setZdsjActualAll(d80.getTimestamp());
182 189
183 //没有里程的进场班次 190 //没有里程的进场班次
184 - if(sch.getBcsj() == null && sch.getJhlc() == null) 191 + if(isEmpty(sch.getBcsj()) && isEmpty(sch.getJhlc()))
185 sch.setFcsjActualAll(d80.getTimestamp()); 192 sch.setFcsjActualAll(d80.getTimestamp());
186 193
187 dayOfSchedule.save(sch); 194 dayOfSchedule.save(sch);
@@ -190,6 +197,14 @@ public class PilotReport { @@ -190,6 +197,14 @@ public class PilotReport {
190 } 197 }
191 } 198 }
192 } 199 }
  200 +
  201 + public boolean isEmpty(Integer v){
  202 + return v == null || v.equals(0);
  203 + }
  204 +
  205 + public boolean isEmpty(Double v){
  206 + return v == null || v.equals(0);
  207 + }
193 208
194 public void defaultReply(String nbbm, short requestCode, boolean agree){ 209 public void defaultReply(String nbbm, short requestCode, boolean agree){
195 Line line = BasicData.nbbm2LineMap.get(nbbm); 210 Line line = BasicData.nbbm2LineMap.get(nbbm);
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @1fe557a
@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON; @@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
5 import com.bsth.common.Constants; 5 import com.bsth.common.Constants;
6 import com.bsth.common.ResponseCode; 6 import com.bsth.common.ResponseCode;
  7 +import com.bsth.data.BasicData;
7 import com.bsth.data.LineConfigData; 8 import com.bsth.data.LineConfigData;
  9 +import com.bsth.data.gpsdata.GpsEntity;
8 import com.bsth.data.gpsdata.GpsRealData; 10 import com.bsth.data.gpsdata.GpsRealData;
9 import com.bsth.data.gpsdata.recovery.GpsDataRecovery; 11 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
  12 +import com.bsth.data.msg_queue.DirectivePushQueue;
10 import com.bsth.entity.realcontrol.LineConfig; 13 import com.bsth.entity.realcontrol.LineConfig;
11 import com.bsth.entity.realcontrol.ScheduleRealInfo; 14 import com.bsth.entity.realcontrol.ScheduleRealInfo;
12 import com.bsth.entity.schedule.SchedulePlanInfo; 15 import com.bsth.entity.schedule.SchedulePlanInfo;
@@ -937,7 +940,22 @@ public class DayOfSchedule { @@ -937,7 +940,22 @@ public class DayOfSchedule {
937 public void reCalcExecPlan(String nbbm){ 940 public void reCalcExecPlan(String nbbm){
938 List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm); 941 List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
939 Collections.sort(list, schFCSJComparator); 942 Collections.sort(list, schFCSJComparator);
940 - carExecutePlanMap.put(nbbm, schAttrCalculator.calcCurrentExecSch(list)); 943 +
  944 + ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
  945 + carExecutePlanMap.put(nbbm, sch);
  946 +
  947 + try {
  948 + GpsEntity gps = gpsRealData.get(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
  949 + if(gps != null && gps.isOnline()){
  950 + if(StringUtils.isNotEmpty(gps.getLineId()) && !gps.getLineId().equals(sch.getXlBm())){
  951 + //下发线路切换指令
  952 + DirectivePushQueue.put64(nbbm, sch.getXlBm(), "系统");
  953 + logger.info("车辆" + nbbm + "切换至" + sch.getXlBm() + " -原" + gps.getLineId() + " --重新计算当前执行班次！");
  954 + }
  955 + }
  956 + }catch (Exception e){
  957 + logger.error("", e);
  958 + }
941 } 959 }
942 960
943 /** 961 /**
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
  View file @1fe557a
@@ -49,25 +49,25 @@ public class SchAttrCalculator { @@ -49,25 +49,25 @@ public class SchAttrCalculator {
49 if (null == sch.getFcsjT()) 49 if (null == sch.getFcsjT())
50 calcFcsjTime(sch); 50 calcFcsjTime(sch);
51 51
52 - //計發時間 52 + //计发時間
53 if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){ 53 if(sch.getFcsj().compareTo(conf.getStartOpt()) < 0){
54 sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME); 54 sch.setFcsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsj()) + DAY_TIME);
55 } 55 }
56 56
57 - //待發時間 57 + //待发時間
58 if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){ 58 if(sch.getDfsj().compareTo(conf.getStartOpt()) < 0){
59 sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME); 59 sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()) + DAY_TIME);
60 } 60 }
61 else 61 else
62 sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj())); 62 sch.setDfsjAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getDfsj()));
63 63
64 - //實發時間 64 + //实发時間
65 if(StringUtils.isNotEmpty(sch.getFcsjActual()) && 65 if(StringUtils.isNotEmpty(sch.getFcsjActual()) &&
66 sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){ 66 sch.getFcsjActual().compareTo(conf.getStartOpt()) < 0){
67 sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME); 67 sch.setFcsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getFcsjActual()) + DAY_TIME);
68 } 68 }
69 69
70 - //實際終點時間 70 + //实际终点時間
71 if(StringUtils.isNotEmpty(sch.getZdsjActual()) && 71 if(StringUtils.isNotEmpty(sch.getZdsjActual()) &&
72 sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){ 72 sch.getZdsjActual().compareTo(conf.getStartOpt()) < 0){
73 sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME); 73 sch.setZdsjActualAll(fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr()+sch.getZdsjActual()) + DAY_TIME);
src/main/java/com/bsth/entity/directive/DC0_A4.java
  View file @1fe557a
@@ -13,13 +13,21 @@ import javax.persistence.*; @@ -13,13 +13,21 @@ import javax.persistence.*;
13 @Entity 13 @Entity
14 @Table(name = "bsth_v_C0_A4") 14 @Table(name = "bsth_v_C0_A4")
15 public class DC0_A4 extends Directive{ 15 public class DC0_A4 extends Directive{
16 - 16 +
  17 +
17 @Id 18 @Id
18 - @GeneratedValue  
19 - private Integer id; 19 + private String id;
20 20
21 private DC0A4Data data; 21 private DC0A4Data data;
22 - 22 +
  23 + public String getId() {
  24 + return id;
  25 + }
  26 +
  27 + public void setId(String id) {
  28 + this.id = id;
  29 + }
  30 +
23 @Embeddable 31 @Embeddable
24 public static class DC0A4Data { 32 public static class DC0A4Data {
25 /** 33 /**
@@ -164,14 +172,6 @@ public class DC0_A4 extends Directive{ @@ -164,14 +172,6 @@ public class DC0_A4 extends Directive{
164 } 172 }
165 } 173 }
166 174
167 - public Integer getId() {  
168 - return id;  
169 - }  
170 -  
171 - public void setId(Integer id) {  
172 - this.id = id;  
173 - }  
174 -  
175 public DC0A4Data getData() { 175 public DC0A4Data getData() {
176 return data; 176 return data;
177 } 177 }
src/main/java/com/bsth/repository/directive/DC0A4Repository.java 0 → 100644
  View file @1fe557a
  1 +package com.bsth.repository.directive;
  2 +
  3 +import com.bsth.entity.directive.DC0_A4;
  4 +import com.bsth.repository.BaseRepository;
  5 +import org.springframework.stereotype.Repository;
  6 +
  7 +/**
  8 + * C0_A4 设备回复（设备参数）
  9 + * Created by panzhao on 2017/6/28.
  10 + */
  11 +@Repository
  12 +public interface DC0A4Repository extends BaseRepository<DC0_A4, String>{
  13 +}
src/main/java/com/bsth/service/directive/DirectiveService.java
  View file @1fe557a
@@ -86,7 +86,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{ @@ -86,7 +86,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
86 86
87 D64 save64(D64 d64); 87 D64 save64(D64 d64);
88 88
89 - int sendC0A4(String nbbm); 89 + Map<String, Object> sendC0A4(String nbbm);
90 90
91 int sendC0A3(DC0_A3 c0a4); 91 int sendC0A3(DC0_A3 c0a4);
92 92
@@ -95,4 +95,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{ @@ -95,4 +95,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
95 int refreshLineFile(String deviceId); 95 int refreshLineFile(String deviceId);
96 96
97 int stateChange(String nbbm, Integer upDown, Integer state, String userName); 97 int stateChange(String nbbm, Integer upDown, Integer state, String userName);
  98 +
  99 + Map<String,Object> deviceCofigList(Map<String, String> map, int page, int size);
98 } 100 }
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @1fe557a
@@ -18,6 +18,7 @@ import com.bsth.repository.directive.D60Repository; @@ -18,6 +18,7 @@ import com.bsth.repository.directive.D60Repository;
18 import com.bsth.repository.directive.D64Repository; 18 import com.bsth.repository.directive.D64Repository;
19 import com.bsth.repository.directive.D80Repository; 19 import com.bsth.repository.directive.D80Repository;
20 import com.bsth.security.util.SecurityUtils; 20 import com.bsth.security.util.SecurityUtils;
  21 +import com.bsth.service.directive.dto.DeviceConfigDto;
21 import com.bsth.service.impl.BaseServiceImpl; 22 import com.bsth.service.impl.BaseServiceImpl;
22 import com.bsth.websocket.handler.RealControlSocketHandler; 23 import com.bsth.websocket.handler.RealControlSocketHandler;
23 import com.fasterxml.jackson.core.JsonProcessingException; 24 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -29,6 +30,8 @@ import org.joda.time.format.DateTimeFormatter; @@ -29,6 +30,8 @@ import org.joda.time.format.DateTimeFormatter;
29 import org.slf4j.Logger; 30 import org.slf4j.Logger;
30 import org.slf4j.LoggerFactory; 31 import org.slf4j.LoggerFactory;
31 import org.springframework.beans.factory.annotation.Autowired; 32 import org.springframework.beans.factory.annotation.Autowired;
  33 +import org.springframework.jdbc.core.BeanPropertyRowMapper;
  34 +import org.springframework.jdbc.core.JdbcTemplate;
32 import org.springframework.stereotype.Service; 35 import org.springframework.stereotype.Service;
33 36
34 import java.util.*; 37 import java.util.*;
@@ -36,486 +39,540 @@ import java.util.*; @@ -36,486 +39,540 @@ import java.util.*;
36 @Service 39 @Service
37 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService { 40 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService {
38 41
39 - Logger logger = LoggerFactory.getLogger(this.getClass());  
40 -  
41 - @Autowired  
42 - D60Repository d60Repository;  
43 -  
44 - @Autowired  
45 - GpsRealData gpsRealDataBuffer;  
46 -  
47 - @Autowired  
48 - D64Repository d64Repository;  
49 -  
50 - @Autowired  
51 - RealControlSocketHandler socketHandler;  
52 -  
53 - @Autowired  
54 - D80Repository d80Repository;  
55 -  
56 - @Autowired  
57 - DayOfDirectives dayOfDirectives;  
58 -  
59 - @Autowired  
60 - PilotReport pilotReport;  
61 -  
62 - @Autowired  
63 - DayOfSchedule dayOfSchedule;  
64 -  
65 - //static Long schDiff = 1000 * 60 * 60L;  
66 -  
67 - private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm")  
68 - ,fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");  
69 -  
70 - @Override  
71 - public int send60Phrase(String nbbm, String text, String sender) {  
72 - D60 d60 = null;  
73 - try {  
74 - d60 = create60Data(nbbm, text, (short) 0x00, null);  
75 - } catch (Exception e) {  
76 - logger.error("发送消息短语出现异常", e);  
77 - return -1;  
78 - }  
79 -  
80 - if (null == d60)  
81 - return -1;  
82 -  
83 - // 发送指令  
84 - int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));  
85 - if(null != sender)  
86 - d60.setSender(sender);  
87 - d60.setHttpCode(code);  
88 -  
89 - if (code == 0) {  
90 - // 添加到缓存  
91 - dayOfDirectives.put60(d60, true);  
92 - }  
93 - else{  
94 - d60.setErrorText("网关通讯失败, code: " + code);  
95 - d60Repository.save(d60);  
96 - dayOfDirectives.put60(d60, false);  
97 - }  
98 - return code;  
99 - }  
100 -  
101 - @Override  
102 - public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {  
103 - D60 d60 = null;  
104 - try {  
105 - if(sch.isDestroy()){  
106 - logger.warn("烂班不允许发送调度指令....");  
107 - return -1;  
108 - }  
109 - String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"  
110 - + sch.getQdzName() + "发往" + sch.getZdzName();  
111 -  
112 - //下发0x02指令 调度指令(闹钟有效)  
113 - Long alarmTime = System.currentTimeMillis() + 1000 * 30;  
114 - d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())  
115 - , 0, new Date(alarmTime));  
116 - } catch (Exception e) {  
117 - logger.error("生成调度指令时出现异常", e);  
118 - return -1;  
119 - }  
120 -  
121 - if (null == d60)  
122 - return -1;  
123 -  
124 - d60.setSender(sender);  
125 -  
126 - JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));  
127 -  
128 - //进场或者出场班次时，附加lock 标识  
129 - if(null != sch.getBcType()  
130 - && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))){  
131 -  
132 - jObj.put("lock", 1);  
133 - }  
134 -  
135 - // 发送指令  
136 - int code = GatewayHttpUtils.postJson(jObj.toJSONString());  
137 -  
138 - d60.setDispatch(true);  
139 - d60.setSch(sch);  
140 - d60.setHttpCode(code);  
141 -  
142 - if (code == 0) {  
143 - sch.setDirectiveState(60);  
144 - // 添加到缓存，延迟入库  
145 - dayOfDirectives.put60(d60, true);  
146 - // 通知页面  
147 - sendD60ToPage(sch);  
148 - }  
149 - else{  
150 - d60.setErrorText("网关通讯失败, code: " + code);  
151 - dayOfDirectives.put60(d60, false);  
152 - d60Repository.save(d60);  
153 - }  
154 - return code;  
155 - }  
156 -  
157 - /**  
158 - *  
159 - * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws  
160 - */  
161 - @Override  
162 - public void sendD60ToPage(ScheduleRealInfo sch) {  
163 - Map<String, Object> map = new HashMap<>();  
164 - map.put("fn", "directive");  
165 - map.put("t", sch);  
166 -  
167 - ObjectMapper mapper = new ObjectMapper();  
168 -  
169 - try {  
170 - socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));  
171 - } catch (JsonProcessingException e) {  
172 - logger.error("", e);  
173 - }  
174 - }  
175 -  
176 - @Override  
177 - public int send60Dispatch(Long id, String sender) {  
178 - ScheduleRealInfo sch = dayOfSchedule.get(id);  
179 - // 车辆已完成班次  
180 - int finish = dayOfSchedule.doneSum(sch.getClZbh());  
181 - return send60Dispatch(sch, finish, sender);  
182 - }  
183 -  
184 - @Override  
185 - public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {  
186 - logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);  
187 -  
188 - String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");  
189 - D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);  
190 -  
191 - if (null == d60)  
192 - return -1;  
193 - if(null != sender)  
194 - d60.setSender(sender);  
195 - else  
196 - d60.setSender("系统");  
197 - // 发送指令  
198 - int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));  
199 - // 添加到缓存，等待入库  
200 - d60.setHttpCode(code);  
201 - if (null != sch)  
202 - d60.setSch(sch);  
203 -  
204 -  
205 - if (code == 0) {  
206 - dayOfDirectives.put60(d60, true);  
207 - }  
208 - else{  
209 - d60.setErrorText("网关通讯失败, code: " + code);  
210 - d60Repository.save(d60);  
211 - dayOfDirectives.put60(d60, false);  
212 - }  
213 - return code;  
214 - }  
215 -  
216 - /**  
217 - * 线路切换  
218 - */  
219 - @Override  
220 - public int lineChange(String nbbm, String lineCode, String sender) {  
221 - return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);  
222 - }  
223 -  
224 -  
225 - @Override  
226 - public int lineChangeByDeviceId(String deviceId, String lineCode, String sender){  
227 - DirectiveCreator crt = new DirectiveCreator();  
228 - Long t = System.currentTimeMillis();  
229 - //生成64数据包  
230 - D64 d64 = crt.create64(deviceId, lineCode, t);  
231 -  
232 - if(null != sender)  
233 - d64.setSender(sender);  
234 - else  
235 - d64.setSender("系统");  
236 -  
237 - //String deviceId = d64.getDeviceId();  
238 - int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));  
239 - // 入库  
240 - d64.setHttpCode(code);  
241 - d64.getData().setTxtContent("切换线路[" + lineCode + "]");  
242 - dayOfDirectives.put64(d64);  
243 -  
244 - // 通知设备刷新线路文件，忽略结果  
245 - if (code == 0)  
246 - GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));  
247 - else  
248 - d64.setErrorText(" 网关通讯失败, code: " + code);  
249 -  
250 - d64Repository.save(d64);  
251 - return code;  
252 - }  
253 -  
254 - public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {  
255 -  
256 - String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);  
257 - if (null == deviceId) {  
258 - logger.error("没有设备号对照的车辆：" + nbbm);  
259 - return null;  
260 - }  
261 - // 根据当前GPS确定 上下行和营运状态  
262 - Byte upDown = null;  
263 - Integer state = null;  
264 - if (null == sch) {  
265 - GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);  
266 - if (null == gpsData) {  
267 - /* 42 + Logger logger = LoggerFactory.getLogger(this.getClass());
  43 +
  44 + @Autowired
  45 + D60Repository d60Repository;
  46 +
  47 + @Autowired
  48 + GpsRealData gpsRealDataBuffer;
  49 +
  50 + @Autowired
  51 + D64Repository d64Repository;
  52 +
  53 + @Autowired
  54 + RealControlSocketHandler socketHandler;
  55 +
  56 + @Autowired
  57 + D80Repository d80Repository;
  58 +
  59 + @Autowired
  60 + DayOfDirectives dayOfDirectives;
  61 +
  62 + @Autowired
  63 + PilotReport pilotReport;
  64 +
  65 + @Autowired
  66 + DayOfSchedule dayOfSchedule;
  67 +
  68 + @Autowired
  69 + JdbcTemplate jdbcTemplate;
  70 +
  71 + //static Long schDiff = 1000 * 60 * 60L;
  72 +
  73 + private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
  74 +
  75 + @Override
  76 + public int send60Phrase(String nbbm, String text, String sender) {
  77 + D60 d60 = null;
  78 + try {
  79 + d60 = create60Data(nbbm, text, (short) 0x00, null);
  80 + } catch (Exception e) {
  81 + logger.error("发送消息短语出现异常", e);
  82 + return -1;
  83 + }
  84 +
  85 + if (null == d60)
  86 + return -1;
  87 +
  88 + // 发送指令
  89 + int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
  90 + if (null != sender)
  91 + d60.setSender(sender);
  92 + d60.setHttpCode(code);
  93 +
  94 + if (code == 0) {
  95 + // 添加到缓存
  96 + dayOfDirectives.put60(d60, true);
  97 + } else {
  98 + d60.setErrorText("网关通讯失败, code: " + code);
  99 + d60Repository.save(d60);
  100 + dayOfDirectives.put60(d60, false);
  101 + }
  102 + return code;
  103 + }
  104 +
  105 + @Override
  106 + public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
  107 + D60 d60 = null;
  108 + try {
  109 + if (sch.isDestroy()) {
  110 + logger.warn("烂班不允许发送调度指令....");
  111 + return -1;
  112 + }
  113 + String text = "已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
  114 + + sch.getQdzName() + "发往" + sch.getZdzName();
  115 +
  116 + //下发0x01指令 调度指令(闹钟有效)
  117 + long t = System.currentTimeMillis(), alarmTime;
  118 + alarmTime = sch.getDfsjT();
  119 + if (sch.getDfsjT() < t)
  120 + alarmTime = t + 1000 * 30;
  121 +
  122 + d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
  123 + , 0, new Date(alarmTime));
  124 + } catch (Exception e) {
  125 + logger.error("生成调度指令时出现异常", e);
  126 + return -1;
  127 + }
  128 +
  129 + if (null == d60)
  130 + return -1;
  131 +
  132 + d60.setSender(sender);
  133 +
  134 + JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
  135 +
  136 + //进场或者出场班次时，附加lock 标识
  137 + if (null != sch.getBcType()
  138 + && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
  139 +
  140 + jObj.put("lock", 1);
  141 + }
  142 +
  143 + // 发送指令
  144 + int code = GatewayHttpUtils.postJson(jObj.toJSONString());
  145 +
  146 + d60.setDispatch(true);
  147 + d60.setSch(sch);
  148 + d60.setHttpCode(code);
  149 +
  150 + if (code == 0) {
  151 + sch.setDirectiveState(60);
  152 + // 添加到缓存，延迟入库
  153 + dayOfDirectives.put60(d60, true);
  154 + // 通知页面
  155 + sendD60ToPage(sch);
  156 + } else {
  157 + d60.setErrorText("网关通讯失败, code: " + code);
  158 + dayOfDirectives.put60(d60, false);
  159 + d60Repository.save(d60);
  160 + }
  161 + return code;
  162 + }
  163 +
  164 + /**
  165 + * @Title: sendDirectiveState @Description: TODO(向页面推送班次指令状态) @throws
  166 + */
  167 + @Override
  168 + public void sendD60ToPage(ScheduleRealInfo sch) {
  169 + Map<String, Object> map = new HashMap<>();
  170 + map.put("fn", "directive");
  171 + map.put("t", sch);
  172 +
  173 + ObjectMapper mapper = new ObjectMapper();
  174 +
  175 + try {
  176 + socketHandler.sendMessageToLine(sch.getXlBm(), mapper.writeValueAsString(map));
  177 + } catch (JsonProcessingException e) {
  178 + logger.error("", e);
  179 + }
  180 + }
  181 +
  182 + @Override
  183 + public int send60Dispatch(Long id, String sender) {
  184 + ScheduleRealInfo sch = dayOfSchedule.get(id);
  185 + // 车辆已完成班次
  186 + int finish = dayOfSchedule.doneSum(sch.getClZbh());
  187 + return send60Dispatch(sch, finish, sender);
  188 + }
  189 +
  190 + @Override
  191 + public int send60Operation(String nbbm, int state, int upDown, ScheduleRealInfo sch, String sender) {
  192 + logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
  193 +
  194 + String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
  195 + D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
  196 +
  197 + if (null == d60)
  198 + return -1;
  199 + if (null != sender)
  200 + d60.setSender(sender);
  201 + else
  202 + d60.setSender("系统");
  203 + // 发送指令
  204 + int code = GatewayHttpUtils.postJson(JSON.toJSONString(d60));
  205 + // 添加到缓存，等待入库
  206 + d60.setHttpCode(code);
  207 + if (null != sch)
  208 + d60.setSch(sch);
  209 +
  210 +
  211 + if (code == 0) {
  212 + dayOfDirectives.put60(d60, true);
  213 + } else {
  214 + d60.setErrorText("网关通讯失败, code: " + code);
  215 + d60Repository.save(d60);
  216 + dayOfDirectives.put60(d60, false);
  217 + }
  218 + return code;
  219 + }
  220 +
  221 + /**
  222 + * 线路切换
  223 + */
  224 + @Override
  225 + public int lineChange(String nbbm, String lineCode, String sender) {
  226 + return lineChangeByDeviceId(BasicData.deviceId2NbbmMap.inverse().get(nbbm), lineCode, sender);
  227 + }
  228 +
  229 +
  230 + @Override
  231 + public int lineChangeByDeviceId(String deviceId, String lineCode, String sender) {
  232 + DirectiveCreator crt = new DirectiveCreator();
  233 + Long t = System.currentTimeMillis();
  234 + //生成64数据包
  235 + D64 d64 = crt.create64(deviceId, lineCode, t);
  236 +
  237 + if (null != sender)
  238 + d64.setSender(sender);
  239 + else
  240 + d64.setSender("系统");
  241 +
  242 + //String deviceId = d64.getDeviceId();
  243 + int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
  244 + // 入库
  245 + d64.setHttpCode(code);
  246 + d64.getData().setTxtContent("切换线路[" + lineCode + "]");
  247 + dayOfDirectives.put64(d64);
  248 +
  249 + // 通知设备刷新线路文件，忽略结果
  250 + if (code == 0)
  251 + GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
  252 + else
  253 + d64.setErrorText(" 网关通讯失败, code: " + code);
  254 +
  255 + d64Repository.save(d64);
  256 + return code;
  257 + }
  258 +
  259 + public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
  260 +
  261 + String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
  262 + if (null == deviceId) {
  263 + logger.error("没有设备号对照的车辆：" + nbbm);
  264 + return null;
  265 + }
  266 + // 根据当前GPS确定 上下行和营运状态
  267 + Byte upDown = null;
  268 + Integer state = null;
  269 + if (null == sch) {
  270 + GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
  271 + if (null == gpsData) {
  272 + /*
268 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发 273 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发
269 * 其他指令在不确定状态的情况下，一律不允许 274 * 其他指令在不确定状态的情况下，一律不允许
270 */ 275 */
271 - if(dispatchInstruct == 0){  
272 - upDown = 0;  
273 - state = 0;  
274 - }  
275 - else{  
276 - logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);  
277 - return null;  
278 - }  
279 - }  
280 - else{  
281 - upDown = gpsData.getUpDown();  
282 - state = gpsData.getState();  
283 - }  
284 - } else {  
285 - upDown = Byte.parseByte(sch.getXlDir());  
286 - state = 0;  
287 - }  
288 -  
289 - return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);  
290 - }  
291 -  
292 - @Override  
293 - public int upDownChange(String nbbm, Integer upDown, String sender) {  
294 - return send60Operation(nbbm, 0, upDown, null, sender);  
295 - }  
296 -  
297 -  
298 - @Override  
299 - public Map<String, List<D80>> findNoCofm80(String lineCodes) {  
300 - List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);  
301 -  
302 - Map<String, List<D80>> rs = new HashMap<>();  
303 - for (String code : lineList)  
304 - rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));  
305 -  
306 - return rs;  
307 - }  
308 -  
309 - @Override  
310 - public Map<String, Object> reply80(int id, int reply) {  
311 - Map<String, Object> rs = new HashMap<>();  
312 -  
313 - D80 d80 = pilotReport.findById(id);  
314 - if (null == d80) {  
315 - rs.put("status", ResponseCode.ERROR);  
316 - rs.put("msg", "服务器没有找到对应数据！");  
317 - } else if (d80.isConfirm()) {  
318 - rs.put("status", ResponseCode.ERROR);  
319 - rs.put("msg", "该数据已经被处理了！");  
320 - } else {  
321 - SysUser user = SecurityUtils.getCurrentUser();  
322 - d80.setC0(reply, user.getUserName());  
323 - // 入库  
324 - d80Repository.save(d80);  
325 - //回复网关  
326 - int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));  
327 -  
328 - rs.put("status", ResponseCode.SUCCESS);  
329 - if (code != 0)  
330 - rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");  
331 -  
332 - pilotReport.reply(d80);  
333 - // 通知页面  
334 - Map<String, Object> sockMap = new HashMap<>();  
335 - sockMap.put("fn", "d80Confirm");  
336 - sockMap.put("id", d80.getId());  
337 - sockMap.put("lineId", d80.getData().getLineId());  
338 - socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));  
339 - }  
340 -  
341 - return rs;  
342 - }  
343 -  
344 - @Override  
345 - public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {  
346 - Map<String, Object> rsMap = new HashMap<>();  
347 - List<Directive> list = new ArrayList<>();  
348 -  
349 - switch (dType) {  
350 - case -1:  
351 - //所有指令  
352 - list = new ArrayList<>(dayOfDirectives.all());  
353 - break;  
354 - case 0:  
355 - //调度指令  
356 - Collection<D60> dptArray = dayOfDirectives.all60();  
357 - for(D60 d60 : dptArray){  
358 - if(d60.isDispatch())  
359 - list.add(d60);  
360 - }  
361 - break;  
362 - case 1:  
363 - //运营指令  
364 - Collection<D60> yyArray = dayOfDirectives.all60();  
365 - for(D60 d60 : yyArray){  
366 - if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x03  
367 - && !d60.isDispatch())  
368 - list.add(d60);  
369 - }  
370 - break;  
371 - case 2:  
372 - //线路切换指令  
373 - list.addAll(dayOfDirectives.all64());  
374 - break;  
375 - case 3:  
376 - //消息短语  
377 - Collection<D60> dyArray = dayOfDirectives.all60();  
378 - for(D60 d60 : dyArray){  
379 - if(d60 != null && d60.getData().getDispatchInstruct() == (short)0x00  
380 - && !d60.isDispatch())  
381 - list.add(d60);  
382 - }  
383 - break;  
384 - }  
385 -  
386 - // 时间倒序  
387 - Collections.sort(list, new DayOfDirectives.DComparator());  
388 - if(StringUtils.isNotBlank(nbbm)){  
389 - String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);  
390 - //按车辆过滤  
391 - List<Directive> subList = new ArrayList<>();  
392 - for(Directive d : list){  
393 - if(d.getDeviceId().equals(deviceId)){  
394 - subList.add(d);  
395 - }  
396 - }  
397 - list = subList;  
398 - }  
399 -  
400 - int count = list.size();  
401 - // 分页  
402 - int s = page * size, e = s + size;  
403 -  
404 - if (e > count)  
405 - e = count;  
406 -  
407 - List<Directive> rs = list.subList(s, e);  
408 -  
409 - // 时间格式化，车辆自编号转换  
410 - for (Directive d : rs) {  
411 - if (d.getTimeHHmm() == null)  
412 - d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));  
413 - if (d.getNbbm() == null)  
414 - d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));  
415 - }  
416 -  
417 - rsMap.put("list", rs);  
418 - rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);  
419 - rsMap.put("page", page);  
420 - return rsMap;  
421 - }  
422 -  
423 - @Override  
424 - public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {  
425 - List<D80> d80s = new ArrayList<>();  
426 -  
427 - Object nbbm = map.get("nbbm");  
428 - if(null != nbbm && StringUtils.isNotEmpty(nbbm.toString())){  
429 - d80s.addAll(pilotReport.findByCar(nbbm.toString()));  
430 - }  
431 - else{  
432 - d80s.addAll(pilotReport.findAll());  
433 - }  
434 -  
435 - Short requestCode = Short.parseShort(map.get("requestCode").toString());  
436 - if(requestCode != -1){  
437 - List<D80> temps = new ArrayList<>();  
438 - for(D80 d80 : d80s){  
439 - if(d80.getData().getRequestCode().equals(requestCode))  
440 - temps.add(d80);  
441 - }  
442 - d80s = temps;  
443 - }  
444 -  
445 - //排序  
446 - Collections.sort(d80s, new Comparator<D80>() {  
447 - @Override  
448 - public int compare(D80 o1, D80 o2) {  
449 - return (int) (o2.getTimestamp() - o1.getTimestamp());  
450 - }  
451 - });  
452 -  
453 - //分页  
454 - int count = d80s.size();  
455 - // 分页  
456 - int s = page * size, e = s + size;  
457 -  
458 - if (e > count)  
459 - e = count;  
460 -  
461 - //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");  
462 - List<D80> rs = d80s.subList(s, e);  
463 - for(D80 d80 : rs){  
464 - d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));  
465 - }  
466 -  
467 - Map<String, Object> rsMap = new HashMap<>();  
468 - rsMap.put("list", rs);  
469 - rsMap.put("totalPages", count % size == 0 ? count / size -1 : count / size);  
470 - rsMap.put("page", page);  
471 -  
472 - return rsMap;  
473 - }  
474 -  
475 - @Override  
476 - public D64 save64(D64 d64) {  
477 - return d64Repository.save(d64);  
478 - }  
479 -  
480 - @Override  
481 - public int sendC0A4(String nbbm) {  
482 - String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);  
483 -  
484 - Map<String, Object> c0a4 = new HashMap<>();  
485 - c0a4.put("deviceId", deviceId);  
486 - c0a4.put("timestamp", System.currentTimeMillis());  
487 - c0a4.put("operCode", (short)0xC0);  
488 -  
489 - Map<String, Object> data = new HashMap<>();  
490 - data.put("deviceId", deviceId);  
491 - data.put("operCode2", (short)0xA4);  
492 - c0a4.put("data", data);  
493 -  
494 - return GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));  
495 - }  
496 -  
497 - @Override  
498 - public int sendC0A3(DC0_A3 c0a3) {  
499 - GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));  
500 - return 0;  
501 - }  
502 -  
503 - @Override  
504 - public int sendC0A5(String json) {  
505 - return GatewayHttpUtils.postJson(json);  
506 - }  
507 -  
508 - @Override  
509 - public int refreshLineFile(String deviceId) {  
510 - GpsEntity gps = gpsRealDataBuffer.get(deviceId);  
511 - if(gps == null)  
512 - return -1;  
513 -  
514 - return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));  
515 - }  
516 -  
517 - @Override  
518 - public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {  
519 - return send60Operation(nbbm, state, upDown, null, userName);  
520 - } 276 + if (dispatchInstruct == 0) {
  277 + upDown = 0;
  278 + state = 0;
  279 + } else {
  280 + logger.error("没有找到gps对照，无法确认营运状态和上下行：" + nbbm);
  281 + return null;
  282 + }
  283 + } else {
  284 + upDown = gpsData.getUpDown();
  285 + state = gpsData.getState();
  286 + }
  287 + } else {
  288 + upDown = Byte.parseByte(sch.getXlDir());
  289 + state = 0;
  290 + }
  291 +
  292 + return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
  293 + }
  294 +
  295 + @Override
  296 + public int upDownChange(String nbbm, Integer upDown, String sender) {
  297 + return send60Operation(nbbm, 0, upDown, null, sender);
  298 + }
  299 +
  300 +
  301 + @Override
  302 + public Map<String, List<D80>> findNoCofm80(String lineCodes) {
  303 + List<String> lineList = Splitter.on(",").trimResults().splitToList(lineCodes);
  304 +
  305 + Map<String, List<D80>> rs = new HashMap<>();
  306 + for (String code : lineList)
  307 + rs.put(code, pilotReport.unconfirmed80(Integer.parseInt(code)));
  308 +
  309 + return rs;
  310 + }
  311 +
  312 + @Override
  313 + public Map<String, Object> reply80(int id, int reply) {
  314 + Map<String, Object> rs = new HashMap<>();
  315 + D80 d80 = pilotReport.findById(id);
  316 + try {
  317 + if (null == d80) {
  318 + rs.put("status", ResponseCode.ERROR);
  319 + rs.put("msg", "服务器没有找到对应数据！");
  320 + } else if (d80.isConfirm()) {
  321 + rs.put("status", ResponseCode.ERROR);
  322 + rs.put("msg", "该数据已经被处理了！");
  323 + } else {
  324 + SysUser user = SecurityUtils.getCurrentUser();
  325 + d80.setC0(reply, user.getUserName());
  326 + // 入库
  327 + d80Repository.save(d80);
  328 + //回复网关
  329 + int code = GatewayHttpUtils.postJson(JSON.toJSONString(d80.getC0()));
  330 +
  331 + rs.put("status", ResponseCode.SUCCESS);
  332 + if (code != 0)
  333 + rs.put("msg", "发送C0响应指令到车载设备失败，但该操作已经被系统记录！");
  334 +
  335 + pilotReport.reply(d80);
  336 + }
  337 + } catch (Exception e) {
  338 + logger.error("80响应出现异常...", e);
  339 + rs.put("status", ResponseCode.SUCCESS);
  340 + }
  341 + // 通知页面
  342 + Map<String, Object> sockMap = new HashMap<>();
  343 + sockMap.put("fn", "d80Confirm");
  344 + sockMap.put("id", d80.getId());
  345 + sockMap.put("lineId", d80.getData().getLineId());
  346 + socketHandler.sendMessageToLine(d80.getData().getLineId().toString(), JSON.toJSONString(sockMap));
  347 +
  348 + return rs;
  349 + }
  350 +
  351 + @Override
  352 + public Map<String, Object> findDirective(String nbbm, int dType, int page, int size) {
  353 + Map<String, Object> rsMap = new HashMap<>();
  354 + List<Directive> list = new ArrayList<>();
  355 +
  356 + switch (dType) {
  357 + case -1:
  358 + //所有指令
  359 + list = new ArrayList<>(dayOfDirectives.all());
  360 + break;
  361 + case 0:
  362 + //调度指令
  363 + Collection<D60> dptArray = dayOfDirectives.all60();
  364 + for (D60 d60 : dptArray) {
  365 + if (d60.isDispatch())
  366 + list.add(d60);
  367 + }
  368 + break;
  369 + case 1:
  370 + //运营指令
  371 + Collection<D60> yyArray = dayOfDirectives.all60();
  372 + for (D60 d60 : yyArray) {
  373 + if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x03
  374 + && !d60.isDispatch())
  375 + list.add(d60);
  376 + }
  377 + break;
  378 + case 2:
  379 + //线路切换指令
  380 + list.addAll(dayOfDirectives.all64());
  381 + break;
  382 + case 3:
  383 + //消息短语
  384 + Collection<D60> dyArray = dayOfDirectives.all60();
  385 + for (D60 d60 : dyArray) {
  386 + if (d60 != null && d60.getData().getDispatchInstruct() == (short) 0x00
  387 + && !d60.isDispatch())
  388 + list.add(d60);
  389 + }
  390 + break;
  391 + }
  392 +
  393 + // 时间倒序
  394 + Collections.sort(list, new DayOfDirectives.DComparator());
  395 + if (StringUtils.isNotBlank(nbbm)) {
  396 + String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
  397 + //按车辆过滤
  398 + List<Directive> subList = new ArrayList<>();
  399 + for (Directive d : list) {
  400 + if (d.getDeviceId().equals(deviceId)) {
  401 + subList.add(d);
  402 + }
  403 + }
  404 + list = subList;
  405 + }
  406 +
  407 + int count = list.size();
  408 + // 分页
  409 + int s = page * size, e = s + size;
  410 +
  411 + if (e > count)
  412 + e = count;
  413 +
  414 + List<Directive> rs = list.subList(s, e);
  415 +
  416 + // 时间格式化，车辆自编号转换
  417 + for (Directive d : rs) {
  418 + if (d.getTimeHHmm() == null)
  419 + d.setTimeHHmm(fmtHHmm.print(d.getTimestamp()));
  420 + if (d.getNbbm() == null)
  421 + d.setNbbm(BasicData.deviceId2NbbmMap.get(d.getDeviceId()));
  422 + }
  423 +
  424 + rsMap.put("list", rs);
  425 + rsMap.put("totalPages", count % size == 0 ? (count / size - 1) : count / size);
  426 + rsMap.put("page", page);
  427 + return rsMap;
  428 + }
  429 +
  430 + @Override
  431 + public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
  432 + List<D80> d80s = new ArrayList<>();
  433 +
  434 + Object nbbm = map.get("nbbm");
  435 + if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
  436 + d80s.addAll(pilotReport.findByCar(nbbm.toString()));
  437 + } else {
  438 + d80s.addAll(pilotReport.findAll());
  439 + }
  440 +
  441 + Short requestCode = Short.parseShort(map.get("requestCode").toString());
  442 + if (requestCode != -1) {
  443 + List<D80> temps = new ArrayList<>();
  444 + for (D80 d80 : d80s) {
  445 + if (d80.getData().getRequestCode().equals(requestCode))
  446 + temps.add(d80);
  447 + }
  448 + d80s = temps;
  449 + }
  450 +
  451 + //排序
  452 + Collections.sort(d80s, new Comparator<D80>() {
  453 + @Override
  454 + public int compare(D80 o1, D80 o2) {
  455 + return (int) (o2.getTimestamp() - o1.getTimestamp());
  456 + }
  457 + });
  458 +
  459 + //分页
  460 + int count = d80s.size();
  461 + // 分页
  462 + int s = page * size, e = s + size;
  463 +
  464 + if (e > count)
  465 + e = count;
  466 +
  467 + //SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
  468 + List<D80> rs = d80s.subList(s, e);
  469 + for (D80 d80 : rs) {
  470 + d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
  471 + }
  472 +
  473 + Map<String, Object> rsMap = new HashMap<>();
  474 + rsMap.put("list", rs);
  475 + rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
  476 + rsMap.put("page", page);
  477 +
  478 + return rsMap;
  479 + }
  480 +
  481 + @Override
  482 + public D64 save64(D64 d64) {
  483 + return d64Repository.save(d64);
  484 + }
  485 +
  486 + @Override
  487 + public Map<String, Object> sendC0A4(String nbbm) {
  488 + Map<String, Object> rs = new HashMap<>();
  489 +
  490 + String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
  491 +
  492 + GpsEntity gps = gpsRealDataBuffer.get(deviceId);
  493 + if(gps == null || gps.isOffline()){
  494 + rs.put("status", ResponseCode.ERROR);
  495 + rs.put("msg", "下发指令失败，设备离线");
  496 + return rs;
  497 + }
  498 +
  499 + Map<String, Object> c0a4 = new HashMap<>();
  500 + c0a4.put("deviceId", deviceId);
  501 + c0a4.put("timestamp", System.currentTimeMillis());
  502 + c0a4.put("operCode", (short) 0xC0);
  503 +
  504 + Map<String, Object> data = new HashMap<>();
  505 + data.put("deviceId", deviceId);
  506 + data.put("operCode2", (short) 0xA4);
  507 + c0a4.put("data", data);
  508 +
  509 + int code = GatewayHttpUtils.postJson(JSON.toJSONString(c0a4));
  510 + if(code != 0){
  511 + rs.put("status", ResponseCode.ERROR);
  512 + rs.put("msg", "和网关通讯失败， code " + code);
  513 + }
  514 + else{
  515 + rs.put("status", ResponseCode.SUCCESS);
  516 + }
  517 + return rs;
  518 + }
  519 +
  520 + @Override
  521 + public int sendC0A3(DC0_A3 c0a3) {
  522 + GatewayHttpUtils.postJson(JSON.toJSONString(c0a3));
  523 + return 0;
  524 + }
  525 +
  526 + @Override
  527 + public int sendC0A5(String json) {
  528 + return GatewayHttpUtils.postJson(json);
  529 + }
  530 +
  531 + @Override
  532 + public int refreshLineFile(String deviceId) {
  533 + GpsEntity gps = gpsRealDataBuffer.get(deviceId);
  534 + if (gps == null)
  535 + return -1;
  536 +
  537 + return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
  538 + }
  539 +
  540 + @Override
  541 + public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
  542 + return send60Operation(nbbm, state, upDown, null, userName);
  543 + }
  544 +
  545 + @Override
  546 + public Map<String, Object> deviceCofigList(Map<String, String> map, int page, int size) {
  547 + Map<String, Object> rs = new HashMap<>();
  548 + try {
  549 + String conts="";
  550 + if(StringUtils.isNotBlank(map.get("lineId"))){
  551 + conts+=" AND xl='" + map.get("lineId")+"'";
  552 + }
  553 + if(StringUtils.isNotBlank(map.get("nbbm"))){
  554 + conts+=" AND inside_code like '%" + map.get("nbbm")+"%'";
  555 + }
  556 + if(StringUtils.isNotBlank(map.get("deviceId"))){
  557 + conts+=" AND equipment_code like '%" + map.get("deviceId")+"%'";
  558 + }
  559 +
  560 + String sql = "select * from (SELECT * FROM (SELECT id AS cl_id,inside_code,equipment_code FROM bsth_c_cars ) t1 LEFT JOIN bsth_v_c0_a4 t2 ON t1.equipment_code = t2.id LEFT JOIN (SELECT xl,cl FROM bsth_c_s_ccinfo WHERE id IN (SELECT max(id) FROM bsth_c_s_ccinfo GROUP BY cl)) t3 ON t1.cl_id = t3.cl ORDER BY t2.`timestamp` DESC) t4 where 1=1 "+conts;
  561 +
  562 + int count = jdbcTemplate.queryForObject("select count(*) from ("+sql+") c1", Integer.class);
  563 + int totalPages = count % size == 0 ? count / size : count / size + 1;
  564 + int s = page * size;
  565 + List<DeviceConfigDto> list = jdbcTemplate.query(sql + " LIMIT " + s + "," + size, new BeanPropertyRowMapper<>(DeviceConfigDto.class));
  566 +
  567 + rs.put("status", ResponseCode.SUCCESS);
  568 + rs.put("list", list);
  569 + rs.put("totalPages", totalPages);
  570 + rs.put("page", page);
  571 + } catch (Exception e) {
  572 + e.printStackTrace();
  573 + logger.error("", e);
  574 + rs.put("status", ResponseCode.ERROR);
  575 + }
  576 + return rs;
  577 + }
521 } 578 }
src/main/java/com/bsth/service/directive/dto/DeviceConfigDto.java 0 → 100644
  View file @1fe557a
  1 +package com.bsth.service.directive.dto;
  2 +
  3 +/**
  4 + * Created by panzhao on 2017/6/28.
  5 + */
  6 +public class DeviceConfigDto {
  7 +
  8 + private String xl;
  9 + private String id;
  10 + private String insideCode;
  11 + private String equipmentCode;
  12 + /** 网关IP地址 */
  13 + private String ipAddress;
  14 + /** 网关端口 */
  15 + private Integer port;
  16 + /** 定时定距上报模式 */
  17 + private Short reportMode;
  18 + /** 定时上报时间间隔 */
  19 + private Integer interval;
  20 + /** 定距上报距离间隔 */
  21 + private String distance;
  22 + /** 非线路状态超速阀门 */
  23 + private Short speedingThreshold;
  24 + /** 预警阀门 */
  25 + private Short alarmThreshold;
  26 + /** pos机IP地址 */
  27 + private String posIpAddress;
  28 + /** pos机端口 */
  29 + private String posPort;
  30 + /** 延迟机关时间 */
  31 + private Integer delay;
  32 + /** 中门视频切换到码表界面速度阀门 默认45 */
  33 + private Short speedThreshold1;
  34 + /** 码表界面切换到中门视频速度阀门 默认35 */
  35 + private Short speedThreshold2;
  36 + /** 对比度 */
  37 + private Short contrast;
  38 + /** 亮度 */
  39 + private Short brightness;
  40 + /** 饱和度 */
  41 + private Short saturation;
  42 +
  43 + private Long timestamp;
  44 +
  45 + public String getId() {
  46 + return id;
  47 + }
  48 +
  49 + public void setId(String id) {
  50 + this.id = id;
  51 + }
  52 +
  53 + public String getEquipmentCode() {
  54 + return equipmentCode;
  55 + }
  56 +
  57 + public void setEquipmentCode(String equipmentCode) {
  58 + this.equipmentCode = equipmentCode;
  59 + }
  60 +
  61 + public String getIpAddress() {
  62 + return ipAddress;
  63 + }
  64 +
  65 + public void setIpAddress(String ipAddress) {
  66 + this.ipAddress = ipAddress;
  67 + }
  68 +
  69 + public Integer getPort() {
  70 + return port;
  71 + }
  72 +
  73 + public void setPort(Integer port) {
  74 + this.port = port;
  75 + }
  76 +
  77 + public Short getReportMode() {
  78 + return reportMode;
  79 + }
  80 +
  81 + public void setReportMode(Short reportMode) {
  82 + this.reportMode = reportMode;
  83 + }
  84 +
  85 + public Integer getInterval() {
  86 + return interval;
  87 + }
  88 +
  89 + public void setInterval(Integer interval) {
  90 + this.interval = interval;
  91 + }
  92 +
  93 + public String getDistance() {
  94 + return distance;
  95 + }
  96 +
  97 + public void setDistance(String distance) {
  98 + this.distance = distance;
  99 + }
  100 +
  101 + public Short getSpeedingThreshold() {
  102 + return speedingThreshold;
  103 + }
  104 +
  105 + public void setSpeedingThreshold(Short speedingThreshold) {
  106 + this.speedingThreshold = speedingThreshold;
  107 + }
  108 +
  109 + public Short getAlarmThreshold() {
  110 + return alarmThreshold;
  111 + }
  112 +
  113 + public void setAlarmThreshold(Short alarmThreshold) {
  114 + this.alarmThreshold = alarmThreshold;
  115 + }
  116 +
  117 + public String getPosIpAddress() {
  118 + return posIpAddress;
  119 + }
  120 +
  121 + public void setPosIpAddress(String posIpAddress) {
  122 + this.posIpAddress = posIpAddress;
  123 + }
  124 +
  125 + public String getPosPort() {
  126 + return posPort;
  127 + }
  128 +
  129 + public void setPosPort(String posPort) {
  130 + this.posPort = posPort;
  131 + }
  132 +
  133 + public Integer getDelay() {
  134 + return delay;
  135 + }
  136 +
  137 + public void setDelay(Integer delay) {
  138 + this.delay = delay;
  139 + }
  140 +
  141 + public Short getSpeedThreshold1() {
  142 + return speedThreshold1;
  143 + }
  144 +
  145 + public void setSpeedThreshold1(Short speedThreshold1) {
  146 + this.speedThreshold1 = speedThreshold1;
  147 + }
  148 +
  149 + public Short getSpeedThreshold2() {
  150 + return speedThreshold2;
  151 + }
  152 +
  153 + public void setSpeedThreshold2(Short speedThreshold2) {
  154 + this.speedThreshold2 = speedThreshold2;
  155 + }
  156 +
  157 + public Short getContrast() {
  158 + return contrast;
  159 + }
  160 +
  161 + public void setContrast(Short contrast) {
  162 + this.contrast = contrast;
  163 + }
  164 +
  165 + public Short getBrightness() {
  166 + return brightness;
  167 + }
  168 +
  169 + public void setBrightness(Short brightness) {
  170 + this.brightness = brightness;
  171 + }
  172 +
  173 + public Short getSaturation() {
  174 + return saturation;
  175 + }
  176 +
  177 + public void setSaturation(Short saturation) {
  178 + this.saturation = saturation;
  179 + }
  180 +
  181 + public Long getTimestamp() {
  182 + return timestamp;
  183 + }
  184 +
  185 + public void setTimestamp(Long timestamp) {
  186 + this.timestamp = timestamp;
  187 + }
  188 +
  189 + public String getInsideCode() {
  190 + return insideCode;
  191 + }
  192 +
  193 + public void setInsideCode(String insideCode) {
  194 + this.insideCode = insideCode;
  195 + }
  196 +
  197 + public String getXl() {
  198 + return xl;
  199 + }
  200 +
  201 + public void setXl(String xl) {
  202 + this.xl = xl;
  203 + }
  204 +}
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @1fe557a
@@ -69,10 +69,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -69,10 +69,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
69 @Autowired 69 @Autowired
70 private StationRouteRepository stationRouteRepository; 70 private StationRouteRepository stationRouteRepository;
71 71
72 - // 线路标准信息repository  
73 - @Autowired  
74 - private LineInformationRepository lineInformationRepository;  
75 -  
76 // 车辆repository 72 // 车辆repository
77 @Autowired 73 @Autowired
78 private CarsRepository carsRepository; 74 private CarsRepository carsRepository;
@@ -89,14 +85,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -89,14 +85,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
89 @Autowired 85 @Autowired
90 private TTInfoDetailRepository ttInfoDetailRepository; 86 private TTInfoDetailRepository ttInfoDetailRepository;
91 87
92 - // 车辆配置信息repository  
93 - @Autowired  
94 - private CarConfigInfoRepository carConfigInfoRepository;  
95 -  
96 - // 人员配置信息repository  
97 - @Autowired  
98 - private EmployeeConfigInfoRepository employeeConfigInfoRepository;  
99 -  
100 // 排班计划明细repository 88 // 排班计划明细repository
101 @Autowired 89 @Autowired
102 private SchedulePlanInfoRepository schedulePlanInfoRepository; 90 private SchedulePlanInfoRepository schedulePlanInfoRepository;
@@ -109,6 +97,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -109,6 +97,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
109 @Autowired 97 @Autowired
110 private SKBUploadLoggerRepository skbUploadLoggerRepository; 98 private SKBUploadLoggerRepository skbUploadLoggerRepository;
111 99
  100 + // 线路站点repository
  101 + @Autowired
  102 + private StationRepository stationRepository;
  103 +
112 104
113 // 运管处接口 105 // 运管处接口
114 private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint(); 106 private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -367,7 +359,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -367,7 +359,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
367 continue; 359 continue;
368 } 360 }
369 361
370 - scheduleRealInfo.getQdzCode();  
371 sf.append("<LD>"); 362 sf.append("<LD>");
372 sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>"); 363 sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
373 sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>"); 364 sf.append("<SXX>"+scheduleRealInfo.getXlDir()+"</SXX>");
@@ -822,13 +813,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -822,13 +813,15 @@ public class TrafficManageServiceImpl implements TrafficManageService{
822 sBuffer.append("<BC>"); 813 sBuffer.append("<BC>");
823 sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>"); 814 sBuffer.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
824 sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>"); 815 sBuffer.append("<SXX>").append(ttInfoDetail.getXlDir()).append("</SXX>");
825 - sBuffer.append("<FCZDMC>").append(ttInfoDetail.getQdz().getStationName()).append("</FCZDMC>"); 816 + sBuffer.append("<FCZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
  817 + +"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
826 // 起点站的参数 818 // 起点站的参数
827 otherMap.put("stationMark","B"); 819 otherMap.put("stationMark","B");
828 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 820 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
829 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>"); 821 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap)).append("</ZDXH>");
830 sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>"); 822 sBuffer.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
831 - sBuffer.append("<DDZDMC>").append(ttInfoDetail.getZdz().getStationName()).append("</DDZDMC>"); 823 + sBuffer.append("<DDZDMC>").append(BasicData.stationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
  824 + +"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
832 // 起点站的参数 825 // 起点站的参数
833 otherMap.put("stationMark","E"); 826 otherMap.put("stationMark","E");
834 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 827 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
@@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1331,9 +1324,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1331 if(otherParam != null && otherParam.get("stationMark") != null){ 1324 if(otherParam != null && otherParam.get("stationMark") != null){
1332 stationMark = otherParam.get("stationMark"); 1325 stationMark = otherParam.get("stationMark");
1333 if(stationMark.equals("B")){ // 起点站 1326 if(stationMark.equals("B")){ // 起点站
1334 - stationCode = ttid.getQdz().getStationCod(); 1327 + stationCode = ttid.getQdzCode();
1335 }else if(stationMark.equals("E")){ // 终点站 1328 }else if(stationMark.equals("E")){ // 终点站
1336 - stationCode = ttid.getZdz().getStationCod(); 1329 + stationCode = ttid.getZdzCode();
1337 } 1330 }
1338 } 1331 }
1339 } 1332 }
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
  View file @1fe557a
@@ -22,4 +22,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{ @@ -22,4 +22,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
22 Map<String,Object> bufferTimeDiff(String lineCode, String field, String value); 22 Map<String,Object> bufferTimeDiff(String lineCode, String field, String value);
23 23
24 Map<String,Object> yjtkSet(Map<String, String> map); 24 Map<String,Object> yjtkSet(Map<String, String> map);
  25 +
  26 + Map<String,Object> parkAndStationSet(Map<String, String> map);
25 } 27 }
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @1fe557a
@@ -172,4 +172,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L @@ -172,4 +172,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
172 Map<String,Object> addToHistory(ScheduleRealInfo sch); 172 Map<String,Object> addToHistory(ScheduleRealInfo sch);
173 173
174 Map<String, Object> deleteToHistory(Long id); 174 Map<String, Object> deleteToHistory(Long id);
  175 +
  176 + List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh, String lpName, String date, String line);
  177 +
  178 + Map<String,Object> findKMBC_mh_2(String jGh, String clZbh, String lpName, String date, String line);
  179 +
  180 + List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
  181 +
  182 + List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
175 } 183 }
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
  View file @1fe557a
@@ -179,4 +179,28 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; @@ -179,4 +179,28 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt;
179 } 179 }
180 return rs; 180 return rs;
181 } 181 }
  182 +
  183 + @Override
  184 + public Map<String, Object> parkAndStationSet(Map<String, String> map) {
  185 + String lineCode = map.get("lineCode").toString();
  186 + String twinsPark = map.get("twinsPark").toString();
  187 + String twinsStation = map.get("twinsStation").toString();
  188 +
  189 + Map<String, Object> rs = new HashMap<>();
  190 + try {
  191 + LineConfig conf = lineConfigData.get(lineCode);
  192 + conf.setTwinsPark(twinsPark);
  193 + conf.setTwinsStation(twinsStation);
  194 +
  195 + lineConfigData.set(conf);
  196 +
  197 + rs.put("status", ResponseCode.SUCCESS);
  198 + rs.put("conf", conf);
  199 + } catch (Exception e) {
  200 + rs.put("status", ResponseCode.ERROR);
  201 + rs.put("msg", e.getMessage());
  202 + logger.error("", e);
  203 + }
  204 + return rs;
  205 + }
182 } 206 }
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @1fe557a
@@ -260,6 +260,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -260,6 +260,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
260 schedule.setLate2(false); 260 schedule.setLate2(false);
261 LateAdjustHandle.remove(schedule); 261 LateAdjustHandle.remove(schedule);
262 } 262 }
  263 +
  264 + try {
  265 + if(!schedule.getDirectiveState().equals(-1) && schedule.getStatus()==0){
  266 + //重新下发调度指令
  267 + directiveService.send60Dispatch(schedule.getId(), "待发@系统");
  268 + }
  269 + }catch (Exception e){
  270 + logger.error("", e);
  271 + }
  272 +
263 // 持久化到数据库 273 // 持久化到数据库
264 dayOfSchedule.save(schedule); 274 dayOfSchedule.save(schedule);
265 275
@@ -544,9 +554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -544,9 +554,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
544 t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime()); 554 t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
545 t.setJhlcOrig(t.getJhlc()); 555 t.setJhlcOrig(t.getJhlc());
546 556
547 - //班次历时  
548 - t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);  
549 -  
550 //起终点名称 557 //起终点名称
551 String prefix = t.getXlBm() + "_" + t.getXlDir() + "_"; 558 String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
552 t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix)); 559 t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
@@ -554,6 +561,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -554,6 +561,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
554 561
555 //计算班次实际执行时间 562 //计算班次实际执行时间
556 schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t); 563 schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
  564 +
  565 + //处理计达跨24点
  566 + LineConfig conf = lineConfigData.get(t.getXlBm());
  567 + if(t.getZdsj().compareTo(conf.getStartOpt()) < 0){
  568 + t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
  569 + }
  570 +
  571 + //班次历时
  572 + t.setBcsj((int) ((t.getZdsjT() - t.getDfsjT()) / 1000 / 60));
557 if (t.getZdsjT() < t.getFcsjT()) { 573 if (t.getZdsjT() < t.getFcsjT()) {
558 rs.put("status", ResponseCode.ERROR); 574 rs.put("status", ResponseCode.ERROR);
559 rs.put("msg", "起终点时间异常！"); 575 rs.put("msg", "起终点时间异常！");
@@ -733,13 +749,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -733,13 +749,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
733 state = state + "+1"; 749 state = state + "+1";
734 type = "ASC"; 750 type = "ASC";
735 } 751 }
736 - /*String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"  
737 - + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,"  
738 - + " min(s.fcsj) as fcsj, min(s.schedule_date) as date"  
739 - + " from bsth_c_s_sp_info_real s "  
740 - + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "  
741 - + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"  
742 - + " order by (" + state + "),dateStr,fcsj " + type;*/  
743 String sqlMinYysj="select start_opt from bsth_c_line_config where " 752 String sqlMinYysj="select start_opt from bsth_c_line_config where "
744 + " id = (" 753 + " id = ("
745 + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'" 754 + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
@@ -773,43 +782,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -773,43 +782,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
773 } 782 }
774 }); 783 });
775 if (lpname.equals("lpName")) { 784 if (lpname.equals("lpName")) {
776 - /* SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");  
777 - String sqlMinYysj="select start_opt from bsth_c_line_config where "  
778 - + " id = ("  
779 - + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"  
780 - + ")";  
781 - String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);  
782 - String[] minSjs = minfcsj.split(":");  
783 - Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);  
784 - for (int i = 0; i < list.size(); i++) {  
785 - ScheduleRealInfo s=list.get(i);  
786 - String[] fcsj= s.getFcsj().split(":");  
787 - Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);  
788 -  
789 - Long fscjT=0L;  
790 - if(fcsjL<minSj){  
791 - Calendar calendar = new GregorianCalendar();  
792 - calendar.setTime(s.getScheduleDate());  
793 - calendar.add(calendar.DATE,1);  
794 - s.setScheduleDate(calendar.getTime());  
795 - try {  
796 - fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();  
797 - } catch (ParseException e) {  
798 - // TODO Auto-generated catch block  
799 - e.printStackTrace();  
800 - }  
801 -  
802 - }else{  
803 - try {  
804 - fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();  
805 - } catch (ParseException e) {  
806 - // TODO Auto-generated catch block  
807 - e.printStackTrace();  
808 - };  
809 - }  
810 - s.setFcsjT(fscjT);  
811 - }  
812 - Collections.sort(list, new ComparableReal());*/ 785 +
813 List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>(); 786 List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
814 Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); 787 Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
815 // if (px.equals("desc")) { 788 // if (px.equals("desc")) {
@@ -826,9 +799,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -826,9 +799,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
826 listNew.add(t); 799 listNew.add(t);
827 } 800 }
828 } else { 801 } else {
829 -// if (zt == 2) {  
830 -// listNew.add(t);  
831 -// }  
832 continue; 802 continue;
833 } 803 }
834 } 804 }
@@ -846,30 +816,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -846,30 +816,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
846 listNew.add(t); 816 listNew.add(t);
847 } 817 }
848 } 818 }
849 - /*} else {  
850 - int zt = 0;  
851 - for (int l = 0; l < 3; l++) {  
852 - for (int i = 0; i < list.size(); i++) {  
853 - ScheduleRealInfo t = list.get(i);  
854 - if (t.getLpName().indexOf("+") != -1) {  
855 - if (zt == 2) {  
856 - listNew.add(t);  
857 - }  
858 -  
859 - } else if (pattern.matcher(t.getLpName()).matches()) {  
860 - if (zt == 1) {  
861 - listNew.add(t);  
862 - }  
863 - } else {  
864 - if (zt == 0) {  
865 - listNew.add(t);  
866 - }  
867 - }  
868 - }  
869 - zt++;  
870 - }  
871 -  
872 - }*/  
873 return listNew; 819 return listNew;
874 } else { 820 } else {
875 return list; 821 return list;
@@ -1089,14 +1035,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1089,14 +1035,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1089 List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr)); 1035 List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
1090 1036
1091 Map<Integer, Integer> map = new HashMap<>(); 1037 Map<Integer, Integer> map = new HashMap<>();
1092 - /*Integer code;  
1093 - for (String lineCode : lineList) {  
1094 - code = Integer.parseInt(lineCode);  
1095 - if (!ScheduleBuffer.trustMap.containsKey(lineCode))  
1096 - ScheduleBuffer.trustMap.put(code, 0);  
1097 -  
1098 - map.put(code, ScheduleBuffer.trustMap.get(code));  
1099 - }*/  
1100 return map; 1038 return map;
1101 } 1039 }
1102 1040
@@ -1184,17 +1122,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1184,17 +1122,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1184 rs.put("status", ResponseCode.ERROR); 1122 rs.put("status", ResponseCode.ERROR);
1185 rs.put("msg", "无实发时间，无法撤销！"); 1123 rs.put("msg", "无实发时间，无法撤销！");
1186 } else { 1124 } else {
1187 - //将对应的到离站数据标记为不可信 ### 废弃的代码 ####  
1188 - /*List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());  
1189 - for (ArrivalEntity arr : list) {  
1190 - if (arr.getInOut() == 1  
1191 - && arr.getUpDown() == Integer.parseInt(sch.getXlDir())  
1192 - && arr.getStopNo().equals(sch.getQdzCode())  
1193 - && Math.abs(arr.getTs() - sch.getFcsjActualTime()) < 1000 * 60) {  
1194 - arr.setEnable(false);  
1195 - break;  
1196 - }  
1197 - }*/  
1198 //日志记录 1125 //日志记录
1199 ScheduleModifyLogger.cxsf(sch); 1126 ScheduleModifyLogger.cxsf(sch);
1200 1127
@@ -1671,122 +1598,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1671,122 +1598,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1671 } 1598 }
1672 1599
1673 1600
1674 - /* @Override  
1675 - public Map<String, Object> findKMBC(String jName, String clZbh, 1601 + public Map<String, Object> findKMBC(String jGh, String clZbh,
1676 String lpName, String date, String line) { 1602 String lpName, String date, String line) {
1677 - List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);  
1678 - DecimalFormat format = new DecimalFormat("0.00");  
1679 -// int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);  
1680 -// int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);  
1681 - int jhbc = 0, cjbc = 0, ljbc = 0;  
1682 - double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0,jhlcOrig=0, jcclc = 0;  
1683 - float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;  
1684 Map<String, Object> map = new HashMap<String, Object>(); 1603 Map<String, Object> map = new HashMap<String, Object>();
1685 - for (ScheduleRealInfo scheduleRealInfo : list) {  
1686 - if (scheduleRealInfo != null) {  
1687 - //计划里程（主任务过滤掉临加班次），  
1688 - //烂班里程（主任务烂班），  
1689 - //临加里程（主任务临加），  
1690 - //计划班次，烂班班次，增加班次  
1691 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
1692 - jhlcOrig = scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();  
1693 -  
1694 - if (scheduleRealInfo.isSflj()) {  
1695 - addMileage += tempJhlc;  
1696 - if (scheduleRealInfo.getBcType().equals("in")  
1697 - || scheduleRealInfo.getBcType().equals("out")) {  
1698 - addMileageJc +=tempJhlc;  
1699 - }else{  
1700 - ljbc++;  
1701 - addMileageYy +=tempJhlc;  
1702 - }  
1703 -  
1704 - } else {  
1705 - if (!(scheduleRealInfo.getBcType().equals("in")  
1706 - || scheduleRealInfo.getBcType().equals("out"))) {  
1707 - jhbc++;  
1708 - jhlc += jhlcOrig;  
1709 - if (scheduleRealInfo.getStatus() == -1) {  
1710 - remMileage += jhlcOrig;  
1711 - cjbc++;  
1712 - }  
1713 - }  
1714 -  
1715 - }  
1716 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
1717 - //计算营运里程，空驶里程  
1718 - if (childTaskPlans.isEmpty()) {  
1719 - if (scheduleRealInfo.getBcType().equals("in") ||  
1720 - scheduleRealInfo.getBcType().equals("out")) {  
1721 - if (scheduleRealInfo.getStatus() != -1) {  
1722 - jcclc += tempJhlc;  
1723 - }  
1724 -  
1725 - }  
1726 - //主任务 放空班次属于营运  
1727 -// else if(scheduleRealInfo.getBcType().equals("venting")){  
1728 -// ksgl += tempJhlc;  
1729 -// }  
1730 - else {  
1731 - if (scheduleRealInfo.getStatus() != -1) {  
1732 - yygl += tempJhlc;  
1733 - }  
1734 - }  
1735 - } else {  
1736 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
1737 - while (it.hasNext()) {  
1738 - ChildTaskPlan childTaskPlan = it.next();  
1739 - if (childTaskPlan.getMileageType().equals("empty")) {  
1740 - if (childTaskPlan.isDestroy()) {  
1741 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
1742 - } else {  
1743 - ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
1744 - }  
1745 - } else {  
1746 - if (childTaskPlan.isDestroy()) {  
1747 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
1748 -// cjbc++;  
1749 - } else {  
1750 - yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
1751 - }  
1752 - }  
1753 - }  
1754 - } 1604 + List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
  1605 + List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
  1606 + for (int i = 0; i < list.size(); i++) {
  1607 + ScheduleRealInfo s=list.get(i);
  1608 + Set<ChildTaskPlan> cts = s.getcTasks();
  1609 + if(cts != null && cts.size() > 0){
  1610 + lists.add(s);
  1611 + }else{
  1612 + if(s.getZdsjActual()!=null){
  1613 + lists.add(s);
  1614 + }
1755 } 1615 }
1756 } 1616 }
1757 -  
1758 - //yygl 包含了临加的营运公里 jcclc包含了临加的进出场里程  
1759 - map.put("jhlc", format.format(jhlc));  
1760 - map.put("remMileage", format.format(remMileage));  
1761 - map.put("addMileage", format.format(addMileage));  
1762 - map.put("yygl", format.format(yygl));  
1763 - map.put("ksgl", format.format(ksgl));  
1764 - map.put("realMileage", format.format(yygl + ksgl + jcclc));  
1765 -// map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));  
1766 - map.put("jhbc", jhbc);  
1767 - map.put("cjbc", cjbc);  
1768 - map.put("ljbc", ljbc);  
1769 - map.put("sjbc", jhbc - cjbc + ljbc);  
1770 - map.put("jcclc", jcclc);  
1771 - map.put("zkslc", format.format(ksgl + jcclc));  
1772 -// map.put("zkslc", format.format(ksgl + jcclc+addMileageJc)); 1617 + double ksgl=culateService.culateKsgl(list);
  1618 + double sjgl=culateService.culateSjgl(lists);
  1619 + double jccgl=culateService.culateJccgl(lists);
  1620 + double ljgl=culateService.culateLjgl(lists);
  1621 +
  1622 + map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
  1623 + map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
  1624 + map.put("addMileage", ljgl); //临加公里
  1625 + map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
  1626 + map.put("ksgl", ksgl);//空驶公里
  1627 + map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
  1628 +// map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
  1629 + map.put("jhbc", culateService.culateJhbc(list,""));
  1630 + map.put("cjbc", culateService.culateLbbc(list));
  1631 + map.put("ljbc", culateService.culateLjbc(lists,""));
  1632 + map.put("sjbc", culateService.culateJhbc(lists,"") - culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
  1633 + map.put("jcclc", jccgl);
  1634 + map.put("zkslc", Arith.add(ksgl,jccgl));
  1635 +// map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
1773 return map; 1636 return map;
1774 - }*/ 1637 + }
1775 1638
1776 - public Map<String, Object> findKMBC(String jGh, String clZbh, 1639 + public Map<String, Object> findKMBC_mh_2(String jGh, String clZbh,
1777 String lpName, String date, String line) { 1640 String lpName, String date, String line) {
1778 Map<String, Object> map = new HashMap<String, Object>(); 1641 Map<String, Object> map = new HashMap<String, Object>();
1779 List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line); 1642 List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
1780 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>(); 1643 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
1781 for (int i = 0; i < list.size(); i++) { 1644 for (int i = 0; i < list.size(); i++) {
1782 ScheduleRealInfo s=list.get(i); 1645 ScheduleRealInfo s=list.get(i);
  1646 + if(s.isDestroy() && s.isReissue()){
  1647 + s.setRemark("");
  1648 + s.setFcsjActual(s.getDfsj());
  1649 + s.setZdsjActual(s.getZdsj());
  1650 + s.setStatus(2);
  1651 + s.setJhlc(s.getJhlcOrig());
  1652 + }
  1653 +
1783 Set<ChildTaskPlan> cts = s.getcTasks(); 1654 Set<ChildTaskPlan> cts = s.getcTasks();
1784 if(cts != null && cts.size() > 0){ 1655 if(cts != null && cts.size() > 0){
1785 - lists.add(s); 1656 + lists.add(s);
1786 }else{ 1657 }else{
1787 - if(s.getZdsjActual()!=null){  
1788 - lists.add(s);  
1789 - } 1658 + if(s.getZdsjActual()!=null){
  1659 + lists.add(s);
  1660 + }
1790 } 1661 }
1791 } 1662 }
1792 double ksgl=culateService.culateKsgl(list); 1663 double ksgl=culateService.culateKsgl(list);
@@ -1905,63 +1776,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1905,63 +1776,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1905 1776
1906 return listMap; 1777 return listMap;
1907 } 1778 }
1908 -  
1909 - /* @Override  
1910 - public List<ScheduleRealInfo> correctForm(String line, String startDate,  
1911 - String endDate, String lpName, String code, String type) {  
1912 - List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);  
1913 -  
1914 - if (type != null && type.length() != 0 && type.equals("export")) {  
1915 - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),  
1916 - sdfSimple = new SimpleDateFormat("yyyyMMdd");  
1917 - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();  
1918 - Map<String, Object> m = new HashMap<String, Object>();  
1919 - ReportUtils ee = new ReportUtils();  
1920 - m.put("dates", startDate + " 至 " + endDate);  
1921 - List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();  
1922 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  
1923 - for (ScheduleRealInfo schedule : list) {  
1924 - Map<String, Object> tempMap = new HashMap<String, Object>();  
1925 - tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");  
1926 - tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");  
1927 - tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");  
1928 - tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");  
1929 - tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");  
1930 - tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");  
1931 - tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");  
1932 - tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");  
1933 - tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");  
1934 - if (schedule.getUpdateBy() != null) {  
1935 - if (schedule.getUpdateBy().getName() != null)  
1936 - tempMap.put("userName", schedule.getUpdateBy().getName());  
1937 - else  
1938 - tempMap.put("userName", "");  
1939 - } else {  
1940 - tempMap.put("userName", "");  
1941 - }  
1942 - if (schedule.getUpdateDate() != null) {  
1943 - tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));  
1944 - } else {  
1945 - tempMap.put("updateDate", "");  
1946 - }  
1947 - tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");  
1948 - tempList.add(tempMap);  
1949 - }  
1950 - try {  
1951 - listI.add(tempList.iterator());  
1952 - String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";  
1953 - ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",  
1954 - path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");  
1955 - } catch (Exception e) {  
1956 - // TODO: handle exception  
1957 - e.printStackTrace();  
1958 - }  
1959 - Map<String, Object> map = tempList.get(tempList.size() - 1);  
1960 - System.out.println("tempMap:" + map);  
1961 - }  
1962 -  
1963 - return list;  
1964 - }*/  
1965 1779
1966 @Override 1780 @Override
1967 public List<SchEditInfoDto> correctForm(String line,String date,String endDate, 1781 public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
@@ -2141,32 +1955,112 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2141,32 +1955,112 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2141 t.setAdjustExps("子"); 1955 t.setAdjustExps("子");
2142 listSchedule.add(t); 1956 listSchedule.add(t);
2143 } 1957 }
2144 - /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + " order by start_date ";  
2145 - List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,  
2146 - new RowMapper<ScheduleRealInfo>() {  
2147 - @Override  
2148 - public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {  
2149 - ScheduleRealInfo t = new ScheduleRealInfo();  
2150 - if (rs.getInt("destroy") == 0) {  
2151 - t.setFcsjActual(rs.getString("start_date"));  
2152 - t.setZdsjActual(rs.getString("end_date"));  
2153 - t.setJhlc(rs.getDouble("mileage"));  
2154 - } else {  
2155 - t.setFcsjActual("");  
2156 - t.setZdsjActual("");  
2157 - t.setJhlc(0.0);  
2158 - }  
2159 - t.setQdzName(rs.getString("start_station_name"));  
2160 - t.setZdzName(rs.getString("end_station_name"));  
2161 - t.setRemarks(rs.getString("remarks"));  
2162 - t.setAdjustExps("子");  
2163 - return t;  
2164 - }  
2165 - });  
2166 - for (int j = 0; j < lists.size(); j++) {  
2167 - ScheduleRealInfo t = lists.get(j); 1958 + }
  1959 + }
  1960 +
  1961 + return listSchedule;
  1962 + }
  1963 +
  1964 + @Override
  1965 + public List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh,
  1966 + String lpName, String date, String line) {
  1967 + List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
  1968 + List<ScheduleRealInfo> list = null;
  1969 + list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
  1970 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
  1971 + String sqlMinYysj="select start_opt from bsth_c_line_config where "
  1972 + + " id = ("
  1973 + + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
  1974 + + ")";
  1975 + String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
  1976 + String[] minSjs = minfcsj.split(":");
  1977 + Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
  1978 +
  1979 + for (int i = 0; i < list.size(); i++) {
  1980 + ScheduleRealInfo s=list.get(i);
  1981 + String[] fcsj= s.getFcsj().split(":");
  1982 + Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
  1983 +
  1984 + Long fscjT=0L;
  1985 + if(fcsjL<minSj){
  1986 + Calendar calendar = new GregorianCalendar();
  1987 + calendar.setTime(s.getScheduleDate());
  1988 + calendar.add(calendar.DATE,1);
  1989 + s.setScheduleDate(calendar.getTime());
  1990 + try {
  1991 + fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
  1992 + } catch (ParseException e) {
  1993 + // TODO Auto-generated catch block
  1994 + e.printStackTrace();
  1995 + }
  1996 +
  1997 + }else{
  1998 + try {
  1999 + fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
  2000 + } catch (ParseException e) {
  2001 + // TODO Auto-generated catch block
  2002 + e.printStackTrace();
  2003 + };
  2004 + }
  2005 + s.setFcsjT(fscjT);
  2006 + }
  2007 + Collections.sort(list, new ComparableReal());
  2008 + for (int i = 0; i < list.size(); i++) {
  2009 + ScheduleRealInfo s = list.get(i);
  2010 + s.setAdjustExps(i + 1 + "");
  2011 + String remarks = "";
  2012 + if (s.getRemarks() != null) {
  2013 + remarks += s.getRemarks();
  2014 + }
  2015 +
  2016 + Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
  2017 + if (!childTaskPlans.isEmpty()) {
  2018 + s.setFcsjActual("");
  2019 + s.setZdsjActual("");
  2020 + s.setJhlc(0.0);
  2021 + }
  2022 +
  2023 + if (s.isDestroy()) {
  2024 + if(s.isReissue()){
  2025 + s.setFcsjActual(s.getDfsj());
  2026 + s.setZdsjActual(s.getZdsj());
  2027 + s.setRemarks("");
  2028 + s.setStatus(2);
  2029 + s.setJhlc(s.getJhlcOrig());
  2030 + }
  2031 + else{
  2032 + s.setFcsjActual("");
  2033 + s.setZdsjActual("");
  2034 + s.setJhlc(0.0);
  2035 + remarks += "(烂班)";
  2036 + s.setRemarks(remarks);
  2037 + }
  2038 + }
  2039 +
  2040 + listSchedule.add(s);
  2041 + //计算营运里程，空驶里程
  2042 + if (!childTaskPlans.isEmpty()) {
  2043 +// Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  2044 + List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
  2045 + Collections.sort(listit, new ComparableChild());
  2046 + for (int j = 0; j < listit.size(); j++) {
  2047 + ScheduleRealInfo t = new ScheduleRealInfo();
  2048 + ChildTaskPlan childTaskPlan = listit.get(j);
  2049 + if (childTaskPlan.isDestroy()) {
  2050 + t.setFcsjActual("");
  2051 + t.setZdsjActual("");
  2052 + t.setJhlc(0.0);
  2053 + } else {
  2054 + t.setFcsjActual(childTaskPlan.getStartDate());
  2055 + t.setZdsjActual(childTaskPlan.getEndDate());
  2056 + t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
  2057 + }
  2058 + t.setQdzName(childTaskPlan.getStartStationName());
  2059 + t.setZdzName(childTaskPlan.getEndStationName());
  2060 + t.setRemarks(childTaskPlan.getRemarks());
  2061 + t.setAdjustExps("子");
2168 listSchedule.add(t); 2062 listSchedule.add(t);
2169 - }*/ 2063 + }
2170 } 2064 }
2171 } 2065 }
2172 2066
@@ -2256,551 +2150,79 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2256,551 +2150,79 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2256 return lMap; 2150 return lMap;
2257 } 2151 }
2258 2152
2259 - /* @Override  
2260 - public List<Map<String, Object>> statisticsDaily(String line, String date, 2153 + @Override
  2154 + public List<Map<String, Object>> statisticsDaily_mh_2(String line, String date,
2261 String xlName, String type) { 2155 String xlName, String type) {
2262 - List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();  
2263 - if (date.length() == 10)  
2264 - list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);  
2265 - else if (date.length() == 7)  
2266 - list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);  
2267 -  
2268 -  
2269 - List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();  
2270 - DecimalFormat format = new DecimalFormat("0.00");  
2271 - double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;  
2272 - float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;  
2273 - //班次  
2274 - int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;  
2275 - int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;  
2276 - int jhbc = 0, jhbc_m = 0, jhbc_a = 0;  
2277 - int sjbc = 0, sjbc_m = 0, sjbc_a = 0;  
2278 - int ljbc = 0, ljbc_m = 0, ljbc_a = 0;  
2279 - int fzbc = 0, fzbc_m = 0, fzbc_a = 0;  
2280 - int dtbc = 0, dtbc_m = 0, dtbc_a = 0;  
2281 - int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;  
2282 -  
2283 - double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0;  
2284 - float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f,  
2285 - ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f,  
2286 - ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;  
2287 - //班次  
2288 - int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;  
2289 - int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;  
2290 - int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;  
2291 - int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;  
2292 - int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0;  
2293 - int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;  
2294 - int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;  
2295 - Map<String, Object> map = null;  
2296 -  
2297 - double xgssgl=0,xgljgl=0,lj=0,cj=0;  
2298 - for (int i = 0; i < list.size(); i++) {  
2299 - ScheduleRealInfo scheduleRealInfo = list.get(i); 2156 + List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
  2157 + List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
  2158 + List<ScheduleRealInfo> lists =new ArrayList<ScheduleRealInfo>();
  2159 + for (int i = 0; i < list_s.size(); i++) {
  2160 + ScheduleRealInfo s=list_s.get(i);
  2161 + if(s.isDestroy() && s.isReissue()){
  2162 + s.setRemark("");
  2163 + s.setFcsjActual(s.getDfsj());
  2164 + s.setZdsjActual(s.getZdsj());
  2165 + s.setStatus(2);
  2166 + s.setJhlc(s.getJhlcOrig());
  2167 + }
2300 2168
2301 - if (scheduleRealInfo != null) {  
2302 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
2303 - //计算实际里程，少驶里程，计划里程=实际里程+少驶里程  
2304 - if(!scheduleRealInfo.isSflj()){  
2305 - jhlc += tempJhlc;  
2306 - jhlcZ += tempJhlc;  
2307 - }  
2308 - if (childTaskPlans.isEmpty()) {  
2309 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
2310 - jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();  
2311 -  
2312 - if(jhlcOrig-tempJhlc>0){  
2313 - xgssgl +=jhlcOrig-tempJhlc;  
2314 - cj += jhlcOrig-tempJhlc;  
2315 - }else{  
2316 - xgljgl +=tempJhlc-jhlcOrig;  
2317 - lj +=tempJhlc-jhlcOrig;  
2318 - }  
2319 - //临加公里  
2320 - if (scheduleRealInfo.isSflj()) {  
2321 - ljgl += tempJhlc;  
2322 - ljglZ += tempJhlc;  
2323 - }  
2324 -  
2325 - if (scheduleRealInfo.getStatus() == -1) {  
2326 - ssgl += tempJhlc;  
2327 - ssglZ += tempJhlc;  
2328 - ssbc++;  
2329 - ssbcZ++;  
2330 - if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {  
2331 - ssgl_lz += tempJhlc;  
2332 - ssgl_lzZ += tempJhlc;  
2333 - ssbc_lz++;  
2334 - ssbc_lzZ++;  
2335 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {  
2336 - ssgl_dm += tempJhlc;  
2337 - ssgl_dmZ += tempJhlc;  
2338 - ssbc_dm++;  
2339 - ssbc_dmZ++;  
2340 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {  
2341 - ssgl_gz += tempJhlc;  
2342 - ssgl_gzZ += tempJhlc;  
2343 - ssbc_gz++;  
2344 - ssbc_gzZ++;  
2345 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {  
2346 - ssgl_jf += tempJhlc;  
2347 - ssgl_jfZ += tempJhlc;  
2348 - ssbc_jf++;  
2349 - ssbc_jfZ++;  
2350 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {  
2351 - ssgl_zs += tempJhlc;  
2352 - ssgl_zsZ += tempJhlc;  
2353 - ssbc_zs++;  
2354 - ssbc_zsZ++;  
2355 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {  
2356 - ssgl_qr += tempJhlc;  
2357 - ssgl_qrZ += tempJhlc;  
2358 - ssbc_qr++;  
2359 - ssbc_qrZ++;  
2360 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {  
2361 - ssgl_qc += tempJhlc;  
2362 - ssgl_qcZ += tempJhlc;  
2363 - ssbc_qc++;  
2364 - ssbc_qcZ++;  
2365 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {  
2366 - ssgl_kx += tempJhlc;  
2367 - ssgl_kxZ += tempJhlc;  
2368 - ssbc_kx++;  
2369 - ssbc_kxZ++;  
2370 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {  
2371 - ssgl_qh += tempJhlc;  
2372 - ssgl_qhZ += tempJhlc;  
2373 - ssbc_qh++;  
2374 - ssbc_qhZ++;  
2375 - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {  
2376 - ssgl_yw += tempJhlc;  
2377 - ssgl_ywZ += tempJhlc;  
2378 - ssbc_yw++;  
2379 - ssbc_ywZ++;  
2380 - } else {  
2381 - ssgl_other += tempJhlc;  
2382 - ssgl_otherZ += tempJhlc;  
2383 - ssbc_other++;  
2384 - ssbc_otherZ++;  
2385 - }  
2386 - } else {  
2387 - sjgl += tempJhlc;  
2388 - sjglZ += tempJhlc;  
2389 - }  
2390 - } else {  
2391 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
2392 - while (it.hasNext()) {  
2393 - ChildTaskPlan childTaskPlan = it.next();  
2394 - childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
2395 - if (childTaskPlan.isDestroy()) {  
2396 - ssgl += childMileage;  
2397 - ssglZ += childMileage;  
2398 - ssbc++;  
2399 - ssbcZ++;  
2400 - if (childTaskPlan.getDestroyReason().equals("路阻")) {  
2401 - ssgl_lz += childTaskPlan.getMileage();  
2402 - ssgl_lzZ += childTaskPlan.getMileage();  
2403 - ssbc_lzZ++;  
2404 - ssbc_lzZ++;  
2405 - } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {  
2406 - ssgl_dm += childTaskPlan.getMileage();  
2407 - ssgl_dmZ += childTaskPlan.getMileage();  
2408 - ssbc_dm++;  
2409 - ssbc_dmZ++;  
2410 - } else if (childTaskPlan.getDestroyReason().equals("故障")) {  
2411 - ssgl_gz += childTaskPlan.getMileage();  
2412 - ssgl_gzZ += childTaskPlan.getMileage();  
2413 - ssbc_gz++;  
2414 - ssbc_gzZ++;  
2415 - } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {  
2416 - ssgl_jf += childTaskPlan.getMileage();  
2417 - ssgl_jfZ += childTaskPlan.getMileage();  
2418 - ssbc_jf++;  
2419 - ssbc_jfZ++;  
2420 - } else if (childTaskPlan.getDestroyReason().equals("肇事")) {  
2421 - ssgl_zs += childTaskPlan.getMileage();  
2422 - ssgl_zsZ += childTaskPlan.getMileage();  
2423 - ssbc_zs++;  
2424 - ssbc_zsZ++;  
2425 - } else if (childTaskPlan.getDestroyReason().equals("缺人")) {  
2426 - ssgl_qr += childTaskPlan.getMileage();  
2427 - ssgl_qrZ += childTaskPlan.getMileage();  
2428 - ssbc_qr++;  
2429 - ssbc_qrZ++;  
2430 - } else if (childTaskPlan.getDestroyReason().equals("缺车")) {  
2431 - ssgl_qc += childTaskPlan.getMileage();  
2432 - ssgl_qcZ += childTaskPlan.getMileage();  
2433 - ssbc_qc++;  
2434 - ssbc_qcZ++;  
2435 - } else if (childTaskPlan.getDestroyReason().equals("客稀")) {  
2436 - ssgl_kx += childTaskPlan.getMileage();  
2437 - ssgl_kxZ += childTaskPlan.getMileage();  
2438 - ssbc_kx++;  
2439 - ssbc_kxZ++;  
2440 - } else if (childTaskPlan.getDestroyReason().equals("气候")) {  
2441 - ssgl_qh += childTaskPlan.getMileage();  
2442 - ssgl_qhZ += childTaskPlan.getMileage();  
2443 - ssbc_qh++;  
2444 - ssbc_qhZ++;  
2445 - } else if (childTaskPlan.getDestroyReason().equals("援外")) {  
2446 - ssgl_yw += childTaskPlan.getMileage();  
2447 - ssgl_ywZ += childTaskPlan.getMileage();  
2448 - ssbc_yw++;  
2449 - ssbc_ywZ++;  
2450 - } else {  
2451 - ssgl_other += childTaskPlan.getMileage();  
2452 - ssgl_otherZ += childTaskPlan.getMileage();  
2453 - ssbc_other++;  
2454 - ssbc_otherZ++;  
2455 - }  
2456 - } else {  
2457 - if (scheduleRealInfo.isSflj()) {  
2458 - ljgl += tempJhlc;  
2459 - ljglZ += tempJhlc;  
2460 - } else{  
2461 - sjgl += childMileage;  
2462 - sjglZ += childMileage;  
2463 - }  
2464 - }  
2465 - }  
2466 - }  
2467 -  
2468 - //班次  
2469 - jhbc++;  
2470 - jhbcZ++;  
2471 - String[] fcsj = scheduleRealInfo.getFcsj().split(":");  
2472 - String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");  
2473 - if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {  
2474 - jhbc_m++;  
2475 - jhbc_mZ++;  
2476 - } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {  
2477 - jhbc_a++;  
2478 - jhbc_aZ++;  
2479 - }  
2480 - if (scheduleRealInfo.getStatus() != -1) {  
2481 - sjbc++;  
2482 - sjbcZ++;  
2483 - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {  
2484 - sjbc_m++;  
2485 - sjbc_mZ++;  
2486 - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {  
2487 - sjbc_a++;  
2488 - sjbc_aZ++;  
2489 - }  
2490 - }  
2491 - if (scheduleRealInfo.isSflj()) {  
2492 - ljbc++;  
2493 - ljbcZ++;  
2494 - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {  
2495 - ljbc_m++;  
2496 - ljbc_mZ++;  
2497 - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {  
2498 - ljbc_a++;  
2499 - ljbc_aZ++;  
2500 - }  
2501 - }  
2502 - if (scheduleRealInfo.getBcType().equals("venting")) {  
2503 - fzbc++;  
2504 - fzbcZ++;  
2505 - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {  
2506 - fzbc_m++;  
2507 - fzbc_mZ++;  
2508 - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {  
2509 - fzbc_a++;  
2510 - fzbc_aZ++;  
2511 - }  
2512 - }  
2513 -  
2514 - if (i < list.size() - 1) {  
2515 - if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) {  
2516 - map = new HashMap<String, Object>();  
2517 - map.put("xlName", scheduleRealInfo.getXlName());  
2518 - map.put("jhlc", format.format(jhlc));  
2519 - map.put("sjgl", format.format(sjgl));  
2520 - map.put("ssgl", format.format(ssgl+cj));  
2521 - map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));  
2522 - map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));  
2523 - map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));  
2524 - map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));  
2525 - map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));  
2526 - map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));  
2527 - map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));  
2528 - map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));  
2529 - map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));  
2530 - map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));  
2531 - map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));  
2532 - map.put("ssbc", ssbc);  
2533 - map.put("ssbc_lz", ssbc_lz);  
2534 - map.put("ssbc_dm", ssbc_dm);  
2535 - map.put("ssbc_gz", ssbc_gz);  
2536 - map.put("ssbc_jf", ssbc_jf);  
2537 - map.put("ssbc_zs", ssbc_zs);  
2538 - map.put("ssbc_qr", ssbc_qr);  
2539 - map.put("ssbc_qc", ssbc_qc);  
2540 - map.put("ssbc_kx", ssbc_kx);  
2541 - map.put("ssbc_qh", ssbc_qh);  
2542 - map.put("ssbc_yw", ssbc_yw);  
2543 - map.put("ssbc_other", ssbc_other);  
2544 - map.put("ljgl", format.format(ljgl+lj));  
2545 - map.put("jhbc", jhbc);  
2546 - map.put("jhbc_m", jhbc_m);  
2547 - map.put("jhbc_a", jhbc_a);  
2548 - map.put("sjbc", sjbc);  
2549 - map.put("sjbc_m", sjbc_m);  
2550 - map.put("sjbc_a", sjbc_a);  
2551 - map.put("ljbc", ljbc);  
2552 - map.put("ljbc_m", ljbc_m);  
2553 - map.put("ljbc_a", ljbc_a);  
2554 - map.put("fzbc", fzbc);  
2555 - map.put("fzbc_m", fzbc_m);  
2556 - map.put("fzbc_a", fzbc_a);  
2557 - map.put("dtbc", dtbc);  
2558 - map.put("dtbc_m", dtbc_m);  
2559 - map.put("dtbc_a", dtbc_a);  
2560 - map.put("djg", djg);  
2561 - map.put("djg_m", djg_m);  
2562 - map.put("djg_a", djg_a);  
2563 - map.put("djg_time", djg_time);  
2564 - lMap.add(map);  
2565 - jhlc = 0;  
2566 - tempJhlc = 0;  
2567 - childMileage = 0;  
2568 - sjgl = 0f;  
2569 - ssgl = 0f;  
2570 - ssgl_lz = 0f;  
2571 - ssgl_dm = 0f;  
2572 - ssgl_gz = 0f;  
2573 - ssgl_jf = 0f;  
2574 - ssgl_zs = 0f;  
2575 - ssgl_qr = 0f;  
2576 - ssgl_qc = 0f;  
2577 - ssgl_kx = 0f;  
2578 - ssgl_qh = 0f;  
2579 - ssgl_yw = 0f;  
2580 - ssgl_other = 0f;  
2581 - ljgl = 0f;  
2582 - //班次  
2583 - jhbc = 0;  
2584 - jhbc_m = 0;  
2585 - jhbc_a = 0;  
2586 - sjbc = 0;  
2587 - sjbc_m = 0;  
2588 - sjbc_a = 0;  
2589 - ljbc = 0;  
2590 - ljbc_m = 0;  
2591 - ljbc_a = 0;  
2592 - fzbc = 0;  
2593 - fzbc_m = 0;  
2594 - fzbc_a = 0;  
2595 - dtbc = 0;  
2596 - dtbc_m = 0;  
2597 - dtbc_a = 0;  
2598 - djg = 0;  
2599 - djg_m = 0;  
2600 - djg_a = 0;  
2601 - djg_time = 0;  
2602 - lj=0;  
2603 - cj=0;  
2604 - }  
2605 - } else {  
2606 - map = new HashMap<String, Object>();  
2607 - map.put("xlName", scheduleRealInfo.getXlName());  
2608 - map.put("jhlc", format.format(jhlc));  
2609 - map.put("sjgl", format.format(sjgl));  
2610 - map.put("ssgl", format.format(ssgl+cj));  
2611 - map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));  
2612 - map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));  
2613 - map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));  
2614 - map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));  
2615 - map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));  
2616 - map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));  
2617 - map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));  
2618 - map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));  
2619 - map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));  
2620 - map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));  
2621 - map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));  
2622 - map.put("ssbc", ssbc);  
2623 - map.put("ssbc_lz", ssbc_lz);  
2624 - map.put("ssbc_dm", ssbc_dm);  
2625 - map.put("ssbc_gz", ssbc_gz);  
2626 - map.put("ssbc_jf", ssbc_jf);  
2627 - map.put("ssbc_zs", ssbc_zs);  
2628 - map.put("ssbc_qr", ssbc_qr);  
2629 - map.put("ssbc_qc", ssbc_qc);  
2630 - map.put("ssbc_kx", ssbc_kx);  
2631 - map.put("ssbc_qh", ssbc_qh);  
2632 - map.put("ssbc_yw", ssbc_yw);  
2633 - map.put("ssbc_other", ssbc_other);  
2634 - map.put("ljgl", format.format(ljgl+lj));  
2635 - map.put("jhbc", jhbc);  
2636 - map.put("jhbc_m", jhbc_m);  
2637 - map.put("jhbc_a", jhbc_a);  
2638 - map.put("sjbc", sjbc);  
2639 - map.put("sjbc_m", sjbc_m);  
2640 - map.put("sjbc_a", sjbc_a);  
2641 - map.put("ljbc", ljbc);  
2642 - map.put("ljbc_m", ljbc_m);  
2643 - map.put("ljbc_a", ljbc_a);  
2644 - map.put("fzbc", fzbc);  
2645 - map.put("fzbc_m", fzbc_m);  
2646 - map.put("fzbc_a", fzbc_a);  
2647 - map.put("dtbc", dtbc);  
2648 - map.put("dtbc_m", dtbc_m);  
2649 - map.put("dtbc_a", dtbc_a);  
2650 - map.put("djg", djg);  
2651 - map.put("djg_m", djg_m);  
2652 - map.put("djg_a", djg_a);  
2653 - map.put("djg_time", djg_time);  
2654 - lMap.add(map);  
2655 - jhlc = 0;  
2656 - tempJhlc = 0;  
2657 - childMileage = 0;  
2658 - sjgl = 0f;  
2659 - ssgl = 0f;  
2660 - ssgl_lz = 0f;  
2661 - ssgl_dm = 0f;  
2662 - ssgl_gz = 0f;  
2663 - ssgl_jf = 0f;  
2664 - ssgl_zs = 0f;  
2665 - ssgl_qr = 0f;  
2666 - ssgl_qc = 0f;  
2667 - ssgl_kx = 0f;  
2668 - ssgl_qh = 0f;  
2669 - ssgl_yw = 0f;  
2670 - ssgl_other = 0f;  
2671 - ljgl = 0f;  
2672 - //班次  
2673 - jhbc = 0;  
2674 - jhbc_m = 0;  
2675 - jhbc_a = 0;  
2676 - sjbc = 0;  
2677 - sjbc_m = 0;  
2678 - sjbc_a = 0;  
2679 - ljbc = 0;  
2680 - ljbc_m = 0;  
2681 - ljbc_a = 0;  
2682 - fzbc = 0;  
2683 - fzbc_m = 0;  
2684 - fzbc_a = 0;  
2685 - dtbc = 0;  
2686 - dtbc_m = 0;  
2687 - dtbc_a = 0;  
2688 - djg = 0;  
2689 - djg_m = 0;  
2690 - djg_a = 0;  
2691 - djg_time = 0;  
2692 - lj=0;  
2693 - cj=0; 2169 + Set<ChildTaskPlan> cts = s.getcTasks();
  2170 + if(cts != null && cts.size() > 0){
  2171 + lists.add(s);
  2172 + }else{
  2173 + if(s.getZdsjActual()!=null){
  2174 + lists.add(s);
2694 } 2175 }
2695 } 2176 }
2696 } 2177 }
2697 - map = new HashMap<String, Object>();  
2698 - map.put("xlName", "合计");  
2699 - map.put("jhlc", format.format(jhlcZ));  
2700 - map.put("sjgl", format.format(sjglZ));  
2701 - map.put("ssgl", format.format(ssglZ+xgssgl));  
2702 - map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));  
2703 - map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));  
2704 - map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));  
2705 - map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ));  
2706 - map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ));  
2707 - map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ));  
2708 - map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ));  
2709 - map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ));  
2710 - map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));  
2711 - map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));  
2712 - map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));  
2713 - map.put("ssbc", ssbcZ);  
2714 - map.put("ssbc_lz", ssbc_lzZ);  
2715 - map.put("ssbc_dm", ssbc_lzZ);  
2716 - map.put("ssbc_gz", ssbc_gzZ);  
2717 - map.put("ssbc_jf", ssbc_jfZ);  
2718 - map.put("ssbc_zs", ssbc_zsZ);  
2719 - map.put("ssbc_qr", ssbc_qrZ);  
2720 - map.put("ssbc_qc", ssbc_qcZ);  
2721 - map.put("ssbc_kx", ssbc_qcZ);  
2722 - map.put("ssbc_qh", ssbc_qhZ);  
2723 - map.put("ssbc_yw", ssbc_ywZ);  
2724 - map.put("ssbc_other", ssbc_otherZ);  
2725 - map.put("ljgl", format.format(ljglZ+xgljgl));  
2726 - map.put("jhbc", jhbcZ);  
2727 - map.put("jhbc_m", jhbc_mZ);  
2728 - map.put("jhbc_a", jhbc_aZ);  
2729 - map.put("sjbc", sjbcZ);  
2730 - map.put("sjbc_m", sjbc_mZ);  
2731 - map.put("sjbc_a", sjbc_aZ);  
2732 - map.put("ljbc", ljbcZ);  
2733 - map.put("ljbc_m", ljbc_mZ);  
2734 - map.put("ljbc_a", ljbc_aZ);  
2735 - map.put("fzbc", fzbcZ);  
2736 - map.put("fzbc_m", fzbc_mZ);  
2737 - map.put("fzbc_a", fzbc_aZ);  
2738 - map.put("dtbc", dtbcZ);  
2739 - map.put("dtbc_m", dtbc_mZ);  
2740 - map.put("dtbc_a", dtbc_aZ);  
2741 - map.put("djg", djgZ);  
2742 - map.put("djg_m", djg_mZ);  
2743 - map.put("djg_a", djg_aZ);  
2744 - map.put("djg_time", djg_timeZ); 2178 + Map<String, Object> map = new HashMap<String, Object>();
  2179 + map.put("xlName", xlName);
  2180 + double jhlc=culateService.culateJhgl(list_s);
  2181 + map.put("jhlc",jhlc);
  2182 + map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
  2183 + double lbgl=culateService.culateLbgl(list_s);
  2184 + map.put("ssgl", lbgl);
  2185 + map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
  2186 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
  2187 + map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
  2188 + map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
  2189 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
  2190 + map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
  2191 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
  2192 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
  2193 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
  2194 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
  2195 + double ssgl_pc=culateService.culateCJLC(list_s, "配车");
  2196 + double ssgl_by=culateService.culateCJLC(list_s, "保养");
  2197 + double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
  2198 + double ssgl_qt=culateService.culateCJLC(list_s, "其他");
  2199 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
  2200 + map.put("ssbc", culateService.culateLbbc(list_s));
  2201 + double ljgl=culateService.culateLjgl(lists);
  2202 + map.put("ljgl", ljgl);
  2203 + map.put("jhbc", culateService.culateJhbc(list_s,""));
  2204 + map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
  2205 + map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
  2206 + map.put("sjbc", culateService.culateSjbc(lists,""));
  2207 + map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
  2208 + map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
  2209 + map.put("ljbc", culateService.culateLjbc(lists,""));
  2210 + map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
  2211 + map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
  2212 + map.put("fzbc", culateService.culateFzbc(lists, ""));
  2213 + map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
  2214 + map.put("fzbc_a", culateService.culateFzbc(lists, "wgf"));
  2215 + map.put("dtbc", 0);
  2216 + map.put("dtbc_m", 0);
  2217 + map.put("dtbc_a", 0);
  2218 + map.put("djg", 0);
  2219 + map.put("djg_m", 0);
  2220 + map.put("djg_a", 0);
  2221 + map.put("djg_time", 0);
  2222 + map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
2745 lMap.add(map); 2223 lMap.add(map);
2746 - for (int i = 0; i < lMap.size(); i++) {  
2747 - Map<String, Object> m=lMap.get(i);  
2748 -// m.get(""))  
2749 - jhlc += Double.parseDouble(m.get("jhlc").toString());  
2750 - sjgl += Double.parseDouble(m.get("sjgl").toString());  
2751 - ssgl += Double.parseDouble( m.get("ssgl").toString());  
2752 - ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString());  
2753 - ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString());  
2754 - ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString());  
2755 - ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));  
2756 - m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));  
2757 - m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));  
2758 - m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));  
2759 - m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));  
2760 - m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));  
2761 - m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));  
2762 - m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));  
2763 - m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl));  
2764 - m.get("jhbc", jhbc);  
2765 - m.get("jhbc_m", jhbc_m);  
2766 - m.get("jhbc_a", jhbc_a);  
2767 - m.get("sjbc", sjbc);  
2768 - m.get("sjbc_m", sjbc_m);  
2769 - m.get("sjbc_a", sjbc_a);  
2770 - m.get("ljbc", ljbc);  
2771 - m.get("ljbc_m", ljbc_m);  
2772 - m.get("ljbc_a", ljbc_a);  
2773 - m.get("fzbc", fzbc);  
2774 - m.get("fzbc_m", fzbc_m);  
2775 - m.get("fzbc_a", fzbc_a);  
2776 - m.get("dtbc", dtbc);  
2777 - m.get("dtbc_m", dtbc_m);  
2778 - m.get("dtbc_a", dtbc_a);  
2779 - m.get("djg", djg);  
2780 - m.get("djg_m", djg_m);  
2781 - m.get("djg_a", djg_a);  
2782 - m.get("djg_time", djg_time);  
2783 - }  
2784 -  
2785 - if (type != null && type.length() != 0 && type.equals("export")) {  
2786 - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),  
2787 - sdfSimple = new SimpleDateFormat("yyyyMMdd");  
2788 - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();  
2789 - Map<String, Object> m = new HashMap<String, Object>();  
2790 - ReportUtils ee = new ReportUtils();  
2791 - try {  
2792 - listI.add(lMap.iterator());  
2793 - String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";  
2794 - ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",  
2795 - path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");  
2796 - } catch (Exception e) {  
2797 - // TODO: handle exception  
2798 - e.printStackTrace();  
2799 - }  
2800 - }  
2801 -  
2802 return lMap; 2224 return lMap;
2803 - }*/ 2225 + }
2804 2226
2805 public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){ 2227 public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
2806 2228
@@ -3094,15 +2516,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3094,15 +2516,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3094 2516
3095 @Override 2517 @Override
3096 public List<ScheduleRealInfo> realScheduleList(String line, String date) { 2518 public List<ScheduleRealInfo> realScheduleList(String line, String date) {
3097 - /*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);  
3098 - List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);  
3099 - for(ScheduleRealInfo info:listInfo){  
3100 - for(ScheduleRealInfo total:listTotal){  
3101 - if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){ 2519 + List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
  2520 + String lpName = "lpName";
  2521 + String zdsj = "";
  2522 + String zdsjActual = "";
  2523 + String zdsj1 = "";
  2524 + String zdsjActual1 = "";
  2525 + List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
  2526 + for (int i = 0; i < listInfo.size(); i++) {
  2527 + ScheduleRealInfo t = listInfo.get(i);
  2528 + if (!lpName.equals(t.getLpName())) {
  2529 + zdsjActual = t.getZdsjActual();
  2530 + zdsj = t.getZdsj();
  2531 + t.setZdsjActual("");
  2532 + t.setZdsj("");
  2533 + } else {
  2534 + zdsj1 = t.getZdsj();
  2535 + zdsjActual1 = t.getZdsjActual();
  2536 + t.setZdsjActual(zdsjActual);
  2537 + t.setZdsj(zdsj);
  2538 + zdsj = zdsj1;
  2539 + zdsjActual = zdsjActual1;
  2540 + }
  2541 + lpName = t.getLpName();
  2542 + list.add(t);
  2543 + }
3102 2544
3103 - }  
3104 - }  
3105 - }*/ 2545 + List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
  2546 + List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
  2547 + List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
  2548 + List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
  2549 + List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
  2550 + if (listInfo2.size() > 0) {
  2551 + int a = listInfo2.size() % 3;
  2552 + int b = listInfo2.size() / 3;
  2553 + int x = 0, y = 0;
  2554 + if (a == 2) {
  2555 + x = b + 1;
  2556 + y = x * 2;
  2557 + ;
  2558 + } else if (b == 1) {
  2559 + x = b + 1;
  2560 + y = x * 2 - 1;
  2561 + ;
  2562 + } else {
  2563 + x = b;
  2564 + y = 2 * x;
  2565 +
  2566 + }
  2567 + for (int i = 0; i < listInfo2.size(); i++) {
  2568 + ScheduleRealInfo s = listInfo2.get(i);
  2569 + if (i + 1 <= x) {
  2570 + xList.add(s);
  2571 + } else if ((i + 1) > x && (i + 1) <= y) {
  2572 + yList.add(s);
  2573 + } else {
  2574 + zList.add(s);
  2575 + }
  2576 + }
  2577 + for (int i = 0; i < x; i++) {
  2578 + newList.add(xList.get(i));
  2579 + if (yList.size() > i) {
  2580 + newList.add(yList.get(i));
  2581 + } else {
  2582 + newList.add(new ScheduleRealInfo());
  2583 + }
  2584 + if (zList.size() > i) {
  2585 + newList.add(zList.get(i));
  2586 + } else {
  2587 + newList.add(new ScheduleRealInfo());
  2588 + }
  2589 +
  2590 + }
  2591 + }
  2592 + for (int i = 0; i < newList.size(); i++) {
  2593 + ScheduleRealInfo t1 = newList.get(i);
  2594 + for (int j = 0; j < list.size(); j++) {
  2595 + ScheduleRealInfo t2 = list.get(j);
  2596 + if (t1.getId() == t2.getId()) {
  2597 + t1 = t2;
  2598 + }
  2599 + }
  2600 + }
  2601 + return newList;
  2602 + }
  2603 +
  2604 + @Override
  2605 + public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
3106 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>(); 2606 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3107 String lpName = "lpName"; 2607 String lpName = "lpName";
3108 String zdsj = ""; 2608 String zdsj = "";
@@ -3110,6 +2610,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3110,6 +2610,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3110 String zdsj1 = ""; 2610 String zdsj1 = "";
3111 String zdsjActual1 = ""; 2611 String zdsjActual1 = "";
3112 List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date); 2612 List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
  2613 +
  2614 + for(ScheduleRealInfo s : listInfo){
  2615 + if(s.isDestroy() && s.isReissue()){
  2616 + s.setRemark("");
  2617 + s.setFcsjActual(s.getDfsj());
  2618 + s.setZdsjActual(s.getZdsj());
  2619 + s.setStatus(2);
  2620 + s.setJhlc(s.getJhlcOrig());
  2621 + }
  2622 + }
  2623 +
3113 for (int i = 0; i < listInfo.size(); i++) { 2624 for (int i = 0; i < listInfo.size(); i++) {
3114 ScheduleRealInfo t = listInfo.get(i); 2625 ScheduleRealInfo t = listInfo.get(i);
3115 if (!lpName.equals(t.getLpName())) { 2626 if (!lpName.equals(t.getLpName())) {
@@ -3188,15 +2699,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3188,15 +2699,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3188 2699
3189 @Override 2700 @Override
3190 public List<ScheduleRealInfo> realScheduleListQp(String line, String date) { 2701 public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {
3191 - /*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);  
3192 - List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);  
3193 - for(ScheduleRealInfo info:listInfo){  
3194 - for(ScheduleRealInfo total:listTotal){  
3195 - if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){  
3196 -  
3197 - }  
3198 - }  
3199 - }*/  
3200 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>(); 2702 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3201 String lpName = "lpName"; 2703 String lpName = "lpName";
3202 String zdsj = ""; 2704 String zdsj = "";
@@ -3219,18 +2721,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3219,18 +2721,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3219 zdsj = zdsj1; 2721 zdsj = zdsj1;
3220 zdsjActual = zdsjActual1; 2722 zdsjActual = zdsjActual1;
3221 } 2723 }
3222 - /*if(i<listInfo.size()-1){  
3223 - if(s.getLpName().equals(listInfo.get(i+1).getLpName())){  
3224 - zdsj=s.getZdsj();  
3225 - zdsjActual=s.getZdsjActual();  
3226 - }else{  
3227 - zdsj="";  
3228 - zdsjActual="";  
3229 - }  
3230 - }else{  
3231 - zdsj=s.getZdsj();  
3232 - zdsjActual=s.getZdsjActual();  
3233 - }*/  
3234 2724
3235 lpName = t.getLpName(); 2725 lpName = t.getLpName();
3236 list.add(t); 2726 list.add(t);
@@ -3239,12 +2729,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3239,12 +2729,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3239 } 2729 }
3240 2730
3241 public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) { 2731 public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
3242 -// Arith arith=new Arith();  
3243 - //前一天日期  
3244 -// String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));  
3245 -// String date = "2016-09-20";  
3246 -// System.out.println("shijian1:"+new Date());  
3247 -  
3248 List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>(); 2732 List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>();
3249 if(line.equals("")){ 2733 if(line.equals("")){
3250 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm); 2734 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
@@ -3277,67 +2761,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3277,67 +2761,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3277 fage = false; 2761 fage = false;
3278 } 2762 }
3279 listS.add(scheduleRealInfo); 2763 listS.add(scheduleRealInfo);
3280 -  
3281 - /* if (scheduleRealInfo != null) {  
3282 - //计划里程（主任务过滤掉临加班次），  
3283 - //烂班里程（主任务烂班），  
3284 - //临加里程（主任务临加），  
3285 - //计划班次，烂班班次，增加班次  
3286 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
3287 - if (scheduleRealInfo.isSflj()) {  
3288 - if(scheduleRealInfo.getStatus() == -1){  
3289 - addMileage =Arith.add(addMileage, tempJhlc);  
3290 - }  
3291 - } else {  
3292 - if (!(scheduleRealInfo.getBcType().equals("in")  
3293 - || scheduleRealInfo.getBcType().equals("out"))) {  
3294 - jhlc =Arith.add(jhlc,tempJhlc);  
3295 - }  
3296 -  
3297 - if (scheduleRealInfo.getStatus() == -1) {  
3298 - remMileage =Arith.add(remMileage,tempJhlc);  
3299 - }  
3300 - }  
3301 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
3302 - //计算营运里程，空驶里程  
3303 - if (childTaskPlans.isEmpty()) {  
3304 - if (scheduleRealInfo.getBcType().equals("in") ||  
3305 - scheduleRealInfo.getBcType().equals("out")) {  
3306 - if (scheduleRealInfo.getStatus() != -1) {  
3307 - jcclc=Arith.add(jcclc,tempJhlc);  
3308 - }  
3309 - }  
3310 - //主任务 放空班次属于营运  
3311 - // else if(scheduleRealInfo.getBcType().equals("venting")){  
3312 - // ksgl += tempJhlc;  
3313 - // }  
3314 - else {  
3315 - if (scheduleRealInfo.getStatus() != -1) {  
3316 - yygl=Arith.add(yygl,tempJhlc);  
3317 - }  
3318 - }  
3319 - } else {  
3320 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
3321 - while (it.hasNext()) {  
3322 - ChildTaskPlan childTaskPlan = it.next();  
3323 - if (childTaskPlan.getMileageType().equals("empty")) {  
3324 - if (childTaskPlan.isDestroy()) {  
3325 - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3326 - } else {  
3327 - ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3328 - }  
3329 - } else {  
3330 - if (childTaskPlan.isDestroy()) {  
3331 - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3332 -  
3333 - } else {  
3334 - yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3335 -  
3336 - }  
3337 - }  
3338 - }  
3339 - }  
3340 - }*/  
3341 } 2764 }
3342 } 2765 }
3343 2766
@@ -3800,10 +3223,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3800,10 +3223,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3800 ) { 3223 ) {
3801 jcclc += tempJhlc; 3224 jcclc += tempJhlc;
3802 } 3225 }
3803 - //主任务 放空班次属于营运  
3804 -// else if(scheduleRealInfo.getBcType().equals("venting")){  
3805 -// ksgl += tempJhlc;  
3806 -// }  
3807 else { 3226 else {
3808 if (scheduleRealInfo.getStatus() != -1) { 3227 if (scheduleRealInfo.getStatus() != -1) {
3809 if (scheduleRealInfo.isSflj()) { 3228 if (scheduleRealInfo.isSflj()) {
@@ -3971,86 +3390,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3971,86 +3390,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3971 double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0,jhjcclc=0; 3390 double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0,jhjcclc=0;
3972 double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0; 3391 double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
3973 Map<String, Object> map = new HashMap<String, Object>(); 3392 Map<String, Object> map = new HashMap<String, Object>();
3974 - /* for (ScheduleRealInfo scheduleRealInfo : list) {  
3975 - if (scheduleRealInfo != null) {  
3976 - //计划里程（主任务过滤掉临加班次），  
3977 - //烂班里程（主任务烂班），  
3978 - //临加里程（主任务临加），  
3979 - //计划班次，烂班班次，增加班次  
3980 - double jh = 0, sj = 0;  
3981 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
3982 - if (scheduleRealInfo.isSflj()) {  
3983 - if(!(scheduleRealInfo.getBcType().equals("in")  
3984 - || scheduleRealInfo.getBcType().equals("out"))){  
3985 - ljbc++;  
3986 - }  
3987 - } else {  
3988 - if (!(scheduleRealInfo.getBcType().equals("in")  
3989 - || scheduleRealInfo.getBcType().equals("out"))) {  
3990 - jhbc++;  
3991 - jh += tempJhlc;  
3992 - }  
3993 -  
3994 - if (scheduleRealInfo.getStatus() == -1) {  
3995 - remMileage += tempJhlc;  
3996 - cjbc++;  
3997 - }  
3998 - }  
3999 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
4000 - //计算营运里程，空驶里程  
4001 - if (childTaskPlans.isEmpty()) {  
4002 - if (scheduleRealInfo.getBcType().equals("in") ||  
4003 - scheduleRealInfo.getBcType().equals("out")) {  
4004 - if(scheduleRealInfo.getStatus() != -1){  
4005 - if(scheduleRealInfo.isSflj()){  
4006 - ljjcclc += tempJhlc;  
4007 - }else{  
4008 - jcclc += tempJhlc;  
4009 - }  
4010 - }  
4011 - }else {  
4012 - if (scheduleRealInfo.getStatus() != -1) {  
4013 - if (scheduleRealInfo.isSflj()) {  
4014 - addMileage += tempJhlc;  
4015 - }  
4016 - sj += tempJhlc;  
4017 - }  
4018 - }  
4019 - } else {  
4020 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
4021 - while (it.hasNext()) {  
4022 - ChildTaskPlan childTaskPlan = it.next();  
4023 - if (childTaskPlan.getMileageType().equals("empty")) {  
4024 - if (childTaskPlan.isDestroy()) {  
4025 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4026 - } else {  
4027 - if (scheduleRealInfo.isSflj()) {  
4028 - addMileage += tempJhlc;  
4029 - }  
4030 - ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4031 - }  
4032 - } else {  
4033 - if (childTaskPlan.isDestroy()) {  
4034 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4035 -// cjbc++;  
4036 - } else {  
4037 - if (scheduleRealInfo.isSflj()) {  
4038 - addMileage += tempJhlc;  
4039 - }  
4040 - sj += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4041 - }  
4042 - }  
4043 - }  
4044 - }  
4045 - jhlc += jh;  
4046 - yygl += sj;  
4047 - if (jh > sj) {  
4048 - remgl += jh - sj;  
4049 - } else if (sj > jh) {  
4050 - addgl += sj - jh;  
4051 - }  
4052 - }  
4053 - }*/  
4054 jhlc=culateMieageService.culateJhgl(lists); 3393 jhlc=culateMieageService.culateJhgl(lists);
4055 jcclc=culateMieageService.culateJccgl(lists); 3394 jcclc=culateMieageService.culateJccgl(lists);
4056 jhjcclc=culateMieageService.culateJhJccgl(lists); 3395 jhjcclc=culateMieageService.culateJhJccgl(lists);
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
  View file @1fe557a
@@ -44,7 +44,7 @@ public class RealControlSocketHandler implements WebSocketHandler { @@ -44,7 +44,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
44 44
45 vsCount += list.size(); 45 vsCount += list.size();
46 } 46 }
47 - logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1 + "conn: " + listenMap.keySet().size()); 47 + logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1 + "conn: " + users.size());
48 } 48 }
49 49
50 @Override 50 @Override
src/main/resources/static/pages/base/timesmodel/css/index.css
  View file @1fe557a
@@ -118,7 +118,7 @@ text.alert-danger { @@ -118,7 +118,7 @@ text.alert-danger {
118 118
119 .ganttSvgContainer { 119 .ganttSvgContainer {
120 height: 400px; 120 height: 400px;
121 - overflow: hidden; 121 + overflow: auto;
122 position: relative; 122 position: relative;
123 } 123 }
124 124
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @1fe557a
@@ -382,87 +382,171 @@ var BaseFun = function() { @@ -382,87 +382,171 @@ var BaseFun = function() {
382 * 382 *
383 * 383 *
384 **/ 384 **/
385 - abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa , cara , bxrcObj , dgminpcs) {  
386 - var rsultA = new Array(); 385 + abstractBcByWorkTime : function(bxlpbc , map , dataMap , saa , cara , bxrcObj , dgminpcs ,deletebcNum) {
  386 + var rsultA = new Array() , dgzjsj = baseF.getDateTime('13:00');
  387 + // 定义13:00 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
  388 + var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));
  389 + // 定义早高峰结束 ~ 13:00 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.
  390 + var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));
  391 + var sumGs = 0;
387 for(var a = 0 ; a < bxlpbc.length ; a++) { 392 for(var a = 0 ; a < bxlpbc.length ; a++) {
388 - /*if(a>0)  
389 - continue;*/  
390 // 定义该版型下对应的路牌的班次数组、班次数组长度、该路牌上是否有首末班车。 393 // 定义该版型下对应的路牌的班次数组、班次数组长度、该路牌上是否有首末班车。
391 var lpbc = bxlpbc[a].lpbc, lpbclen_ = lpbc.length; 394 var lpbc = bxlpbc[a].lpbc, lpbclen_ = lpbc.length;
392 if(lpbclen_<=0) 395 if(lpbclen_<=0)
393 continue; 396 continue;
394 - var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr);  
395 - // 定义当前路牌的初始工时、班型对应的标准工时  
396 - var initCountGs = bxlpbc[a].initCountGs , bzgs = bxlpbc[a].bzgs;  
397 - // 定义初始工时与日平均工时差值  
398 - var initdx = initCountGs - bxlpbc[a].gsavg;  
399 - // 定义剔除班次数、剔除的时间段.  
400 - var deletebcNum = Math.ceil((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array();  
401 - // var deletebcNum = parseInt((initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj) , tcbcgzA = new Array(); 397 + var isFlag = baseF.lpDownIsHaveFirstAndLastBc(lpbc , dataMap.smbcsjArr) , tcbcgzA = new Array();
402 if(bxrcObj.type == '五工二休') { 398 if(bxrcObj.type == '五工二休') {
403 // 定义晚高峰后能剔除多少班次数. 399 // 定义晚高峰后能剔除多少班次数.
404 var wgfhtcbcNum = parseInt(( dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj)); 400 var wgfhtcbcNum = parseInt(( dataMap.wgfzhsjd[0].ed - dataMap.wgfsjd[0].ed ) / (60000 *　saa[0].zzsj.dgzzsj));
405 - // 定义时间段内剔除班次规则.  
406 - tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed ,'order' : 'desc' , 'deletebcNum' : wgfhtcbcNum},  
407 - {'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'asc' , 'deletebcNum' : deletebcNum - wgfhtcbcNum});  
408 - // 逆序排序剔除.  
409 - // lpbc.sort(function(r,s){return s.fcno-r.fcno}); 401 + if(isFlag) {
  402 + // 定义时间段内剔除班次规则.
  403 + tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
  404 + }else {
  405 + // 定义时间段内剔除班次规则.
  406 + tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed ,'order' : 'desc' , 'deletebcNum' : wgfhtcbcNum},
  407 + {'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'asc' , 'deletebcNum' : deletebcNum - wgfhtcbcNum});
  408 + }
410 // 剔除不在高峰时间段内的班次. 409 // 剔除不在高峰时间段内的班次.
411 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , false); 410 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , 'desc' , false);
412 }else { 411 }else {
413 - /*console.log(bxlpbc[a].lpNo , initCountGs , bzgs , saa[0].zzsj.dgzzsj ,  
414 - initCountGs - bzgs , (initCountGs - bzgs) /saa[0].zzsj.dgzzsj ,  
415 - initCountGs - bxlpbc[a].gsavg , (initCountGs - bxlpbc[a].gsavg) / saa[0].zzsj.dgzzsj );*/  
416 // 单档 一个路牌一档劳动力 412 // 单档 一个路牌一档劳动力
417 if(bxlpbc[a].keepOff==1) { 413 if(bxlpbc[a].keepOff==1) {
418 // 如果低谷至少配车数大于零,则该班型下的路牌 存在一些 分班路牌,这里的分班 指的是 这个路牌先满足的前提条件就是 是单档。 414 // 如果低谷至少配车数大于零,则该班型下的路牌 存在一些 分班路牌,这里的分班 指的是 这个路牌先满足的前提条件就是 是单档。
419 // 为了满足工时的要求，在低谷断开一段时间. 415 // 为了满足工时的要求，在低谷断开一段时间.
420 - if(dgminpcs>0 && dgminpcs <= bxrcObj.fpcls ) {  
421 - if( (a + 1) <= dgminpcs) {  
422 - var dgzjsj = baseF.getDateTime('13:00');  
423 - /*var zgfyh = dataMap.zgfsjd[0].ed;  
424 - zgfyh.setMinutes(zgfyh.getMinutes()+ Math.min.apply(null, dataMap.dgxxsjArr));*/  
425 - if( a % 2 == 0) {  
426 - // 定义早高峰结束 ~ 12:30 剔除规则.如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.  
427 - var swmaxtcbcNum = parseInt(( dgzjsj - dataMap.zgfsjd[0].ed) / (60000 *　saa[0].zzsj.dgzzsj));  
428 - if(deletebcNum < swmaxtcbcNum || isFlag) {  
429 - // tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});  
430 - tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum});  
431 - }else {  
432 - tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum},  
433 - {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});  
434 - }  
435 - }else {  
436 - // 定义12:30 ~ 晚高峰开始以前剔除规则. 如果剔除的班次数不够，则去晚高峰之后剔除剩下的班次.  
437 - var xwmaxtcbcNum = parseInt(( dataMap.wgfsjd[0].st - dgzjsj) / (60000 *　saa[0].zzsj.dgzzsj));  
438 - if(deletebcNum < xwmaxtcbcNum || isFlag) {  
439 - tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});  
440 - }else {  
441 - tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum - xwmaxtcbcNum},  
442 - {'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});  
443 - } 416 + if(dgminpcs > 0) {
  417 + if( a % 2 == 0) {
  418 + if(deletebcNum < swmaxtcbcNum || isFlag) {
  419 + tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed , 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : deletebcNum});
  420 + }else {
  421 + tcbcgzA.push({'minsj': dataMap.zgfsjd[0].ed, 'maxsj' : dgzjsj , 'order' : 'asc' , 'deletebcNum' : swmaxtcbcNum},
  422 + {'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed, 'order' : 'desc' , 'deletebcNum' : deletebcNum - swmaxtcbcNum});
444 } 423 }
445 - // 按规则剔除班次.并且分班.路牌班次断开.  
446 - baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);  
447 }else { 424 }else {
448 - // 按规则剔除班次.不分班.路牌班次不会断开.  
449 - baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false); 425 + if(deletebcNum < xwmaxtcbcNum || isFlag) {
  426 + tcbcgzA.push({'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : deletebcNum});
  427 + }else {
  428 + tcbcgzA.push({'minsj': dataMap.wgfsjd[0].ed , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum - xwmaxtcbcNum},
  429 + {'minsj': dgzjsj , 'maxsj' : dataMap.wgfsjd[0].st , 'order' : 'desc', 'deletebcNum' : xwmaxtcbcNum});
  430 + }
450 } 431 }
  432 + // 按规则剔除班次.并且分班.路牌班次断开.
  433 + baseF.spliceBc02(lpbc , tcbcgzA , dataMap , true);
  434 + baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , true , a);
451 // 该班型下的路牌 不存在分班路牌. 435 // 该班型下的路牌 不存在分班路牌.
452 }else if(dgminpcs == 0){ 436 }else if(dgminpcs == 0){
453 // 按规则剔除班次.不分班.路牌班次不会断开. 437 // 按规则剔除班次.不分班.路牌班次不会断开.
454 baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false); 438 baseF.isdk02(lpbc , dataMap , saa , deletebcNum , false);
  439 + //baseF.affimBzGs(lpbc , bxlpbc[a].bzgs, dataMap, saa , false , a);
455 } 440 }
456 // 双档 一个路牌两档劳动力 441 // 双档 一个路牌两档劳动力
457 }else if(bxlpbc[a].keepOff==2) { 442 }else if(bxlpbc[a].keepOff==2) {
458 // 按规则剔除班次.分班.但是路牌班次不会断开. 443 // 按规则剔除班次.分班.但是路牌班次不会断开.
459 baseF.isdk02(lpbc , dataMap , saa , deletebcNum , true); 444 baseF.isdk02(lpbc , dataMap , saa , deletebcNum , true);
  445 + //baseF.affimBzGs(lpbc , bxlpbc[a].bzgs , dataMap, saa , false , a);
460 } 446 }
461 } 447 }
  448 + // var markAfterGs = baseF.getSumWorkTime(lpbc , dataMap, saa);
  449 + // sumGs += parseFloat((markAfterGs - bxlpbc[a].bzgs).toFixed(2));
  450 + // sumGs += markAfterGs;
462 rsultA = rsultA.concat(lpbc); 451 rsultA = rsultA.concat(lpbc);
463 } 452 }
  453 + // onsole.log(sumGs);
464 return rsultA; 454 return rsultA;
465 }, 455 },
  456 +
  457 + affimBzGs : function(lpbc , bzgs , dataMap, saa , isOff , index_) {
  458 + var tList = lpbc.concat();
  459 + var markAfterGs = baseF.getSumWorkTime(tList , dataMap, saa);
  460 + var gsDx = parseFloat((markAfterGs - bzgs).toFixed(2));
  461 + lpbc.sort(function(m,n){return m.fcno-n.fcno});
  462 + if(isOff) {
  463 + if(gsDx > 1.5) {
  464 + var hoursDx = parseFloat((gsDx - 1.5).toFixed(2));
  465 + // console.log(gsDx , hoursDx ,Math.ceil(hoursDx*60));
  466 + var minueDx = Math.ceil(hoursDx*60);
  467 + var bs = Math.ceil( minueDx / saa[0].zzsj.dgzzsj);
  468 + for(var s = 0 ; s < lpbc.length; s++) {
  469 + if(lpbc[s].isfb ==1) {
  470 + if(index_%2==0) {
  471 + lpbc.splice( (s+1) , bs*2);
  472 + }else {
  473 + lpbc.splice( s , bs*2);
  474 + }
  475 + break;
  476 + }
  477 + }
  478 +
  479 + }
  480 + }else {
  481 +
  482 + }
  483 + },
  484 +
  485 + updTime : function(lpbc , start , end , minueDx ,type ) {
  486 + var agvMarkTime = Math.ceil(minueDx / end);
  487 + for(var u = start ; u < end ; u++) {
  488 + if(type =='asc'){
  489 + var tzDx = lpbc[u].STOPTIME - agvMarkTime , tmvalue = 0;
  490 + if(tzDx < 0)
  491 + tmvalue = parseInt(lpbc[u].bcsj*0.1);
  492 + else
  493 + tmvalue = tzDx;
  494 + lpbc[u].STOPTIME = tmvalue ;
  495 + if( u == start){
  496 + var fcsj = baseF.getDateTime(lpbc[u].fcsj);
  497 + fcsj.setMinutes(fcsj.getMinutes() + minueDx);
  498 + lpbc[u].fcsj = baseF.getTimeStr(fcsj);
  499 + fcsj.setMinutes(fcsj.getMinutes() + lpbc[u].bcsj);
  500 + lpbc[u].ARRIVALTIME = baseF.getTimeStr(fcsj);
  501 + }else {
  502 + // 定义到达时间.
  503 + var ddsj_ = baseF.getDateTime(lpbc[u-1].ARRIVALTIME);
  504 + ddsj_.setMinutes(ddsj_.getMinutes() + lpbc[u-1].STOPTIME);
  505 + lpbc[u].fcsj = baseF.getTimeStr(ddsj_);
  506 + ddsj_.setMinutes(ddsj_.getMinutes() + lpbc[u].bcsj);
  507 + // 修改最后一个班次的到达时间.
  508 + lpbc[u].ARRIVALTIME = baseF.getTimeStr(ddsj_);
  509 + }
  510 +
  511 + }else {
  512 + if( u == start){
  513 + var fcsj = baseF.getDateTime(lpbc[u].fcsj);
  514 + fcsj.setMinutes(fcsj.getMinutes() - minueDx);
  515 + lpbc[u].fcsj = baseF.getTimeStr(fcsj);
  516 + fcsj.setMinutes(fcsj.getMinutes() + lpbc[u].bcsj);
  517 + lpbc[u].ARRIVALTIME = baseF.getTimeStr(fcsj);
  518 + }else {
  519 + var tzDx = lpbc[u].STOPTIME - agvMarkTime , tmvalue = 0;
  520 + if(tzDx < 0)
  521 + tmvalue = parseInt(lpbc[u].bcsj*0.1);
  522 + else
  523 + tmvalue = tzDx;
  524 + lpbc[u].STOPTIME = tmvalue ;
  525 + // 定义到达时间.
  526 + var ddsj_ = baseF.getDateTime(lpbc[u-1].fcsj);
  527 + ddsj_.setMinutes(ddsj_.getMinutes() - lpbc[u].STOPTIME);
  528 + lpbc[u].ARRIVALTIME = baseF.getTimeStr(ddsj_);
  529 + ddsj_.setMinutes(ddsj_.getMinutes() - lpbc[u].bcsj);
  530 + // 修改最后一个班次的到达时间.
  531 + lpbc[u].fcsj = baseF.getTimeStr(ddsj_);
  532 + }
  533 + }
  534 +
  535 + }
  536 + },
  537 +
  538 + getSumWorkTime : function(lpbc , dataMap , saa) {
  539 + lpbc.sort(function(x,y){return x.fcno-y.fcno});
  540 + var sumWorkTime = dataMap.jcsjArr[baseF.dirDmToIndex(lpbc[0].xlDir)] +
  541 + dataMap.ccsjArr[baseF.dirDmToIndex(lpbc[lpbc.length-1].xlDir)] +
  542 + saa[0].lbsj*2;
  543 + for(var t = 0 ; t < lpbc.length ; t++) {
  544 + sumWorkTime += lpbc[t].bcsj + lpbc[t].STOPTIME;
  545 + }
  546 + return parseFloat((sumWorkTime/60).toFixed(2));
  547 + },
  548 +
  549 +
466 /** 550 /**
467 * @description (TODO) 判断某路牌下是否存在首末班车时间班次. 551 * @description (TODO) 判断某路牌下是否存在首末班车时间班次.
468 * @param arr 某路牌下的班次. 552 * @param arr 某路牌下的班次.
@@ -471,7 +555,7 @@ var BaseFun = function() { @@ -471,7 +555,7 @@ var BaseFun = function() {
471 lpDownIsHaveFirstAndLastBc : function(arr , smbcsjArr) { 555 lpDownIsHaveFirstAndLastBc : function(arr , smbcsjArr) {
472 for(var a = 0 ; a < arr.length ; a++) { 556 for(var a = 0 ; a < arr.length ; a++) {
473 for(var s = 0 ; s < smbcsjArr.length ; s++) { 557 for(var s = 0 ; s < smbcsjArr.length ; s++) {
474 - if(arr[a].fcsj == smbcsjArr[s].kssj || arr[a].fcsj == smbcsjArr[s].jssj) 558 + if(arr[a].fcsj == smbcsjArr[s].jssj && baseF.dirDmToIndex(arr[a].xlDir) == s)
475 return true; 559 return true;
476 } 560 }
477 } 561 }
@@ -487,10 +571,11 @@ var BaseFun = function() { @@ -487,10 +571,11 @@ var BaseFun = function() {
487 if(lpbc.length > 0 && deletebcNum > 0) { 571 if(lpbc.length > 0 && deletebcNum > 0) {
488 lpbc.sort(function(r,s){return r.fcint-s.fcint}); 572 lpbc.sort(function(r,s){return r.fcint-s.fcint});
489 var tcbcgzA = new Array(); 573 var tcbcgzA = new Array();
490 - debugger;  
491 - if(lpbc[0].fcsj == dataMap.smbcsjArr[0].kssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].kssj) { 574 + if( (lpbc[0].fcsj == dataMap.smbcsjArr[0].kssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 0)
  575 + || (lpbc[0].fcsj == dataMap.smbcsjArr[1].kssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 1)) {
492 tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum}); 576 tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : deletebcNum});
493 - }else if(lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[0].jssj || lpbc[0].fcsj == dataMap.smbcsjArr[1].jssj) { 577 + }else if((lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[0].jssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 0)
  578 + || (lpbc[lpbc.length-1].fcsj == dataMap.smbcsjArr[1].jssj && baseF.dirDmToIndex(lpbc[0].xlDir) == 1)) {
494 tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum}); 579 tcbcgzA.push({'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : deletebcNum});
495 }else { 580 }else {
496 var zgfzqtcbcNum = parseInt(( dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)), 581 var zgfzqtcbcNum = parseInt(( dataMap.zgfzqsjd[0].ed - dataMap.zgfzqsjd[0].st ) / (60000 *　saa[0].zzsj.dgzzsj)),
@@ -498,17 +583,9 @@ var BaseFun = function() { @@ -498,17 +583,9 @@ var BaseFun = function() {
498 tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : wgfhtcbcNum}, 583 tcbcgzA.push({'minsj': dataMap.wgfzhsjd[0].st , 'maxsj' : dataMap.wgfzhsjd[0].ed , 'order' : 'desc', 'deletebcNum' : wgfhtcbcNum},
499 {'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum}); 584 {'minsj': dataMap.zgfzqsjd[0].st , 'maxsj' : dataMap.zgfzqsjd[0].ed , 'order' : 'asc', 'deletebcNum' : zgfzqtcbcNum});
500 } 585 }
501 - /*if( wgfhtcbcNum >= deletebcNum) {  
502 -  
503 - }else if(zgfzqtcbcNum >= deletebcNum){  
504 -  
505 - }else if(deletebcNum >= (zgfzqtcbcNum + wgfhtcbcNum)){  
506 -  
507 - }*/  
508 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , isfb); 586 baseF.spliceBc02(lpbc , tcbcgzA , dataMap , isfb);
509 } 587 }
510 }, 588 },
511 -  
512 /** 589 /**
513 * @description (TODO) 根据定义规则剔除班次. 590 * @description (TODO) 根据定义规则剔除班次.
514 * @param arr 班次数组. 591 * @param arr 班次数组.
@@ -558,7 +635,8 @@ var BaseFun = function() { @@ -558,7 +635,8 @@ var BaseFun = function() {
558 var dgmaxfcjx = parseInt(map.dgmaxfcjx), 635 var dgmaxfcjx = parseInt(map.dgmaxfcjx),
559 dgmaxtzsj = parseInt(map.dgmaxtzsj); 636 dgmaxtzsj = parseInt(map.dgmaxtzsj);
560 // 计算低谷最少配车数 (低谷上行行驶时间 + 低谷下行行驶时间 + 低谷最大停站时间*2) / 低谷最大发车间隙. 637 // 计算低谷最少配车数 (低谷上行行驶时间 + 低谷下行行驶时间 + 低谷最大停站时间*2) / 低谷最大发车间隙.
561 - var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dgmaxtzsj*2) / dgmaxfcjx); 638 + var dgminpcs = Math.round((dataMap.dgxxsjArr[0] + dataMap.dgxxsjArr[1] + dataMap.dgtzsj[0] + dataMap.dgtzsj[1]) / dgmaxfcjx);
  639 + // var dgminpcs = 4;
562 // 定义返回数组. 640 // 定义返回数组.
563 var rs = new Array(); 641 var rs = new Array();
564 for(var x = 0 ; x < bxrclist.length; x++) { 642 for(var x = 0 ; x < bxrclist.length; x++) {
@@ -619,15 +697,20 @@ var BaseFun = function() { @@ -619,15 +697,20 @@ var BaseFun = function() {
619 bxlpbc.push({'bxtyp' : bxrclist[x].type , 'lpNo' : lpNo , 697 bxlpbc.push({'bxtyp' : bxrclist[x].type , 'lpNo' : lpNo ,
620 'lpbc' : lpbc , 'dygbcfcsj' : lpbc[lpbc.length-1].fcsj, 698 'lpbc' : lpbc , 'dygbcfcsj' : lpbc[lpbc.length-1].fcsj,
621 'initCountGs' : initCountGs , 699 'initCountGs' : initCountGs ,
622 - 'keepOff' : keepOff , 'bzgs' : parseInt(hoursV*60) , 'gsavg' : parseInt(bxrclist[x].gsavg*60) , 700 + 'keepOff' : keepOff , 'bzgs' : parseFloat(hoursV.toFixed(1)) , 'gsavg' : parseInt(bxrclist[x].gsavg*60) ,
623 'fcint' : baseF.getDateTime(lpbc[lpbc.length-1].fcsj).getTime()}); 701 'fcint' : baseF.getDateTime(lpbc[lpbc.length-1].fcsj).getTime()});
624 } 702 }
625 } 703 }
626 if(bxlpbc.length > 0 ) { 704 if(bxlpbc.length > 0 ) {
627 bxlpbc.sort(function(x,y){return x.fcint-y.fcint}); 705 bxlpbc.sort(function(x,y){return x.fcint-y.fcint});
  706 + var avgMakerCarNum = 0;
  707 + for(var v = 0 ; v<bxlpbc.length ; v++) {
  708 + avgMakerCarNum += Math.ceil((bxlpbc[v].initCountGs - bxlpbc[v].gsavg) / saa[0].zzsj.dgzzsj);
  709 + }
  710 + avgMakerCarNum = parseInt(avgMakerCarNum / bxlpbc.length);
628 // console.log(bxlpbc); 711 // console.log(bxlpbc);
629 // 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班. 712 // 调整某班型下的各个路牌对应的班次以及工时、停站时间、是否分班.
630 - rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa , cara , bxrclist[x] , dgminpcs)); 713 + rs = rs.concat(baseF.abstractBcByWorkTime(bxlpbc , map , dataMap , saa , cara , bxrclist[x] , dgminpcs , avgMakerCarNum));
631 } 714 }
632 } 715 }
633 return rs; 716 return rs;
@@ -697,7 +780,9 @@ var BaseFun = function() { @@ -697,7 +780,9 @@ var BaseFun = function() {
697 var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(jsonArray , dataMap); 780 var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(jsonArray , dataMap);
698 781
699 // 第四步 横向调整 782 // 第四步 横向调整
700 - baseF.resizeByPitStopTime(cara , jsonArray , dataMap); 783 + baseF.resizeByPitStopTime(cara , markArray , dataMap);
  784 +
  785 + // return {'json':markArray,'bxrcgs':null};
701 786
702 /** 787 /**
703 * 第五步 把班型合理的分配到各个路牌上. 788 * 第五步 把班型合理的分配到各个路牌上.
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
  View file @1fe557a
@@ -1134,7 +1134,7 @@ var RelationshipGraph = function () { @@ -1134,7 +1134,7 @@ var RelationshipGraph = function () {
1134 // 3.2、定义鼠标按下的x、y坐标 . 1134 // 3.2、定义鼠标按下的x、y坐标 .
1135 var d3MouseDown_x = parseInt(d3.mouse(this)[0]),d3MouseDown_y = parseInt(d3.mouse(this)[1]); 1135 var d3MouseDown_x = parseInt(d3.mouse(this)[0]),d3MouseDown_y = parseInt(d3.mouse(this)[1]);
1136 // 3.3、计时鼠标是否按下已有300ms,并且在300ms中鼠标未曾移动，则打开开关,进入鼠标操作过程. 1136 // 3.3、计时鼠标是否按下已有300ms,并且在300ms中鼠标未曾移动，则打开开关,进入鼠标操作过程.
1137 - stop = setTimeout(function(e) { 1137 + stop = setTimeout(function() {
1138 // 3.4、打开鼠标移动和松开事件开关. 1138 // 3.4、打开鼠标移动和松开事件开关.
1139 flag = true; 1139 flag = true;
1140 // 3.5、记录当前选择框数 . 1140 // 3.5、记录当前选择框数 .
@@ -1160,6 +1160,7 @@ var RelationshipGraph = function () { @@ -1160,6 +1160,7 @@ var RelationshipGraph = function () {
1160 },200); 1160 },200);
1161 // 4、给svg容器元素对象 添加鼠标移动事件 . 这里等同于绘制选择框. 1161 // 4、给svg容器元素对象 添加鼠标移动事件 . 这里等同于绘制选择框.
1162 }).on('mousemove',function(e){ 1162 }).on('mousemove',function(e){
  1163 + // $('.ganttSvgContainer').css('overflow','auto');
1163 // 4.1 判断开关是否打开状态. 1164 // 4.1 判断开关是否打开状态.
1164 if(flag) { 1165 if(flag) {
1165 // 4.1.1、定义鼠标移动的x、y坐标. 1166 // 4.1.1、定义鼠标移动的x、y坐标.
@@ -1183,6 +1184,7 @@ var RelationshipGraph = function () { @@ -1183,6 +1184,7 @@ var RelationshipGraph = function () {
1183 } 1184 }
1184 // 6、给svg容器元素对象 添加鼠标移出事件.解决鼠标在其他元素上松开而不关闭开关问题.只有在绑定 mouseleave 事件的元素上，将鼠标移出时，才会触发该事件。 1185 // 6、给svg容器元素对象 添加鼠标移出事件.解决鼠标在其他元素上松开而不关闭开关问题.只有在绑定 mouseleave 事件的元素上，将鼠标移出时，才会触发该事件。
1185 }).on('mouseleave',function() { 1186 }).on('mouseleave',function() {
  1187 + // $('.ganttSvgContainer').css('overflow','hidden');
1186 if(flag) { 1188 if(flag) {
1187 layer.closeAll();// 关闭弹出层. 1189 layer.closeAll();// 关闭弹出层.
1188 RelationshipGraph.mouseUpEvent(flag); 1190 RelationshipGraph.mouseUpEvent(flag);
src/main/resources/static/pages/base/timesmodel/js/gantt.js
  View file @1fe557a
@@ -747,10 +747,4 @@ @@ -747,10 +747,4 @@
747 layer.closeAll(); 747 layer.closeAll();
748 layer.msg('操作成功!已【'+ msg + '】!'); 748 layer.msg('操作成功!已【'+ msg + '】!');
749 } 749 }
750 -  
751 - $('#scrllmouseEvent').on('mousemove',function() {  
752 - $('.ganttSvgContainer').css('overflow','auto');  
753 - }).on('mouseleave',function() {  
754 - $('.ganttSvgContainer').css('overflow','hidden');  
755 - });  
756 })(); 750 })();
757 \ No newline at end of file 751 \ No newline at end of file
src/main/resources/static/pages/forms/mh_sj/scheduleDaily/scheduleDaily_mh.html 0 → 100644
  View file @1fe557a
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid;
  11 + text-align: center; }
  12 + .table-bordered > thead > tr > th,
  13 + .table-bordered > thead > tr > td {
  14 + border-bottom-width: 2px; }
  15 +
  16 + .table > tbody + tbody {
  17 + border-top: 1px solid; }
  18 +
  19 + #forms > thead > tr> td >span{
  20 +
  21 + width: 5px;
  22 +word-wrap: break-word;
  23 +/* letter-spacing: 20px; */
  24 + }
  25 +
  26 + #forms tr> td >label{
  27 + word-break: keep-all;white-space:nowrap;
  28 + }
  29 +</style>
  30 +
  31 +<div class="page-head">
  32 + <div class="page-title">
  33 + <h1>调度日报</h1>
  34 + </div>
  35 +</div>
  36 +
  37 +<div class="row">
  38 + <div class="col-md-12">
  39 + <div class="portlet light porttlet-fit bordered">
  40 + <div class="portlet-title">
  41 + <form class="form-inline" action="">
  42 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ddrb">
  43 + <span class="item-label" style="width: 80px;">公司: </span>
  44 + <select class="form-control" name="company" id="gsdmDdrb" style="width: 180px;"></select>
  45 + </div>
  46 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ddrb">
  47 + <span class="item-label" style="width: 80px;">分公司: </span>
  48 + <select class="form-control" name="subCompany" id="fgsdmDdrb" style="width: 180px;"></select>
  49 + </div>
  50 + <div style="margin-top: 2px"></div>
  51 + <div style="display: inline-block;">
  52 + <span class="item-label" style="width: 80px;margin-left: 33px;">线路: </span>
  53 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  54 + </div>
  55 + <div style="display: inline-block;margin-left: 24px;">
  56 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  57 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  58 + </div>
  59 + <div class="form-group">
  60 + <input class="btn btn-default" type="button" id="query" value="查询"/>
  61 +<!-- <input class="btn btn-default" type="button" id="month" value="按月查询"/> -->
  62 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  63 + </div>
  64 + </form>
  65 + </div>
  66 + <div class="portlet-body">
  67 + <div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
  68 + <label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
  69 + <br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
  70 + <table class="table table-bordered table-hover table-checkable" id="forms">
  71 + <thead>
  72 + <tr>
  73 + <th colspan="40">线路调度日报</th>
  74 + </tr>
  75 + <tr>
  76 + <td rowspan="3"><span >路线名</span></td>
  77 + <td colspan="16"><c>全日</c>营运里程（公里）</td>
  78 + <td colspan="15"><c>全日</c>营运班次</td>
  79 + <td colspan="9">大间隔情况</td>
  80 + </tr>
  81 + <tr>
  82 + <td rowspan="2"><span >计划</span></td>
  83 + <td rowspan="2"><span >实驶</span></td>
  84 + <td rowspan="2"><span>少驶公里</span></td>
  85 + <td rowspan="2"><span>少驶班次</span></td>
  86 + <td colspan="11">少驶原因（公里）</td>
  87 + <td rowspan="2"><span >临加公里</span></td>
  88 + <td colspan="3">计划班次</td>
  89 + <td colspan="3">实际班次</td>
  90 + <td colspan="3">临加班次</td>
  91 + <td colspan="3">放站班次</td>
  92 + <td colspan="3">调头班次</td>
  93 + <td colspan="3">发生次数</td>
  94 + <td rowspan="2">最大间隔时间（分）</td>
  95 + <td colspan="5" rowspan="2">原因</td>
  96 + </tr>
  97 + <tr>
  98 + <td><span >路阻</span></td>
  99 + <td><span>吊慢</span></td>
  100 + <td><span >故障</span></td>
  101 + <td><span >纠纷</span></td>
  102 + <td><span >肇事</span></td>
  103 + <td><span>缺人</span></td>
  104 + <td><span>缺车</span></td>
  105 + <td><span >客稀</span></td>
  106 + <td><span>气候</span></td>
  107 + <td><span>援外</span></td>
  108 + <td><span>其他</span></td>
  109 + <td><span ><c>全日</c></span></td>
  110 + <td><span >早高峰</span></td>
  111 + <td><span>晚高峰</span></td>
  112 + <td><span><c>全日</c></span></td>
  113 + <td><span>早高峰</span></td>
  114 + <td><span>晚高峰</span></td>
  115 + <td><span><c>全日</c></span></td>
  116 + <td><span>早高峰</span></td>
  117 + <td><span>晚高峰</span></td>
  118 + <td><span><c>全日</c></span></td>
  119 + <td><span>早高峰</span></td>
  120 + <td><span>晚高峰</span></td>
  121 + <td><span><c>全日</c></span></td>
  122 + <td><span>早高峰</span></td>
  123 + <td><span>晚高峰</span></td>
  124 + <td><span><c>全日</c></span></td>
  125 + <td><span>早高峰</span></td>
  126 + <td><span>晚高峰</span></td>
  127 + </tr>
  128 + </thead>
  129 +
  130 + <tbody class="scheduleDaily_1">
  131 +
  132 + </tbody>
  133 + <tr>
  134 + <td colspan="40">&nbsp;</td>
  135 + </tr>
  136 + <!-- <tr>
  137 + <td colspan="40">合计</td>
  138 + </tr>
  139 + <tr>
  140 + <td>售票</td>
  141 + <td colspan="2">1元</td>
  142 + <td colspan="2">2元</td>
  143 + <td colspan="2">3元</td>
  144 + <td colspan="2">4元</td>
  145 + <td colspan="2">5元</td>
  146 + <td colspan="2">6元</td>
  147 + <td colspan="2">7元</td>
  148 + <td colspan="2">8元</td>
  149 + <td colspan="2">9元</td>
  150 + <td colspan="2">10元</td>
  151 + <td colspan="2">&nbsp;</td>
  152 + <td colspan="2">合计张数</td>
  153 + <td colspan="2">&nbsp;</td>
  154 + <td colspan="2">预售票</td>
  155 + <td colspan="2">1元</td>
  156 + <td colspan="2">1.5元</td>
  157 + <td colspan="2">合计张数</td>
  158 + <td colspan="5">&nbsp;</td>
  159 + </tr>
  160 + <tr>
  161 + <td>张数</td>
  162 + <td colspan="2">&nbsp;</td>
  163 + <td colspan="2">&nbsp;</td>
  164 + <td colspan="2">&nbsp;</td>
  165 + <td colspan="2">&nbsp;</td>
  166 + <td colspan="2">&nbsp;</td>
  167 + <td colspan="2">&nbsp;</td>
  168 + <td colspan="2">&nbsp;</td>
  169 + <td colspan="2">&nbsp;</td>
  170 + <td colspan="2">&nbsp;</td>
  171 + <td colspan="2">&nbsp;</td>
  172 + <td colspan="2">&nbsp;</td>
  173 + <td colspan="2">合计金额</td>
  174 + <td colspan="2">&nbsp;</td>
  175 + <td colspan="2">张数</td>
  176 + <td colspan="2">&nbsp;</td>
  177 + <td colspan="2">&nbsp;</td>
  178 + <td colspan="2">合计金额</td>
  179 + <td colspan="5">&nbsp;</td>
  180 + </tr>
  181 + <tr>
  182 + <td colspan="40">&nbsp;</td>
  183 + </tr> -->
  184 + <tr>
  185 + <td colspan="2"><label>路牌</label></td>
  186 + <td colspan="2"><label>车号</label></td>
  187 + <td> <label>司早</label></td>
  188 + <td><label>售早</label></td>
  189 + <td><label>司晚</label></td>
  190 + <td><label>售晚</label></td>
  191 + <td colspan="2"><label>路牌</label></td>
  192 + <td colspan="2"><label>车号</label></td>
  193 + <td><label>司早</label></td>
  194 + <td><label>售早</label></td>
  195 + <td><label>司晚</label></td>
  196 + <td><label>售晚</label></td>
  197 + <td colspan="2"><label>路牌</label></td>
  198 + <td colspan="2"><label>车号</label></td>
  199 + <td><label>司早</label></td>
  200 + <td><label>售早</label></td>
  201 + <td><label>司晚</label></td>
  202 + <td><label>售晚</label></td>
  203 + <td colspan="2"><label>路牌</label></td>
  204 + <td colspan="2"><label>车号</label></td>
  205 + <td><label>司早</label></td>
  206 + <td><label>售早</label></td>
  207 + <td><label>司晚</label></td>
  208 + <td><label>售晚</label></td>
  209 + <td colspan="2"><label>路牌</label></td>
  210 + <td colspan="2"><label>车号</label></td>
  211 + <td><label>司早</label></td>
  212 + <td><label>售早</label></td>
  213 + <td><label>司晚</label></td>
  214 + <td><label>售晚</label></td>
  215 + </tr>
  216 + <tbody class="scheduleDaily_2">
  217 +
  218 + </tbody>
  219 + <tr>
  220 + <td colspan="40">&nbsp;</td>
  221 + </tr>
  222 + <tr>
  223 + <td rowspan="2">路牌</td>
  224 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  225 + <td colspan="4">到达时间</td>
  226 + <td colspan="4">发车时间</td>
  227 + <td colspan="2" rowspan="2">备注</td>
  228 + <td rowspan="2">路牌</td>
  229 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  230 + <td colspan="4">到达时间</td>
  231 + <td colspan="4">发车时间</td>
  232 + <td colspan="2" rowspan="2">备注</td>
  233 + <td rowspan="2">路牌</td>
  234 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  235 + <td colspan="4">到达时间</td>
  236 + <td colspan="4">发车时间</td>
  237 + <td colspan="2" rowspan="2">备注</td>
  238 + <td>&nbsp;</td>
  239 + </tr>
  240 + <tr>
  241 + <td>应到</td>
  242 + <td>实到</td>
  243 + <td>快</td>
  244 + <td>慢</td>
  245 + <td>应发</td>
  246 + <td>实发</td>
  247 + <td>快</td>
  248 + <td>慢</td>
  249 + <td>应到</td>
  250 + <td>实到</td>
  251 + <td>快</td>
  252 + <td>慢</td>
  253 + <td>应发</td>
  254 + <td>实发</td>
  255 + <td>快</td>
  256 + <td>慢</td>
  257 + <td>应到</td>
  258 + <td>实到</td>
  259 + <td>快</td>
  260 + <td>慢</td>
  261 + <td>应发</td>
  262 + <td>实发</td>
  263 + <td>快</td>
  264 + <td>慢</td>
  265 + <td>&nbsp;</td>
  266 + </tr>
  267 + <tbody class="scheduleDaily_3">
  268 +
  269 + </tbody>
  270 + </table>
  271 + </div>
  272 + </div>
  273 + </div>
  274 + </div>
  275 +</div>
  276 +
  277 +<script>
  278 + $(function(){
  279 + // 关闭左侧栏
  280 + if (!$('body').hasClass('page-sidebar-closed'))
  281 + $('.menu-toggler.sidebar-toggler').click();
  282 +
  283 + $("#date").datetimepicker({
  284 + format : 'YYYY-MM-DD',
  285 + locale : 'zh-cn'
  286 + });
  287 + var d = new Date();
  288 + var year = d.getFullYear();
  289 + var month = d.getMonth() + 1;
  290 + var day = d.getDate();
  291 + if(month < 10)
  292 + month = "0" + month;
  293 + if(day < 10)
  294 + day = "0" + day;
  295 + $("#date").val(year + "-" + month + "-" + day);
  296 +
  297 + $("#ddrbBody").height($(window).height()-100);
  298 + /* $.get('/basic/lineCode2Name',function(result){
  299 + var data=[];
  300 +
  301 + for(var code in result){
  302 + data.push({id: code, text: result[code]});
  303 + }
  304 + initPinYinSelect2('#line',data,'');
  305 +
  306 + }) */
  307 + var fage=false;
  308 + var obj = [];
  309 + var xlList;
  310 + $.get('/report/lineList',function(result){
  311 + xlList=result;
  312 + $.get('/user/companyData', function(result){
  313 + obj = result;
  314 + var options = '';
  315 + for(var i = 0; i < obj.length; i++){
  316 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  317 + }
  318 +
  319 + if(obj.length ==0){
  320 + $("#gsdmDiv_ddrb").css('display','none');
  321 + }else if(obj.length ==1){
  322 + $("#gsdmDiv_ddrb").css('display','none');
  323 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  324 + $('#fgsdmDiv_ddrb').css('display','none');
  325 + }
  326 + $('#gsdmDdrb').html(options);
  327 + updateCompany();
  328 + });
  329 + })
  330 + $("#gsdmDdrb").on("change",updateCompany);
  331 + function updateCompany(){
  332 + var company = $('#gsdmDdrb').val();
  333 + var options = '';
  334 + for(var i = 0; i < obj.length; i++){
  335 + if(obj[i].companyCode == company){
  336 + var children = obj[i].children;
  337 + for(var j = 0; j < children.length; j++){
  338 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  339 + }
  340 + }
  341 + }
  342 + $('#fgsdmDdrb').html(options);
  343 + initXl();
  344 + }
  345 + $("#fgsdmDdrb").on("change",initXl);
  346 + function initXl(){
  347 + var data=[];
  348 + if(fage){
  349 + $("#line").select2("destroy").html('');
  350 + }
  351 + var fgs=$('#fgsdmDdrb').val();
  352 + var gs=$('#gsdmDdrb').val();
  353 + for(var i=0;i<xlList.length;i++){
  354 + if(gs!=""){
  355 + if(fgs!=""){
  356 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  357 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  358 + }
  359 + }else{
  360 + if(xlList[i]["gsbm"]==gs){
  361 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  362 + }
  363 + }
  364 + }
  365 + }
  366 + initPinYinSelect2('#line',data,'');
  367 + fage=true;
  368 + }
  369 + $('#export').attr('disabled', "true");
  370 +
  371 + var line = $("#line").val();
  372 + var xlName = $("#select2-line-container").html();
  373 + var date = $("#date").val();
  374 +
  375 + function getTime(list){
  376 + $.each(list, function(i, obj) {
  377 + if(obj.zdsj != null && obj.zdsjActual != null ){
  378 + var zdsjActual = (obj.zdsjActual).split(":");
  379 + var zdsj = (obj.zdsj).split(":");
  380 + if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
  381 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  382 + }
  383 + else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
  384 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  385 + }
  386 + }
  387 +
  388 + if(obj.fcsj != null && obj.fcsjActual != null ){
  389 + var fcsjActual = (obj.fcsjActual).split(":");
  390 + var fcsj = (obj.fcsj).split(":");
  391 + if(fcsjActual[0]*60+Number(fcsjActual[1]) > fcsj[0]*60+Number(fcsj[1])){
  392 + obj["slow0"] = (fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1]));
  393 + }
  394 + else if(fcsjActual[0]*60+Number(fcsjActual[1]) < fcsj[0]*60+Number(fcsj[1])){
  395 + obj["fast0"] = (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
  396 + }
  397 + }
  398 + });
  399 + }
  400 + //查询
  401 + $("#query").on('click',function(){
  402 + line = $("#line").val();
  403 + xlName = $("#select2-line-container").html();
  404 + date = $("#date").val();
  405 + $("#rqxs").html(date);
  406 + if(date == null || date.length == 0){
  407 + layer.msg("请选择时间");
  408 + return;
  409 + }
  410 + $("#ddrbBody").height($(window).height()-100);
  411 + $("c").html("全日");
  412 + $("#export").removeAttr("disabled");
  413 + $get('/realSchedule/statisticsDaily_mh_2',{line:line,date:date,xlName:xlName,type:"query"},function(result){
  414 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  415 + $("#jls").html(result[0].jls);
  416 + $("#jsjss").html(result[0].sjgl);
  417 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  418 + });
  419 + $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
  420 + var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
  421 + $('#forms .scheduleDaily_2').html(scheduleDaily_2);
  422 + });
  423 + $.get('/realSchedule/realScheduleList_mh_2',{line:line,date:date,type:"query"},function(result){
  424 + getTime(result);
  425 + var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
  426 + $('#forms .scheduleDaily_3').html(scheduleDaily_3);
  427 + });
  428 +
  429 + });
  430 +
  431 + //按月查询
  432 + /* $("#month").on('click',function(){
  433 + line = $("#line").val();
  434 + xlName = $("#select2-line-container").html();
  435 + date = $("#date").val();
  436 + if(date == null || date.length == 0){
  437 + layer.msg("请选择时间");
  438 + return;
  439 + }
  440 + date = date.substring(0, 7);
  441 + $("c").html("全月");
  442 + $("#export").removeAttr("disabled");
  443 + $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
  444 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  445 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  446 + });
  447 + $('#forms .scheduleDaily_2').html("");
  448 + $('#forms .scheduleDaily_3').html("");
  449 +
  450 + }); */
  451 +
  452 + $("#export").on("click",function(){
  453 + var params = {};
  454 + if(date == null || date.length == 0){
  455 + layer.msg("请选择时间");
  456 + return;
  457 + }
  458 + params['line'] = line;
  459 + params['date'] = date;
  460 + params['xlName'] = xlName;
  461 + params['type'] = "export";
  462 + params['state'] = '2';
  463 + $get('/realSchedule/scheduleDailyExport', params, function(result){
  464 + if(date.length == 10)
  465 + window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
  466 + else
  467 + window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM"));
  468 + });
  469 + });
  470 +
  471 + });
  472 +</script>
  473 +<script type="text/html" id="scheduleDaily_1">
  474 + {{each list as obj i}}
  475 + <tr >
  476 + <td>{{obj.xlName}}</td>
  477 + <td>{{obj.jhlc}}</td>
  478 + <td>{{obj.sjgl}}</td>
  479 + <td>{{obj.ssgl}}</td>
  480 + <td>{{obj.ssbc}}</td>
  481 + <td>{{obj.ssgl_lz}}</td>
  482 + <td>{{obj.ssgl_dm}}</td>
  483 + <td>{{obj.ssgl_gz}}</td>
  484 + <td>{{obj.ssgl_jf}}</td>
  485 + <td>{{obj.ssgl_zs}}</td>
  486 + <td>{{obj.ssgl_qr}}</td>
  487 + <td>{{obj.ssgl_qc}}</td>
  488 + <td>{{obj.ssgl_kx}}</td>
  489 + <td>{{obj.ssgl_qh}}</td>
  490 + <td>{{obj.ssgl_yw}}</td>
  491 + <td>{{obj.ssgl_other}}</td>
  492 + <td>{{obj.ljgl}}</td>
  493 + <td>{{obj.jhbc}}</td>
  494 + <td>{{obj.jhbc_m}}</td>
  495 + <td>{{obj.jhbc_a}}</td>
  496 + <td>{{obj.sjbc}}</td>
  497 + <td>{{obj.sjbc_m}}</td>
  498 + <td>{{obj.sjbc_a}}</td>
  499 + <td>{{obj.ljbc}}</td>
  500 + <td>{{obj.ljbc_m}}</td>
  501 + <td>{{obj.ljbc_a}}</td>
  502 + <td>{{obj.fzbc}}</td>
  503 + <td>{{obj.fzbc_m}}</td>
  504 + <td>{{obj.fzbc_a}}</td>
  505 + <td>{{obj.dtbc}}</td>
  506 + <td>{{obj.dtbc_m}}</td>
  507 + <td>{{obj.dtbc_a}}</td>
  508 + <td>{{obj.djg}}</td>
  509 + <td>{{obj.djg_m}}</td>
  510 + <td>{{obj.djg_a}}</td>
  511 + <td>{{obj.djg_time}}</td>
  512 + <td colspan="5">&nbsp;</td>
  513 + </tr>
  514 + {{/each}}
  515 + {{if list.length == 0}}
  516 + <tr>
  517 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  518 + </tr>
  519 + {{/if}}
  520 +</script>
  521 +<script type="text/html" id="scheduleDaily_2">
  522 + {{each list as obj i}}
  523 + {{if i%5 == 0}}
  524 + <tr>
  525 + {{/if}}
  526 + <td colspan="2">{{obj[3]}}</td>
  527 + <td colspan="2">{{obj[2]}}</td>
  528 + <td>{{obj[1]}}/{{obj[4]}}</td>
  529 + <td>{{if obj[5] !=null}}
  530 + {{obj[5]}}/
  531 + {{obj[6]}}
  532 +
  533 + {{/if}}
  534 + </td>
  535 + <td>&nbsp;</td>
  536 + <td>&nbsp;</td>
  537 + {{if (i+1)%5 == 0}}
  538 + </tr>
  539 + {{/if}}
  540 + {{/each}}
  541 + {{if list.length == 0}}
  542 + <tr>
  543 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  544 + </tr>
  545 + {{/if}}
  546 +</script>
  547 +<script type="text/html" id="scheduleDaily_3">
  548 + {{each list as obj i}}
  549 + {{if i%3 == 0}}
  550 + <tr>
  551 + {{/if}}
  552 + <td>{{obj.lpName}}</td>
  553 + <td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
  554 + <td>{{obj.zdsj}}</td>
  555 + <td>{{obj.zdsjActual}}</td>
  556 + <td>{{obj.fast}}</td>
  557 + <td>{{obj.slow}}</td>
  558 + <td>{{obj.fcsj}}</td>
  559 + <td>{{obj.fcsjActual}}
  560 + {{if obj.bcType== "in"}}
  561 + (进)
  562 + {{/if}}
  563 + {{if obj.bcType== "out"}}
  564 + (出)
  565 + {{/if}}
  566 + </td>
  567 + <td>{{obj.fast0}}</td>
  568 + <td>{{obj.slow0}}
  569 +
  570 + </td>
  571 + <td colspan="2">{{obj.remarks}}</td>
  572 + {{if (i+1)%3 == 0}}
  573 + <td>&nbsp;</td>
  574 + </tr>
  575 + {{/if}}
  576 + {{/each}}
  577 + {{if list.length == 0}}
  578 + <tr>
  579 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  580 + </tr>
  581 + {{/if}}
  582 +</script>
0 \ No newline at end of file 583 \ No newline at end of file
src/main/resources/static/pages/forms/mh_sj/waybill/waybill_mh.html 0 → 100644
  View file @1fe557a
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>行车路单</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
  37 + </div>
  38 + <div style="margin-top: 2px"></div>
  39 + <div style="display: inline-block; margin-left: 33px;">
  40 + <span class="item-label" style="width: 80px;">线路: </span>
  41 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  42 + </div>
  43 + <div style="display: inline-block;margin-left: 24px;">
  44 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  45 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  46 + </div>
  47 + <div class="form-group" style="display: inline-block;margin-left: 15px;">
  48 + <input class="btn btn-default" type="button" id="query" value="查询"/>
  49 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  50 + <input class="btn btn-default" type="button" id="print" value="打印"/>
  51 + <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
  52 + </div>
  53 + </form>
  54 + </div>
  55 + <div class="portlet-body">
  56 + <div class="row">
  57 + <div class="col-md-3">
  58 + <div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
  59 + <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
  60 + <thead>
  61 + <tr class="hidden">
  62 + <th class="rypx" style="cursor:pointer ">人员</th>
  63 + <th class="zbhpx" style="cursor:pointer ">自编号</th>
  64 + <th class="lppx" style="cursor:pointer ">路牌</th>
  65 + </tr>
  66 + </thead>
  67 + <tbody>
  68 +
  69 + </tbody>
  70 + </table>
  71 + </div>
  72 + </div>
  73 + <div class="col-md-9" id="printArea">
  74 + <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
  75 + <table class="table table-bordered table-checkable" id="forms">
  76 + <tbody class="ludan_1">
  77 +
  78 + </tbody>
  79 + <tbody class="ludan_2">
  80 +
  81 + </tbody>
  82 + <tbody class="ludan_3">
  83 +
  84 + </tbody>
  85 + <tbody class="ludan_4">
  86 +
  87 + </tbody>
  88 + </table>
  89 + </div>
  90 + </div>
  91 + </div>
  92 + </div>
  93 + </div>
  94 + </div>
  95 +</div>
  96 +
  97 +<script>
  98 + $(function(){
  99 + var fage=false;
  100 + // 关闭左侧栏
  101 + if (!$('body').hasClass('page-sidebar-closed'))
  102 + $('.menu-toggler.sidebar-toggler').click();
  103 +
  104 + $("#date").datetimepicker({
  105 + format : 'YYYY-MM-DD',
  106 + locale : 'zh-cn'
  107 + });
  108 +
  109 + $("#left_height").height($(window).height()-100);
  110 + $("#xcld_height").height($(window).height()-100);
  111 +
  112 + var d = new Date();
  113 + var year = d.getFullYear();
  114 + var month = d.getMonth() + 1;
  115 + var day = d.getDate();
  116 + if(month < 10)
  117 + month = "0" + month;
  118 + if(day < 10)
  119 + day = "0" + day;
  120 + $("#date").val(year + "-" + month + "-" + day);
  121 +
  122 + var obj = [];
  123 + var xlList;
  124 + $.get('/report/lineList',function(result){
  125 + xlList=result;
  126 +
  127 + $.get('/user/companyData', function(result){
  128 + obj = result;
  129 + console.log(obj);
  130 + var options = '';
  131 + for(var i = 0; i < obj.length; i++){
  132 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  133 + }
  134 +
  135 + if(obj.length ==0){
  136 + $("#gsdmDiv_xcld").css('display','none');
  137 + }else if(obj.length ==1){
  138 + $("#gsdmDiv_xcld").css('display','none');
  139 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  140 + $('#fgsdmDiv_xcld').css('display','none');
  141 + }
  142 + $('#gsdmXcld').html(options);
  143 +
  144 + updateCompany();
  145 + });
  146 + });
  147 +
  148 + $("#gsdmXcld").on("change",updateCompany);
  149 + function updateCompany(){
  150 + var company = $('#gsdmXcld').val();
  151 + var options = '';
  152 + for(var i = 0; i < obj.length; i++){
  153 + if(obj[i].companyCode == company){
  154 + var children = obj[i].children;
  155 + for(var j = 0; j < children.length; j++){
  156 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  157 + }
  158 + }
  159 + }
  160 + $('#fgsdmXcld').html(options);
  161 + initXl();
  162 + }
  163 +
  164 +
  165 +
  166 +
  167 + $("#fgsdmXcld").on("change",initXl);
  168 + function initXl(){
  169 + var data=[];
  170 + if(fage){
  171 + $("#line").select2("destroy").html('');
  172 + }
  173 + var fgs=$('#fgsdmXcld').val();
  174 + var gs=$('#gsdmXcld').val();
  175 + for(var i=0;i<xlList.length;i++){
  176 + if(gs!=""){
  177 + if(fgs!=""){
  178 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  179 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  180 + }
  181 + }else{
  182 + if(xlList[i]["gsbm"]==gs){
  183 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  184 + }
  185 + }
  186 + }
  187 + }
  188 + initPinYinSelect2('#line',data,'');
  189 + fage=true;
  190 + }
  191 + var date = '';
  192 + var line = '';
  193 + $("#query").on("click",function(){
  194 + $("#left_height").height($(window).height()-100);
  195 + line = $("#line").val();
  196 + date = $("#date").val();
  197 + $(".hidden").removeClass("hidden");
  198 + $get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
  199 + // 把数据填充到模版中
  200 + var tbodyHtml = template('list_info',{list:result});
  201 + // 把渲染好的模版html文本追加到表格中
  202 + $('#info tbody').html(tbodyHtml);
  203 + });
  204 + });
  205 + var type="desc";
  206 + $(".rypx").on("click",function(){
  207 + line = $("#line").val();
  208 + date = $("#date").val();
  209 + $(".hidden").removeClass("hidden");
  210 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"j_Gh",type:type},function(result){
  211 + if(type=="desc"){
  212 + type ="asc";
  213 + }else{
  214 + type ="desc";
  215 + }
  216 + // 把数据填充到模版中
  217 + var tbodyHtml = template('list_info_px',{list:result});
  218 + // 把渲染好的模版html文本追加到表格中
  219 + $('#info tbody').html(tbodyHtml);
  220 + });
  221 + })
  222 +
  223 + $(".zbhpx").on("click",function(){
  224 + line = $("#line").val();
  225 + date = $("#date").val();
  226 + $(".hidden").removeClass("hidden");
  227 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
  228 + if(type=="desc"){
  229 + type ="asc";
  230 + }else{
  231 + type ="desc";
  232 + }
  233 + // 把数据填充到模版中
  234 + var tbodyHtml = template('list_info_px',{list:result});
  235 + // 把渲染好的模版html文本追加到表格中
  236 + $('#info tbody').html(tbodyHtml);
  237 + });
  238 + })
  239 +
  240 + $(".lppx").on("click",function(){
  241 + line = $("#line").val();
  242 + date = $("#date").val();
  243 + $(".hidden").removeClass("hidden");
  244 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
  245 + if(type=="desc"){
  246 + type ="asc";
  247 + }else{
  248 + type ="desc";
  249 + }
  250 + // 把数据填充到模版中
  251 + var tbodyHtml = template('list_info_px',{list:result});
  252 + // 把渲染好的模版html文本追加到表格中
  253 + $('#info tbody').html(tbodyHtml);
  254 + });
  255 + })
  256 +
  257 + var params = new Array();
  258 + var jName = '';
  259 + var jGh = '';
  260 + $("#info tbody").on("click","tr",function(){
  261 + if($(this).children().size() < 2){
  262 + return;
  263 + }
  264 + $("#xcld_height").height($(window).height()-100);
  265 + $(this).children().each(function(index){
  266 + params[index] = $(this).text();
  267 + });
  268 + jName = params[0].split("\\")[0];
  269 + jGh = params[0].split("\\")[1];
  270 + var id = params[3];
  271 + var obj = $(this);
  272 + $get('/realSchedule/MapById',{id:id},function(result){
  273 + result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
  274 + var ludan_1 = template('ludan_1',result);
  275 + // 把渲染好的模版html文本追加到表格中
  276 + $('#forms .ludan_1').html(ludan_1);
  277 + });
  278 + $get('/realSchedule/queryListWaybill_mh_2',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  279 + getTime(result);
  280 + var ludan_2 = template('ludan_2',{list:result});
  281 + // 把渲染好的模版html文本追加到表格中
  282 + $('#forms .ludan_2').html(ludan_2);
  283 + });
  284 + $get('/realSchedule/findKMBC_mh_2',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  285 + var ludan_3 = template('ludan_3',result);
  286 + $('#forms .ludan_3').html(ludan_3);
  287 + $("#info tbody tr").css('background-color', '');
  288 + obj.css('background-color', '#99CCFF');
  289 + });
  290 +
  291 +
  292 + });
  293 +
  294 + $("#export").on("click",function(){
  295 + if(params.length < 1){
  296 + return;
  297 + }
  298 + $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  299 + window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
  300 + });
  301 + });
  302 +
  303 + $("#print").click(function(){
  304 + $("#printArea").printArea();
  305 + });
  306 +
  307 + $("#exportMore").on("click",function(){
  308 + if($("#info tbody tr td").length <= 1)
  309 + return;
  310 + var param = new Array();
  311 + $("#info tbody tr").each(function(index){
  312 + param[index] = new Array();
  313 + $(this).children().each(function(i){
  314 + if(i<3){
  315 + param[index][i] = $(this).text().split("\\")[0];
  316 + if(i==0){
  317 + param[index][3] = $(this).text().split("\\")[1];
  318 +
  319 + }
  320 + }
  321 + });
  322 + });
  323 + $get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
  324 + window.open("/downloadFile/downloadList?fileName="+result.fileName);
  325 + });
  326 + });
  327 +
  328 + function getTime(list){
  329 + $.each(list, function(i, obj) {
  330 + if(obj.zdsj != null && obj.zdsjActual != null ){
  331 + var zdsjActual = (obj.zdsjActual).split(":");
  332 + var zdsj = (obj.zdsj).split(":");
  333 + if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
  334 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  335 + }
  336 + else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
  337 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  338 + }
  339 + }
  340 + });
  341 + }
  342 + });
  343 +</script>
  344 +<script type="text/html" id="list_info">
  345 + {{each list as obj i}}
  346 + <tr>
  347 + <td width="45%">{{obj[4]}}\{{obj[1]}}</td>
  348 + <td width="32%">{{obj[2]}}</td>
  349 + <td width="20%">{{obj[3]}}</td>
  350 + <td width="3%" hidden="true">{{obj[0]}}</td>
  351 + </tr>
  352 + {{/each}}
  353 + {{if list.length == 0}}
  354 + <tr>
  355 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  356 + </tr>
  357 + {{/if}}
  358 +</script>
  359 +<script type="text/html" id="list_info_px">
  360 + {{each list as obj i}}
  361 + <tr>
  362 +
  363 + <td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
  364 + <td width="32%">{{obj.clZbh}}</td>
  365 + <td width="23%">{{obj.lpName}}</td>
  366 + <td hidden="true">{{obj.id}}</td>
  367 + </tr>
  368 + {{/each}}
  369 + {{if list.length == 0}}
  370 + <tr>
  371 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  372 + </tr>
  373 + {{/if}}
  374 +</script>
  375 +<script type="text/html" id="ludan_1">
  376 + <tr>
  377 + <td colspan="14">行车路单</td>
  378 + </tr>
  379 + <tr>
  380 + <td colspan="14">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}}({{plate}}) 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:{{dbdp}} 日期:{{scheduleDate}}</td>
  381 + </tr>
  382 + <tr>
  383 + <td colspan="2">出场存油 {{ccyl}}升</td>
  384 + <td colspan="2">加注量 {{jzl}}升</td>
  385 + <td colspan="2">进场存油 {{jcyl}}升</td>
  386 + <td colspan="4">加注机油 &nbsp;升</td>
  387 + <td colspan="4">本日耗油 {{yh}}升</td>
  388 + </tr>
  389 + <tr>
  390 + <td rowspan="2">调度章</td>
  391 + <td colspan="1">&nbsp;</td>
  392 + <td rowspan="2">早班</td>
  393 + <td colspan="1">&nbsp;</td>
  394 + <td rowspan="2">夜班</td>
  395 + <td colspan="1">&nbsp;</td>
  396 + <td rowspan="2" colspan="2">交叉</td>
  397 + <td colspan="2">&nbsp;</td>
  398 + <td rowspan="2">其他</td>
  399 + <td colspan="1">&nbsp;</td>
  400 + <td colspan="1">&nbsp;</td>
  401 + <td colspan="1">&nbsp;</td>
  402 + </tr>
  403 + <tr>
  404 + <td colspan="1">&nbsp;</td>
  405 + <td colspan="1">&nbsp;</td>
  406 + <td colspan="1">&nbsp;</td>
  407 + <td colspan="2">&nbsp;</td>
  408 + <td colspan="1">&nbsp;</td>
  409 + <td colspan="1">&nbsp;</td>
  410 + <td colspan="1">&nbsp;</td>
  411 + </tr>
  412 + <tr>
  413 + <td rowspan="2">车次</td>
  414 + <td colspan="2">工号</td>
  415 + <td rowspan="2">公里耗油</td>
  416 + <td colspan="2">起讫站</td>
  417 + <td colspan="4">时间</td>
  418 + <td colspan="2">误点</td>
  419 + <td rowspan="2" width="66px">里程(公里)计划</td>
  420 + <td rowspan="2">备注</td>
  421 + </tr>
  422 + <tr>
  423 + <td colspan="1" width="60px">司&nbsp;机</td>
  424 + <td colspan="1" width="60px">售&nbsp;票</td>
  425 + <td colspan="1">起点</td>
  426 + <td colspan="1">终点</td>
  427 + <td colspan="1">计发</td>
  428 + <td colspan="1">实发</td>
  429 + <td colspan="1">应到</td>
  430 + <td colspan="1">实到</td>
  431 + <td colspan="1">快</td>
  432 + <td colspan="1">慢</td>
  433 + </tr>
  434 +</script>
  435 +<script type="text/html" id="ludan_2">
  436 + {{each list as obj i}}
  437 + <tr>
  438 + <td>{{obj.adjustExps}}</td>
  439 + <td>{{obj.jGh}}{{obj.jName}}</td>
  440 + <td>{{if obj.sGh !=null}}
  441 + {{obj.sGh}}{{obj.sName}}
  442 + {{/if}}
  443 + </td>
  444 + <td>&nbsp;</td>
  445 + <td>{{obj.qdzName}}</td>
  446 + <td>{{obj.zdzName}}</td>
  447 + <td>{{obj.fcsj}}</td>
  448 + <td>{{obj.fcsjActual}}</td>
  449 + <td>{{obj.zdsj}}</td>
  450 + <td>{{obj.zdsjActual}}</td>
  451 + <td>{{obj.fast}}</td>
  452 + <td>{{obj.slow}}</td>
  453 + <td>
  454 + {{if obj.zdsjActual!=null}}
  455 + {{obj.jhlc}}
  456 + {{/if}}
  457 + </td>
  458 + <td >
  459 + {{obj.remarks}}
  460 + </td>
  461 + </tr>
  462 + {{/each}}
  463 + {{if list.length == 0}}
  464 + <tr>
  465 + <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
  466 + </tr>
  467 + {{/if}}
  468 +</script>
  469 +<script type="text/html" id="ludan_3">
  470 + <tr>
  471 + <td colspan="2">计划班次</td>
  472 + <td>{{jhbc}}</td>
  473 + <td colspan="2">计划公里</td>
  474 + <td>{{jhlc}}</td>
  475 + <td colspan="2">烂班班次</td>
  476 + <td>{{cjbc}}</td>
  477 + <td colspan="3"> 烂班公里</td>
  478 + <td colspan="2">{{remMileage}}</td>
  479 + </tr>
  480 + <tr>
  481 + <td colspan="2">临加班次</td>
  482 + <td>{{ljbc}}</td>
  483 + <td colspan="2">临加公里</td>
  484 + <td>{{addMileage}}</td>
  485 + <td colspan="2">实际班次</td>
  486 + <td>{{sjbc}}</td>
  487 + <td colspan="3">营运公里</td>
  488 + <td colspan="2">{{yygl}}</td>
  489 + </tr>
  490 + <tr>
  491 + <td colspan="2">空驶公里</td>
  492 + <td>{{zkslc}}</td>
  493 + <td colspan="2">总公里</td>
  494 + <td>{{realMileage}}</td>
  495 + <td colspan="2"></td>
  496 + <td></td>
  497 + <td colspan="3"></td>
  498 + <td colspan="2"></td>
  499 + </tr>
  500 +</script>
src/main/resources/static/pages/permission/user/changePWD.html
  View file @1fe557a
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
49 $(function(){ 49 $(function(){
50 $("#confirm").on("click",function(){ 50 $("#confirm").on("click",function(){
51 var data = $('#changePWDForm').serializeJSON(); 51 var data = $('#changePWDForm').serializeJSON();
52 - $.post('/user/changePWD',data,function(){  
53 - 52 + $.post('/user/changePWD',data,function(msg){
  53 + layer.alert(msg);
54 }); 54 });
55 }); 55 });
56 }); 56 });