潘钊 / bsth_control · Commits

Commit 5ea684d3cc4012b4e800e03e696debfb3aeedb4e

Authored by zb
2 parents d84eb3f0 1fe557a5
build: skipped

Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git into minhang

Inline Side-by-side
Showing 29 changed files with 1930 additions and 1791 deletions

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

To preserve performance only 29 of 101 files are displayed.

src/main/java/com/bsth/controller/directive/DirectiveController.java
  View file @5ea684d
@@ -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 @5ea684d
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 @5ea684d
@@ -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 @5ea684d
@@ -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/controller/realcontrol/anomalyCheckController.java
  View file @5ea684d
@@ -69,11 +69,21 @@ public class anomalyCheckController { @@ -69,11 +69,21 @@ public class anomalyCheckController {
69 DirectivePushQueue.start(); 69 DirectivePushQueue.start();
70 } 70 }
71 71
  72 + @RequestMapping(value = "/directiveQueueSize")
  73 + public void directiveQueueSize(){
  74 + DirectivePushQueue.size();
  75 + }
  76 +
72 @RequestMapping(value = "/webSocketPushQueue") 77 @RequestMapping(value = "/webSocketPushQueue")
73 public void webSocketPushQueue(){ 78 public void webSocketPushQueue(){
74 WebSocketPushQueue.start(); 79 WebSocketPushQueue.start();
75 } 80 }
76 81
  82 + @RequestMapping(value = "/webSocketQueueSize")
  83 + public void webSocketQueueSize(){
  84 + WebSocketPushQueue.size();
  85 + }
  86 +
77 @RequestMapping(value = "/setHttpFlag") 87 @RequestMapping(value = "/setHttpFlag")
78 public void setHttpFlag(@RequestParam int flag){ 88 public void setHttpFlag(@RequestParam int flag){
79 if(flag != 0 && flag != -1) 89 if(flag != 0 && flag != -1)
src/main/java/com/bsth/controller/report/ReportController.java
  View file @5ea684d
@@ -261,4 +261,17 @@ public class ReportController { @@ -261,4 +261,17 @@ public class ReportController {
261 return service.userList(map); 261 return service.userList(map);
262 } 262 }
263 263
  264 + @RequestMapping(value="/countLineMileage")
  265 + public List<Map<String,Object>> countLineMileage(@RequestParam Map<String, Object> map){
  266 +
  267 + return service.countByList(map);
  268 + }
  269 +
  270 + @RequestMapping(value="/countBusMileage")
  271 + public List<Map<String,Object>> countBusMileage(@RequestParam Map<String, Object> map){
  272 +
  273 + return service.countByBusList(map);
  274 + }
  275 +
  276 +
264 } 277 }
src/main/java/com/bsth/data/directive/DirectiveCreator.java
  View file @5ea684d
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 @5ea684d
@@ -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 @5ea684d
@@ -96,9 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{ @@ -96,9 +96,15 @@ public class InOutStationSignalHandle extends SignalHandle{
96 } 96 }
97 97
98 //从站内到另一个站内 98 //从站内到另一个站内
99 - if(prev.getInstation() > 0 && gps.getInstation() > 0  
100 - && !prev.getStopNo().equals(gps.getStopNo())) 99 + if(prev.getInstation() == 1 && gps.getInstation() == 1
  100 + && !prev.getStopNo().equals(gps.getStopNo())
  101 + && !prev.getStation().getName().equals(gps.getStation().getName()))
101 return true; 102 return true;
  103 +
  104 + //从场内到站内
  105 + if(prev.getInstation() == 2 && gps.getInstation() == 1){
  106 + return true;
  107 + }
102 return false; 108 return false;
103 } 109 }
104 110
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
  View file @5ea684d
@@ -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/msg_queue/DirectivePushQueue.java
  View file @5ea684d
@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext; @@ -10,7 +10,7 @@ import org.springframework.context.ApplicationContext;
10 import org.springframework.context.ApplicationContextAware; 10 import org.springframework.context.ApplicationContextAware;
11 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
12 12
13 -import java.util.LinkedList; 13 +import java.util.concurrent.ConcurrentLinkedQueue;
14 14
15 /** 15 /**
16 * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里） 16 * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
@@ -19,14 +19,14 @@ import java.util.LinkedList; @@ -19,14 +19,14 @@ import java.util.LinkedList;
19 @Component 19 @Component
20 public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware { 20 public class DirectivePushQueue implements CommandLineRunner, ApplicationContextAware {
21 21
22 - static LinkedList<QueueData_Directive> linkedList; 22 + static ConcurrentLinkedQueue<QueueData_Directive> linkedList;
23 static DataPushThread thread; 23 static DataPushThread thread;
24 static DirectiveService directiveService; 24 static DirectiveService directiveService;
25 static long t; 25 static long t;
26 static final int IDLE_TIME = 1000 * 30; 26 static final int IDLE_TIME = 1000 * 30;
27 27
28 static { 28 static {
29 - linkedList = new LinkedList<>(); 29 + linkedList = new ConcurrentLinkedQueue<>();
30 } 30 }
31 31
32 public static void put6002(ScheduleRealInfo sch, int finish, String sender){ 32 public static void put6002(ScheduleRealInfo sch, int finish, String sender){
@@ -71,10 +71,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext @@ -71,10 +71,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
71 if(thread != null){ 71 if(thread != null){
72 thread.interrupt(); 72 thread.interrupt();
73 } 73 }
  74 + linkedList.clear();
74 thread = new DataPushThread(); 75 thread = new DataPushThread();
75 thread.start(); 76 thread.start();
76 } 77 }
77 78
  79 + public static int size(){
  80 + return linkedList.size();
  81 + }
  82 +
78 @Override 83 @Override
79 public void run(String... strings) throws Exception { 84 public void run(String... strings) throws Exception {
80 start(); 85 start();
@@ -96,7 +101,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext @@ -96,7 +101,7 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
96 String code; 101 String code;
97 while (true) { 102 while (true) {
98 try { 103 try {
99 - qd = linkedList.pollFirst(); 104 + qd = linkedList.poll();
100 if (qd != null) { 105 if (qd != null) {
101 sleepFlag = false; 106 sleepFlag = false;
102 code = qd.getCode(); 107 code = qd.getCode();
@@ -124,13 +129,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext @@ -124,13 +129,15 @@ public class DirectivePushQueue implements CommandLineRunner, ApplicationContext
124 t = System.currentTimeMillis(); 129 t = System.currentTimeMillis();
125 } 130 }
126 catch(InterruptedException e){ 131 catch(InterruptedException e){
  132 + log.error("", e);
127 break; 133 break;
128 } 134 }
129 catch (Exception e) { 135 catch (Exception e) {
130 log.error("", e); 136 log.error("", e);
131 } 137 }
132 -  
133 } 138 }
  139 +
  140 + log.warn("DirectivePushQueue is break...");
134 } 141 }
135 } 142 }
136 } 143 }
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
  View file @5ea684d
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
8 import org.springframework.web.socket.TextMessage; 8 import org.springframework.web.socket.TextMessage;
9 import org.springframework.web.socket.WebSocketSession; 9 import org.springframework.web.socket.WebSocketSession;
10 10
11 -import java.util.LinkedList; 11 +import java.util.concurrent.ConcurrentLinkedQueue;
12 12
13 /** 13 /**
14 * 线调web socket 推送队列 14 * 线调web socket 推送队列
@@ -17,14 +17,14 @@ import java.util.LinkedList; @@ -17,14 +17,14 @@ import java.util.LinkedList;
17 @Component 17 @Component
18 public class WebSocketPushQueue implements CommandLineRunner { 18 public class WebSocketPushQueue implements CommandLineRunner {
19 19
20 - static LinkedList<QueueData> linkedList; 20 + static ConcurrentLinkedQueue<QueueData> linkedList;
21 static DataPushThread thread; 21 static DataPushThread thread;
22 static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class); 22 static Logger log = LoggerFactory.getLogger(WebSocketPushQueue.class);
23 static long t; 23 static long t;
24 static final int IDLE_TIME = 1000 * 30; 24 static final int IDLE_TIME = 1000 * 30;
25 25
26 static { 26 static {
27 - linkedList = new LinkedList(); 27 + linkedList = new ConcurrentLinkedQueue();
28 } 28 }
29 29
30 public static boolean isIdle() { 30 public static boolean isIdle() {
@@ -45,10 +45,15 @@ public class WebSocketPushQueue implements CommandLineRunner { @@ -45,10 +45,15 @@ public class WebSocketPushQueue implements CommandLineRunner {
45 if (thread != null) { 45 if (thread != null) {
46 thread.interrupt(); 46 thread.interrupt();
47 } 47 }
  48 + linkedList.clear();
48 thread = new DataPushThread(); 49 thread = new DataPushThread();
49 thread.start(); 50 thread.start();
50 } 51 }
51 52
  53 + public static int size(){
  54 + return linkedList.size();
  55 + }
  56 +
52 @Override 57 @Override
53 public void run(String... strings) throws Exception { 58 public void run(String... strings) throws Exception {
54 start(); 59 start();
@@ -66,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner { @@ -66,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
66 boolean sleepFlag = false; 71 boolean sleepFlag = false;
67 while (true) { 72 while (true) {
68 try { 73 try {
69 - qd = linkedList.pollFirst(); 74 + qd = linkedList.poll();
70 if (qd != null) { 75 if (qd != null) {
71 sleepFlag = false; 76 sleepFlag = false;
72 session = qd.getSession(); 77 session = qd.getSession();
@@ -84,11 +89,14 @@ public class WebSocketPushQueue implements CommandLineRunner { @@ -84,11 +89,14 @@ public class WebSocketPushQueue implements CommandLineRunner {
84 } 89 }
85 t = System.currentTimeMillis(); 90 t = System.currentTimeMillis();
86 } catch (InterruptedException e) { 91 } catch (InterruptedException e) {
  92 + log.error("", e);
87 break; 93 break;
88 } catch (Exception e) { 94 } catch (Exception e) {
89 log.error("", e); 95 log.error("", e);
90 } 96 }
91 } 97 }
  98 +
  99 + log.warn("WebSocketPushQueue is break...");
92 } 100 }
93 } 101 }
94 } 102 }
src/main/java/com/bsth/data/pilot80/PilotReport.java
  View file @5ea684d
@@ -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 @5ea684d
@@ -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;
@@ -579,6 +582,37 @@ public class DayOfSchedule { @@ -579,6 +582,37 @@ public class DayOfSchedule {
579 } 582 }
580 583
581 /** 584 /**
  585 + * 下一个班次
  586 + * @param list 班次集合
  587 + * @param sch 当前班次
  588 + * @return
  589 + */
  590 + private ScheduleRealInfo next2(Collection<ScheduleRealInfo> list , ScheduleRealInfo sch){
  591 + int outConfig = -1;
  592 + LineConfig config = lineConfigData.get(sch.getXlBm());
  593 + if (config != null)
  594 + outConfig = config.getOutConfig();
  595 +
  596 + boolean flag = false;
  597 + ScheduleRealInfo next = null;
  598 + for (ScheduleRealInfo temp : list) {
  599 + if (temp.getId() == sch.getId()) {
  600 + flag = true;
  601 + continue;
  602 + }
  603 + //忽略烂班
  604 + if (temp.isDestroy())
  605 + continue;
  606 +
  607 + if (flag) {
  608 + next = temp;
  609 + break;
  610 + }
  611 + }
  612 + return next;
  613 + }
  614 +
  615 + /**
582 * 上一个班次 616 * 上一个班次
583 * 617 *
584 * @param sch 618 * @param sch
@@ -906,7 +940,22 @@ public class DayOfSchedule { @@ -906,7 +940,22 @@ public class DayOfSchedule {
906 public void reCalcExecPlan(String nbbm){ 940 public void reCalcExecPlan(String nbbm){
907 List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm); 941 List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
908 Collections.sort(list, schFCSJComparator); 942 Collections.sort(list, schFCSJComparator);
909 - 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 + }
910 } 959 }
911 960
912 /** 961 /**
@@ -1016,6 +1065,17 @@ public class DayOfSchedule { @@ -1016,6 +1065,17 @@ public class DayOfSchedule {
1016 return next(list, sch); 1065 return next(list, sch);
1017 } 1066 }
1018 1067
  1068 + /**
  1069 + * 获取该班次所在路牌的下一个班次，不考虑场既是站
  1070 + * @param sch
  1071 + * @return
  1072 + */
  1073 + public ScheduleRealInfo nextByLp2(ScheduleRealInfo sch) {
  1074 + List<ScheduleRealInfo> list = lpScheduleMap.get(sch.getXlBm() + "_" + sch.getLpName());
  1075 + Collections.sort(list, schFCSJComparator);
  1076 + return next2(list, sch);
  1077 + }
  1078 +
1019 public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){ 1079 public ArrayListMultimap<String, ScheduleRealInfo> getLpScheduleMap(){
1020 return lpScheduleMap; 1080 return lpScheduleMap;
1021 } 1081 }
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
  View file @5ea684d
@@ -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 @5ea684d
@@ -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 @5ea684d
  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 @5ea684d
@@ -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 @5ea684d
@@ -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 @5ea684d
  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/gps/entity/HistoryGps_DTOV3.java
  View file @5ea684d
1 -package com.bsth.service.gps.entity;  
2 -  
3 -import com.alibaba.fastjson.JSON;  
4 -import com.alibaba.fastjson.JSONObject;  
5 -import com.bsth.data.forecast.entity.ArrivalEntity;  
6 -import com.fasterxml.jackson.annotation.JsonIgnore;  
7 -import com.vividsolutions.jts.geom.Coordinate;  
8 -import com.vividsolutions.jts.geom.GeometryFactory;  
9 -import com.vividsolutions.jts.geom.Point;  
10 -  
11 -import java.util.List;  
12 -import java.util.Map;  
13 -  
14 -/**  
15 - * 历史GPS DTO  
16 - * Created by panzhao on 2017/4/5.  
17 - */  
18 -public class HistoryGps_DTOV3 {  
19 -  
20 - public static List<HistoryGps_DTOV3> craete(List<Map<String, Object>> mapList) {  
21 - List<HistoryGps_DTOV3> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTOV3.class);  
22 -  
23 - GeometryFactory geometryFactory = new GeometryFactory();  
24 - Point point;  
25 - for (HistoryGps_DTOV3 gps : list) {  
26 - point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));  
27 - gps.setPoint(point);  
28 - }  
29 - return list;  
30 - }  
31 -  
32 -  
33 - private double bd_lon;  
34 - private double bd_lat;  
35 -  
36 - private double lon;  
37 - private double lat;  
38 -  
39 - private String deviceId;  
40 - private long ts;  
41 - private long timestamp;  
42 - private String stopNo;  
43 - private float direction;  
44 -  
45 - private String lineId;  
46 - private float speed;  
47 - private ArrivalEntity inout_stop_info;  
48 - private int inout_stop;  
49 -  
50 - private String nbbm;  
51 - private int state;  
52 - private int upDown;  
53 -  
54 - private String section_code;  
55 - private String section_name;  
56 -  
57 - @JsonIgnore  
58 - private Point point;  
59 -  
60 - @Override  
61 - public int hashCode() {  
62 - return this.toString().hashCode();  
63 - }  
64 -  
65 - @Override  
66 - public boolean equals(Object obj) {  
67 - HistoryGps_DTOV3 g2 = (HistoryGps_DTOV3) obj;  
68 - return this.toString().equals(g2.toString());  
69 - }  
70 -  
71 -  
72 - @Override  
73 - public String toString() {  
74 - return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());  
75 - }  
76 -  
77 - public double getBd_lon() {  
78 - return bd_lon;  
79 - }  
80 -  
81 - public void setBd_lon(double bd_lon) {  
82 - this.bd_lon = bd_lon;  
83 - }  
84 -  
85 - public double getBd_lat() {  
86 - return bd_lat;  
87 - }  
88 -  
89 - public void setBd_lat(double bd_lat) {  
90 - this.bd_lat = bd_lat;  
91 - }  
92 -  
93 - public String getDeviceId() {  
94 - return deviceId;  
95 - }  
96 -  
97 - public void setDeviceId(String deviceId) {  
98 - this.deviceId = deviceId;  
99 - }  
100 -  
101 - public long getTs() {  
102 - return ts;  
103 - }  
104 -  
105 - public void setTs(long ts) {  
106 - this.ts = ts;  
107 - }  
108 -  
109 - public long getTimestamp() {  
110 - return timestamp;  
111 - }  
112 -  
113 - public void setTimestamp(long timestamp) {  
114 - this.timestamp = timestamp;  
115 - }  
116 -  
117 - public String getStopNo() {  
118 - return stopNo;  
119 - }  
120 -  
121 - public void setStopNo(String stopNo) {  
122 - this.stopNo = stopNo;  
123 - }  
124 -  
125 - public float getDirection() {  
126 - return direction;  
127 - }  
128 -  
129 - public void setDirection(float direction) {  
130 - this.direction = direction;  
131 - }  
132 -  
133 - public String getLineId() {  
134 - return lineId;  
135 - }  
136 -  
137 - public void setLineId(String lineId) {  
138 - this.lineId = lineId;  
139 - }  
140 -  
141 - public float getSpeed() {  
142 - return speed;  
143 - }  
144 -  
145 - public void setSpeed(float speed) {  
146 - this.speed = speed;  
147 - }  
148 -  
149 - public ArrivalEntity getInout_stop_info() {  
150 - return inout_stop_info;  
151 - }  
152 -  
153 - public void setInout_stop_info(ArrivalEntity inout_stop_info) {  
154 - this.inout_stop_info = inout_stop_info;  
155 - }  
156 -  
157 - public int getInout_stop() {  
158 - return inout_stop;  
159 - }  
160 -  
161 - public void setInout_stop(int inout_stop) {  
162 - this.inout_stop = inout_stop;  
163 - }  
164 -  
165 - public String getNbbm() {  
166 - return nbbm;  
167 - }  
168 -  
169 - public void setNbbm(String nbbm) {  
170 - this.nbbm = nbbm;  
171 - }  
172 -  
173 - public int getState() {  
174 - return state;  
175 - }  
176 -  
177 - public void setState(int state) {  
178 - this.state = state;  
179 - }  
180 -  
181 - public int getUpDown() {  
182 - return upDown;  
183 - }  
184 -  
185 - public void setUpDown(int upDown) {  
186 - this.upDown = upDown;  
187 - }  
188 -  
189 - public double getLon() {  
190 - return lon;  
191 - }  
192 -  
193 - public void setLon(double lon) {  
194 - this.lon = lon;  
195 - }  
196 -  
197 - public double getLat() {  
198 - return lat;  
199 - }  
200 -  
201 - public void setLat(double lat) {  
202 - this.lat = lat;  
203 - }  
204 -  
205 - public Point getPoint() {  
206 - return point;  
207 - }  
208 -  
209 - public void setPoint(Point point) {  
210 - this.point = point;  
211 - }  
212 -  
213 - public String getSection_code() {  
214 - return section_code;  
215 - }  
216 -  
217 - public void setSection_code(String section_code) {  
218 - this.section_code = section_code;  
219 - }  
220 -  
221 - public String getSection_name() {  
222 - return section_name;  
223 - }  
224 -  
225 - public void setSection_name(String section_name) {  
226 - this.section_name = section_name;  
227 - }  
228 -} 1 +package com.bsth.service.gps.entity;
  2 +
  3 +import com.alibaba.fastjson.JSON;
  4 +import com.alibaba.fastjson.JSONObject;
  5 +import com.bsth.data.forecast.entity.ArrivalEntity;
  6 +import com.fasterxml.jackson.annotation.JsonIgnore;
  7 +import com.vividsolutions.jts.geom.Coordinate;
  8 +import com.vividsolutions.jts.geom.GeometryFactory;
  9 +import com.vividsolutions.jts.geom.Point;
  10 +
  11 +import java.util.List;
  12 +import java.util.Map;
  13 +
  14 +/**
  15 + * 历史GPS DTO
  16 + * Created by panzhao on 2017/4/5.
  17 + */
  18 +public class HistoryGps_DTOV3 {
  19 +
  20 + public static List<HistoryGps_DTOV3> craete(List<Map<String, Object>> mapList) {
  21 + List<HistoryGps_DTOV3> list = JSONObject.parseArray(JSON.toJSONString(mapList), HistoryGps_DTOV3.class);
  22 +
  23 + GeometryFactory geometryFactory = new GeometryFactory();
  24 + Point point;
  25 + for (HistoryGps_DTOV3 gps : list) {
  26 + point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
  27 + gps.setPoint(point);
  28 + }
  29 + return list;
  30 + }
  31 +
  32 +
  33 + private double bd_lon;
  34 + private double bd_lat;
  35 +
  36 + private double lon;
  37 + private double lat;
  38 +
  39 + private String deviceId;
  40 + private long ts;
  41 + private long timestamp;
  42 + private String stopNo;
  43 + private float direction;
  44 +
  45 + private String lineId;
  46 + private float speed;
  47 + private ArrivalEntity inout_stop_info;
  48 + private int inout_stop;
  49 +
  50 + private String nbbm;
  51 + private int state;
  52 + private int upDown;
  53 +
  54 + private String section_code;
  55 + private String section_name;
  56 +
  57 + @JsonIgnore
  58 + private Point point;
  59 +
  60 + @Override
  61 + public int hashCode() {
  62 + return this.toString().hashCode();
  63 + }
  64 +
  65 + @Override
  66 + public boolean equals(Object obj) {
  67 + HistoryGps_DTOV3 g2 = (HistoryGps_DTOV3) obj;
  68 + return this.toString().equals(g2.toString());
  69 + }
  70 +
  71 +
  72 + @Override
  73 + public String toString() {
  74 + return (this.getDeviceId() + "_" + (inout_stop_info==null?this.getStopNo():inout_stop_info.getStopName()) + "_" + this.getTs() + "_" + this.getLon() + "_" + this.getLat());
  75 + }
  76 +
  77 + public double getBd_lon() {
  78 + return bd_lon;
  79 + }
  80 +
  81 + public void setBd_lon(double bd_lon) {
  82 + this.bd_lon = bd_lon;
  83 + }
  84 +
  85 + public double getBd_lat() {
  86 + return bd_lat;
  87 + }
  88 +
  89 + public void setBd_lat(double bd_lat) {
  90 + this.bd_lat = bd_lat;
  91 + }
  92 +
  93 + public String getDeviceId() {
  94 + return deviceId;
  95 + }
  96 +
  97 + public void setDeviceId(String deviceId) {
  98 + this.deviceId = deviceId;
  99 + }
  100 +
  101 + public long getTs() {
  102 + return ts;
  103 + }
  104 +
  105 + public void setTs(long ts) {
  106 + this.ts = ts;
  107 + }
  108 +
  109 + public long getTimestamp() {
  110 + return timestamp;
  111 + }
  112 +
  113 + public void setTimestamp(long timestamp) {
  114 + this.timestamp = timestamp;
  115 + }
  116 +
  117 + public String getStopNo() {
  118 + return stopNo;
  119 + }
  120 +
  121 + public void setStopNo(String stopNo) {
  122 + this.stopNo = stopNo;
  123 + }
  124 +
  125 + public float getDirection() {
  126 + return direction;
  127 + }
  128 +
  129 + public void setDirection(float direction) {
  130 + this.direction = direction;
  131 + }
  132 +
  133 + public String getLineId() {
  134 + return lineId;
  135 + }
  136 +
  137 + public void setLineId(String lineId) {
  138 + this.lineId = lineId;
  139 + }
  140 +
  141 + public float getSpeed() {
  142 + return speed;
  143 + }
  144 +
  145 + public void setSpeed(float speed) {
  146 + this.speed = speed;
  147 + }
  148 +
  149 + public ArrivalEntity getInout_stop_info() {
  150 + return inout_stop_info;
  151 + }
  152 +
  153 + public void setInout_stop_info(ArrivalEntity inout_stop_info) {
  154 + this.inout_stop_info = inout_stop_info;
  155 + }
  156 +
  157 + public int getInout_stop() {
  158 + return inout_stop;
  159 + }
  160 +
  161 + public void setInout_stop(int inout_stop) {
  162 + this.inout_stop = inout_stop;
  163 + }
  164 +
  165 + public String getNbbm() {
  166 + return nbbm;
  167 + }
  168 +
  169 + public void setNbbm(String nbbm) {
  170 + this.nbbm = nbbm;
  171 + }
  172 +
  173 + public int getState() {
  174 + return state;
  175 + }
  176 +
  177 + public void setState(int state) {
  178 + this.state = state;
  179 + }
  180 +
  181 + public int getUpDown() {
  182 + return upDown;
  183 + }
  184 +
  185 + public void setUpDown(int upDown) {
  186 + this.upDown = upDown;
  187 + }
  188 +
  189 + public double getLon() {
  190 + return lon;
  191 + }
  192 +
  193 + public void setLon(double lon) {
  194 + this.lon = lon;
  195 + }
  196 +
  197 + public double getLat() {
  198 + return lat;
  199 + }
  200 +
  201 + public void setLat(double lat) {
  202 + this.lat = lat;
  203 + }
  204 +
  205 + public Point getPoint() {
  206 + return point;
  207 + }
  208 +
  209 + public void setPoint(Point point) {
  210 + this.point = point;
  211 + }
  212 +
  213 + public String getSection_code() {
  214 + return section_code;
  215 + }
  216 +
  217 + public void setSection_code(String section_code) {
  218 + this.section_code = section_code;
  219 + }
  220 +
  221 + public String getSection_name() {
  222 + return section_name;
  223 + }
  224 +
  225 + public void setSection_name(String section_name) {
  226 + this.section_name = section_name;
  227 + }
  228 +}
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @5ea684d
@@ -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 @5ea684d
@@ -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 @5ea684d
@@ -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 @5ea684d
@@ -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 @5ea684d
@@ -235,7 +235,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -235,7 +235,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
235 ts.add(schedule); 235 ts.add(schedule);
236 //调整终点时间和下一个班次的应到时间 236 //调整终点时间和下一个班次的应到时间
237 schedule.calcEndTime(); 237 schedule.calcEndTime();
238 - ScheduleRealInfo nextSch = dayOfSchedule.nextByLp(schedule); 238 + ScheduleRealInfo nextSch = dayOfSchedule.nextByLp2(schedule);
239 if (null != nextSch) { 239 if (null != nextSch) {
240 nextSch.setQdzArrDatejh(schedule.getZdsj()); 240 nextSch.setQdzArrDatejh(schedule.getZdsj());
241 ts.add(nextSch); 241 ts.add(nextSch);
@@ -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
@@ -1378,7 +1305,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1378,7 +1305,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1378 fLog.log("调整实达时间", sch.getZdsjActual(), zdsjActual); 1305 fLog.log("调整实达时间", sch.getZdsjActual(), zdsjActual);
1379 sch.setZdsjActualAll(zdsjActual); 1306 sch.setZdsjActualAll(zdsjActual);
1380 //路牌下一班起点到达时间 1307 //路牌下一班起点到达时间
1381 - ScheduleRealInfo next = dayOfSchedule.nextByLp(sch); 1308 + ScheduleRealInfo next = dayOfSchedule.nextByLp2(sch);
1382 if (null != next) { 1309 if (null != next) {
1383 next.setQdzArrDatesj(zdsjActual); 1310 next.setQdzArrDatesj(zdsjActual);
1384 next.setLate2(false); 1311 next.setLate2(false);
@@ -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,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3094,15 +2516,6 @@ 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())){  
3102 -  
3103 - }  
3104 - }  
3105 - }*/  
3106 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>(); 2519 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3107 String lpName = "lpName"; 2520 String lpName = "lpName";
3108 String zdsj = ""; 2521 String zdsj = "";
@@ -3189,16 +2602,103 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3189,16 +2602,103 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3189 } 2602 }
3190 2603
3191 @Override 2604 @Override
3192 - public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {  
3193 - /*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);  
3194 - List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);  
3195 - for(ScheduleRealInfo info:listInfo){  
3196 - for(ScheduleRealInfo total:listTotal){  
3197 - if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){ 2605 + public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
  2606 + List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
  2607 + String lpName = "lpName";
  2608 + String zdsj = "";
  2609 + String zdsjActual = "";
  2610 + String zdsj1 = "";
  2611 + String zdsjActual1 = "";
  2612 + List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
3198 2613
3199 - }  
3200 - }  
3201 - }*/ 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 +
  2624 + for (int i = 0; i < listInfo.size(); i++) {
  2625 + ScheduleRealInfo t = listInfo.get(i);
  2626 + if (!lpName.equals(t.getLpName())) {
  2627 + zdsjActual = t.getZdsjActual();
  2628 + zdsj = t.getZdsj();
  2629 + t.setZdsjActual("");
  2630 + t.setZdsj("");
  2631 + } else {
  2632 + zdsj1 = t.getZdsj();
  2633 + zdsjActual1 = t.getZdsjActual();
  2634 + t.setZdsjActual(zdsjActual);
  2635 + t.setZdsj(zdsj);
  2636 + zdsj = zdsj1;
  2637 + zdsjActual = zdsjActual1;
  2638 + }
  2639 + lpName = t.getLpName();
  2640 + list.add(t);
  2641 + }
  2642 +
  2643 + List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
  2644 + List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
  2645 + List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
  2646 + List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
  2647 + List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
  2648 + if (listInfo2.size() > 0) {
  2649 + int a = listInfo2.size() % 3;
  2650 + int b = listInfo2.size() / 3;
  2651 + int x = 0, y = 0;
  2652 + if (a == 2) {
  2653 + x = b + 1;
  2654 + y = x * 2;
  2655 + } else if (b == 1) {
  2656 + x = b + 1;
  2657 + y = x * 2 - 1;
  2658 + } else {
  2659 + x = b;
  2660 + y = 2 * x;
  2661 +
  2662 + }
  2663 + for (int i = 0; i < listInfo2.size(); i++) {
  2664 + ScheduleRealInfo s = listInfo2.get(i);
  2665 + if (i + 1 <= x) {
  2666 + xList.add(s);
  2667 + } else if ((i + 1) > x && (i + 1) <= y) {
  2668 + yList.add(s);
  2669 + } else {
  2670 + zList.add(s);
  2671 + }
  2672 + }
  2673 + for (int i = 0; i < x; i++) {
  2674 + newList.add(xList.get(i));
  2675 + if (yList.size() > i) {
  2676 + newList.add(yList.get(i));
  2677 + } else {
  2678 + newList.add(new ScheduleRealInfo());
  2679 + }
  2680 + if (zList.size() > i) {
  2681 + newList.add(zList.get(i));
  2682 + } else {
  2683 + newList.add(new ScheduleRealInfo());
  2684 + }
  2685 +
  2686 + }
  2687 + }
  2688 + for (int i = 0; i < newList.size(); i++) {
  2689 + ScheduleRealInfo t1 = newList.get(i);
  2690 + for (int j = 0; j < list.size(); j++) {
  2691 + ScheduleRealInfo t2 = list.get(j);
  2692 + if (t1.getId() == t2.getId()) {
  2693 + t1 = t2;
  2694 + }
  2695 + }
  2696 + }
  2697 + return newList;
  2698 + }
  2699 +
  2700 + @Override
  2701 + public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {
3202 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>(); 2702 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3203 String lpName = "lpName"; 2703 String lpName = "lpName";
3204 String zdsj = ""; 2704 String zdsj = "";
@@ -3221,18 +2721,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3221,18 +2721,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3221 zdsj = zdsj1; 2721 zdsj = zdsj1;
3222 zdsjActual = zdsjActual1; 2722 zdsjActual = zdsjActual1;
3223 } 2723 }
3224 - /*if(i<listInfo.size()-1){  
3225 - if(s.getLpName().equals(listInfo.get(i+1).getLpName())){  
3226 - zdsj=s.getZdsj();  
3227 - zdsjActual=s.getZdsjActual();  
3228 - }else{  
3229 - zdsj="";  
3230 - zdsjActual="";  
3231 - }  
3232 - }else{  
3233 - zdsj=s.getZdsj();  
3234 - zdsjActual=s.getZdsjActual();  
3235 - }*/  
3236 2724
3237 lpName = t.getLpName(); 2725 lpName = t.getLpName();
3238 list.add(t); 2726 list.add(t);
@@ -3241,12 +2729,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3241,12 +2729,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3241 } 2729 }
3242 2730
3243 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) {
3244 -// Arith arith=new Arith();  
3245 - //前一天日期  
3246 -// String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));  
3247 -// String date = "2016-09-20";  
3248 -// System.out.println("shijian1:"+new Date());  
3249 -  
3250 List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>(); 2732 List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>();
3251 if(line.equals("")){ 2733 if(line.equals("")){
3252 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm); 2734 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
@@ -3279,67 +2761,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3279,67 +2761,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3279 fage = false; 2761 fage = false;
3280 } 2762 }
3281 listS.add(scheduleRealInfo); 2763 listS.add(scheduleRealInfo);
3282 -  
3283 - /* if (scheduleRealInfo != null) {  
3284 - //计划里程（主任务过滤掉临加班次），  
3285 - //烂班里程（主任务烂班），  
3286 - //临加里程（主任务临加），  
3287 - //计划班次，烂班班次，增加班次  
3288 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
3289 - if (scheduleRealInfo.isSflj()) {  
3290 - if(scheduleRealInfo.getStatus() == -1){  
3291 - addMileage =Arith.add(addMileage, tempJhlc);  
3292 - }  
3293 - } else {  
3294 - if (!(scheduleRealInfo.getBcType().equals("in")  
3295 - || scheduleRealInfo.getBcType().equals("out"))) {  
3296 - jhlc =Arith.add(jhlc,tempJhlc);  
3297 - }  
3298 -  
3299 - if (scheduleRealInfo.getStatus() == -1) {  
3300 - remMileage =Arith.add(remMileage,tempJhlc);  
3301 - }  
3302 - }  
3303 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
3304 - //计算营运里程，空驶里程  
3305 - if (childTaskPlans.isEmpty()) {  
3306 - if (scheduleRealInfo.getBcType().equals("in") ||  
3307 - scheduleRealInfo.getBcType().equals("out")) {  
3308 - if (scheduleRealInfo.getStatus() != -1) {  
3309 - jcclc=Arith.add(jcclc,tempJhlc);  
3310 - }  
3311 - }  
3312 - //主任务 放空班次属于营运  
3313 - // else if(scheduleRealInfo.getBcType().equals("venting")){  
3314 - // ksgl += tempJhlc;  
3315 - // }  
3316 - else {  
3317 - if (scheduleRealInfo.getStatus() != -1) {  
3318 - yygl=Arith.add(yygl,tempJhlc);  
3319 - }  
3320 - }  
3321 - } else {  
3322 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
3323 - while (it.hasNext()) {  
3324 - ChildTaskPlan childTaskPlan = it.next();  
3325 - if (childTaskPlan.getMileageType().equals("empty")) {  
3326 - if (childTaskPlan.isDestroy()) {  
3327 - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3328 - } else {  
3329 - ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3330 - }  
3331 - } else {  
3332 - if (childTaskPlan.isDestroy()) {  
3333 - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3334 -  
3335 - } else {  
3336 - yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());  
3337 -  
3338 - }  
3339 - }  
3340 - }  
3341 - }  
3342 - }*/  
3343 } 2764 }
3344 } 2765 }
3345 2766
@@ -3802,10 +3223,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3802,10 +3223,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3802 ) { 3223 ) {
3803 jcclc += tempJhlc; 3224 jcclc += tempJhlc;
3804 } 3225 }
3805 - //主任务 放空班次属于营运  
3806 -// else if(scheduleRealInfo.getBcType().equals("venting")){  
3807 -// ksgl += tempJhlc;  
3808 -// }  
3809 else { 3226 else {
3810 if (scheduleRealInfo.getStatus() != -1) { 3227 if (scheduleRealInfo.getStatus() != -1) {
3811 if (scheduleRealInfo.isSflj()) { 3228 if (scheduleRealInfo.isSflj()) {
@@ -3973,86 +3390,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3973,86 +3390,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3973 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;
3974 double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0; 3391 double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
3975 Map<String, Object> map = new HashMap<String, Object>(); 3392 Map<String, Object> map = new HashMap<String, Object>();
3976 - /* for (ScheduleRealInfo scheduleRealInfo : list) {  
3977 - if (scheduleRealInfo != null) {  
3978 - //计划里程（主任务过滤掉临加班次），  
3979 - //烂班里程（主任务烂班），  
3980 - //临加里程（主任务临加），  
3981 - //计划班次，烂班班次，增加班次  
3982 - double jh = 0, sj = 0;  
3983 - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();  
3984 - if (scheduleRealInfo.isSflj()) {  
3985 - if(!(scheduleRealInfo.getBcType().equals("in")  
3986 - || scheduleRealInfo.getBcType().equals("out"))){  
3987 - ljbc++;  
3988 - }  
3989 - } else {  
3990 - if (!(scheduleRealInfo.getBcType().equals("in")  
3991 - || scheduleRealInfo.getBcType().equals("out"))) {  
3992 - jhbc++;  
3993 - jh += tempJhlc;  
3994 - }  
3995 -  
3996 - if (scheduleRealInfo.getStatus() == -1) {  
3997 - remMileage += tempJhlc;  
3998 - cjbc++;  
3999 - }  
4000 - }  
4001 - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();  
4002 - //计算营运里程，空驶里程  
4003 - if (childTaskPlans.isEmpty()) {  
4004 - if (scheduleRealInfo.getBcType().equals("in") ||  
4005 - scheduleRealInfo.getBcType().equals("out")) {  
4006 - if(scheduleRealInfo.getStatus() != -1){  
4007 - if(scheduleRealInfo.isSflj()){  
4008 - ljjcclc += tempJhlc;  
4009 - }else{  
4010 - jcclc += tempJhlc;  
4011 - }  
4012 - }  
4013 - }else {  
4014 - if (scheduleRealInfo.getStatus() != -1) {  
4015 - if (scheduleRealInfo.isSflj()) {  
4016 - addMileage += tempJhlc;  
4017 - }  
4018 - sj += tempJhlc;  
4019 - }  
4020 - }  
4021 - } else {  
4022 - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();  
4023 - while (it.hasNext()) {  
4024 - ChildTaskPlan childTaskPlan = it.next();  
4025 - if (childTaskPlan.getMileageType().equals("empty")) {  
4026 - if (childTaskPlan.isDestroy()) {  
4027 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4028 - } else {  
4029 - if (scheduleRealInfo.isSflj()) {  
4030 - addMileage += tempJhlc;  
4031 - }  
4032 - ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4033 - }  
4034 - } else {  
4035 - if (childTaskPlan.isDestroy()) {  
4036 - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4037 -// cjbc++;  
4038 - } else {  
4039 - if (scheduleRealInfo.isSflj()) {  
4040 - addMileage += tempJhlc;  
4041 - }  
4042 - sj += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();  
4043 - }  
4044 - }  
4045 - }  
4046 - }  
4047 - jhlc += jh;  
4048 - yygl += sj;  
4049 - if (jh > sj) {  
4050 - remgl += jh - sj;  
4051 - } else if (sj > jh) {  
4052 - addgl += sj - jh;  
4053 - }  
4054 - }  
4055 - }*/  
4056 jhlc=culateMieageService.culateJhgl(lists); 3393 jhlc=culateMieageService.culateJhgl(lists);
4057 jcclc=culateMieageService.culateJccgl(lists); 3394 jcclc=culateMieageService.culateJccgl(lists);
4058 jhjcclc=culateMieageService.culateJhJccgl(lists); 3395 jhjcclc=culateMieageService.culateJhJccgl(lists);
src/main/java/com/bsth/service/report/CulateMileageService.java
  View file @5ea684d
@@ -30,5 +30,23 @@ public interface CulateMileageService { @@ -30,5 +30,23 @@ public interface CulateMileageService {
30 30
31 int culateFzbc(List<ScheduleRealInfo> lists,String item); 31 int culateFzbc(List<ScheduleRealInfo> lists,String item);
32 32
  33 +
  34 +
  35 + //以下计算方法供新报表使用
  36 + Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
  37 +
  38 + Map<String, Double> culateSjJcclcMap(List<ScheduleRealInfo> lists);//计划内进出场and计划外进出场
  39 +
  40 + Map<String, Double> culateLjMile(List<ScheduleRealInfo> lists);//临加营运and临加进出场空驶
  41 +
  42 + double culateSsMile(List<ScheduleRealInfo> lists); //烂班少驶
  43 +
  44 + double culateSsMileXx(List<ScheduleRealInfo> lists,String item);//烂班少驶详细
  45 +
  46 + double culateZrwJccLc(List<ScheduleRealInfo> lists,String item);//子任务进出场
  47 +
  48 + double culateKfksLc(List<ScheduleRealInfo> lists);
  49 +
  50 +
33 } 51 }
34 52
src/main/java/com/bsth/service/report/ReportService.java
  View file @5ea684d
@@ -42,4 +42,8 @@ public interface ReportService { @@ -42,4 +42,8 @@ public interface ReportService {
42 List<Map<String, String>> carList(Map<String, Object> map); 42 List<Map<String, String>> carList(Map<String, Object> map);
43 43
44 List<Map<String, String>> userList(Map<String, Object> map); 44 List<Map<String, String>> userList(Map<String, Object> map);
  45 +
  46 + List<Map<String, Object>> countByList(Map<String, Object> map);
  47 +
  48 + List<Map<String, Object>> countByBusList(Map<String, Object> map);
45 } 49 }
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @5ea684d
@@ -16,6 +16,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo; @@ -16,6 +16,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
16 import com.bsth.service.report.CulateMileageService; 16 import com.bsth.service.report.CulateMileageService;
17 import com.bsth.util.Arith; 17 import com.bsth.util.Arith;
18 import com.bsth.util.ComparableJob; 18 import com.bsth.util.ComparableJob;
  19 +import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
19 20
20 @Service 21 @Service
21 public class CulateMileageServiceImpl implements CulateMileageService{ 22 public class CulateMileageServiceImpl implements CulateMileageService{
@@ -135,9 +136,11 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -135,9 +136,11 @@ public class CulateMileageServiceImpl implements CulateMileageService{
135 Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); 136 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
136 while (it.hasNext()) { 137 while (it.hasNext()) {
137 ChildTaskPlan childTaskPlan = it.next(); 138 ChildTaskPlan childTaskPlan = it.next();
138 - if (childTaskPlan.isDestroy()) {  
139 - zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());  
140 - } 139 + if(childTaskPlan.getMileageType().equals("service")){
  140 + if (childTaskPlan.isDestroy()) {
  141 + zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  142 + }
  143 + }
141 } 144 }
142 } 145 }
143 } 146 }
@@ -625,5 +628,279 @@ public class CulateMileageServiceImpl implements CulateMileageService{ @@ -625,5 +628,279 @@ public class CulateMileageServiceImpl implements CulateMileageService{
625 } 628 }
626 return fzbc; 629 return fzbc;
627 } 630 }
  631 +
  632 +
  633 + //
  634 + //
  635 + //新报表公里计算方法开始
  636 + //
  637 + //
  638 +
  639 + //计划内营运and计划外营运
  640 + @Override
  641 + public Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists) {
  642 + // TODO Auto-generated method stub
  643 + double jhnlc=0.0;
  644 + double jhwlc=0.0;
  645 + for (int i = 0; i < lists.size(); i++) {
  646 + ScheduleRealInfo t=lists.get(i);
  647 + if(!isInOut(t)){
  648 + if(!t.isSflj()){
  649 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  650 + if(childTaskPlans.isEmpty()){
  651 + if(!t.isDestroy()){
  652 + if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
  653 + jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
  654 + }else{
  655 + jhnlc =Arith.add(jhnlc, t.getJhlc());
  656 + }
  657 + }
  658 + }else{
  659 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  660 + double zrwlc=0.0;
  661 + boolean fage=false;
  662 + while (it.hasNext()) {
  663 + ChildTaskPlan childTaskPlan = it.next();
  664 + if(childTaskPlan.getMileageType().equals("service")){
  665 + if (childTaskPlan.isDestroy()) {
  666 + fage=true;
  667 + }else{
  668 + zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
  669 + }
  670 + }
  671 + }
  672 + if(fage){
  673 + jhwlc =Arith.add(jhwlc, zrwlc);
  674 + }else{
  675 + jhnlc =Arith.add(jhnlc, zrwlc);
  676 + }
  677 + }
  678 + }
  679 + }
  680 + }
  681 +
  682 + Map<String, Double> map=new HashMap<String, Double>();
  683 + map.put("jhnlc", jhnlc);
  684 + map.put("jhwlc", jhwlc);
  685 + return map;
  686 + }
  687 +
  688 + //计划内进出场and计划外进出场
  689 + @Override
  690 + public Map<String, Double> culateSjJcclcMap(List<ScheduleRealInfo> lists) {
  691 + // TODO Auto-generated method stub
  692 + double jhwlc=0.0;
  693 + double jhnlc=0.0;
  694 + for (int i = 0; i < lists.size(); i++) {
  695 + ScheduleRealInfo t=lists.get(i);
  696 + if(t.getBcType().equals("in") || t.getBcType().equals("out")){
  697 + if(!t.isSflj()){
  698 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  699 + if(childTaskPlans.isEmpty()){
  700 + if(!t.isDestroy()){
  701 + if( Math.abs(t.getJhlc()-t.getJhlcOrig())>0){
  702 + jhwlc =Arith.add(jhwlc, t.getJhlcOrig());
  703 + }else{
  704 + jhnlc =Arith.add(jhnlc, t.getJhlc());
  705 + }
  706 + }
  707 + }else{
  708 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  709 + double zrwlc=0.0;
  710 + boolean fage=false;
  711 + while (it.hasNext()) {
  712 + ChildTaskPlan childTaskPlan = it.next();
  713 + if(childTaskPlan.getMileageType().equals("empty")){
  714 + if (childTaskPlan.isDestroy()) {
  715 + fage=true;
  716 + }else{
  717 + zrwlc =Arith.add(zrwlc, childTaskPlan.getMileage());
  718 + }
  719 + }
  720 + }
  721 + if(fage){
  722 + jhwlc =Arith.add(jhwlc, zrwlc);
  723 + }else{
  724 + jhnlc =Arith.add(jhnlc, zrwlc);
  725 + }
  726 + }
  727 + }
  728 + }
  729 + }
  730 + Map<String, Double> map=new HashMap<String, Double>();
  731 + map.put("jhnlc", jhnlc);
  732 + map.put("jhwlc", jhwlc);
  733 + return map;
  734 + }
  735 +
  736 + @Override
  737 + public Map<String, Double> culateLjMile(List<ScheduleRealInfo> lists) {
  738 + // TODO Auto-generated method stub
  739 + double ljjcc=0.0;
  740 + double ljyy=0.0;
  741 + for (int i = 0; i < lists.size(); i++) {
  742 + ScheduleRealInfo t=lists.get(i);
  743 + if(t.isSflj()){
  744 + if(t.getBcType().equals("in") || t.getBcType().equals("out")){
  745 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  746 + if(childTaskPlans.isEmpty()){
  747 + if(!t.isDestroy()){
  748 + ljjcc =Arith.add(ljjcc, t.getJhlc());
  749 + }
  750 +
  751 + }
  752 + /*else{
  753 + //临加进出场子任务 待统计
  754 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  755 + double zrwlc=0.0;
  756 + boolean fage=false;
  757 + while (it.hasNext()) {
  758 + ChildTaskPlan childTaskPlan = it.next();
  759 + }
  760 + }*/
  761 + }
  762 +
  763 + if(!isInOut(t)){
  764 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  765 + if(childTaskPlans.isEmpty()){
  766 + if(!t.isDestroy()){
  767 + ljyy =Arith.add(ljyy, t.getJhlc());
  768 + }
  769 + }else{
  770 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  771 + while (it.hasNext()) {
  772 + ChildTaskPlan childTaskPlan = it.next();
  773 + if(!childTaskPlan.isDestroy()){
  774 + if(childTaskPlan.getMileageType().equals("service")){
  775 + ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
  776 + }
  777 + }
  778 + }
  779 + }
  780 + }
  781 + }
  782 + }
  783 +
  784 + Map<String, Double> map=new HashMap<String,Double>();
  785 + map.put("ljjcc", ljjcc);
  786 + map.put("ljyy", ljyy);
  787 + return map;
  788 + }
  789 +
  790 + @Override
  791 + public double culateSsMile(List<ScheduleRealInfo> lists) {
  792 + double zlblc =0.0;
  793 + for (int i = 0; i < lists.size(); i++) {
  794 + ScheduleRealInfo scheduleRealInfo=lists.get(i);
  795 + if (!isInOut(scheduleRealInfo)) {
  796 + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
  797 + if(childTaskPlans.isEmpty()){
  798 + if(scheduleRealInfo.isDestroy()){
  799 + zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
  800 + }
  801 + }else{
  802 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  803 + while (it.hasNext()) {
  804 + ChildTaskPlan childTaskPlan = it.next();
  805 + if(childTaskPlan.getMileageType().equals("service")){
  806 + if (childTaskPlan.isDestroy()) {
  807 + zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  808 + }
  809 + }
  810 + }
  811 + }
  812 + }
  813 + }
  814 + return zlblc;
  815 + }
628 816
  817 + @Override
  818 + public double culateSsMileXx(List<ScheduleRealInfo> lists, String item) {
  819 + // TODO Auto-generated method stub
  820 + double sum = 0;
  821 + Set<ChildTaskPlan> cts;
  822 + for(ScheduleRealInfo sch : lists){
  823 + if (sch.isSflj())
  824 + continue;
  825 + cts = sch.getcTasks();
  826 + //有子任务
  827 + if (cts != null && cts.size() > 0) {
  828 + for(ChildTaskPlan c : cts){
  829 + if(item.equals("其他")){
  830 + if(c.isDestroy() &&
  831 + ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
  832 + (c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
  833 + sum = Arith.add(sum, c.getMileage());
  834 + }else{
  835 + if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
  836 + sum = Arith.add(sum, c.getMileage());
  837 + }
  838 +
  839 + }
  840 + }
  841 + else if(isInOut(sch))
  842 + continue;
  843 + //主任务烂班
  844 + else if(sch.getStatus() == -1){
  845 + if(sch.getAdjustExps().equals(item) ||
  846 + (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
  847 + sum = Arith.add(sum, sch.getJhlcOrig());
  848 + }
  849 + }
  850 +
  851 + }
  852 + return sum;
  853 + }
  854 +
  855 + @Override
  856 + public double culateZrwJccLc(List<ScheduleRealInfo> lists, String item) {
  857 + // TODO Auto-generated method stub
  858 + double zrwjcclc=0.0;
  859 + for (int i = 0; i < lists.size(); i++) {
  860 + ScheduleRealInfo t=lists.get(i);
  861 + if(!isInOut(t)){
  862 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  863 + if(!childTaskPlans.isEmpty()){
  864 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  865 + while (it.hasNext()) {
  866 + ChildTaskPlan childTaskPlan = it.next();
  867 + if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
  868 + if (childTaskPlan.isDestroy()) {
  869 + zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  870 + }
  871 + }
  872 + }
  873 + }
  874 + }
  875 + }
  876 + return zrwjcclc;
  877 + }
  878 +
  879 + @Override
  880 + public double culateKfksLc(List<ScheduleRealInfo> lists) {
  881 + // TODO Auto-generated method stub
  882 + double kfks=0.0;
  883 + for (int i = 0; i < lists.size(); i++) {
  884 + ScheduleRealInfo t=lists.get(i);
  885 + if(t.getBcType().equals("ldks")){
  886 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  887 + if(childTaskPlans.isEmpty()){
  888 + if(!t.isDestroy()){
  889 + kfks=Arith.add(kfks,t.getJhlcOrig()==null?0:t.getJhlcOrig());
  890 + }
  891 + }else{
  892 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  893 + while (it.hasNext()) {
  894 + ChildTaskPlan childTaskPlan = it.next();
  895 + if (!childTaskPlan.isDestroy()) {
  896 + kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  897 + }
  898 + }
  899 + }
  900 + }
  901 + }
  902 + return kfks;
  903 + }
  904 +
  905 +
629 } 906 }