潘钊 / bsth_control · Commits

Commit b5a2c43341ed8881444f63a2bececa41f9cf081d

Authored by zq
1 parent 878dd614
build: skipped

运管处bug修改

Inline Side-by-side
Showing 2 changed files with 34 additions and 40 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
  View file @b5a2c43
1 1 package com.bsth.repository.realcontrol;
2 2  
3   -import java.util.List;
4   -import java.util.Map;
5   -
6   -import javax.transaction.Transactional;
7   -
  3 +import com.bsth.entity.realcontrol.ScheduleRealInfo;
  4 +import com.bsth.repository.BaseRepository;
8 5 import org.springframework.data.jpa.repository.EntityGraph;
9 6 import org.springframework.data.jpa.repository.Modifying;
10 7 import org.springframework.data.jpa.repository.Query;
11 8 import org.springframework.stereotype.Repository;
12 9  
13   -import com.bsth.entity.realcontrol.ScheduleRealInfo;
14   -import com.bsth.repository.BaseRepository;
  10 +import javax.transaction.Transactional;
  11 +import java.util.List;
  12 +import java.util.Map;
15 13  
16 14 @Repository
17 15 public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealInfo, Long>{
... ... @@ -113,13 +111,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
113 111 @Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
114 112 List<ScheduleRealInfo> setLD(String date);
115 113  
116   - @Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
117   - List<ScheduleRealInfo> setLDGroup(String date);
  114 + @Query(value="select new map(xlBm as xlBm,lpName as lpName,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
  115 + List<Map<String,Object>> setLDGroup(String date);
118 116  
119   - @Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
120   - List<ScheduleRealInfo> setLCYHGroup(String date);
  117 + @Query(value="select new map(xlBm as xlBm,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
  118 + List<Map<String,Object>> setLCYHGroup(String date);
121 119  
122   - @Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
123   - List<ScheduleRealInfo> setDDRBGroup(String date);
  120 + @Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
  121 + List<Map<String,Object>> setDDRBGroup(String date);
124 122  
125 123 }
... ...
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @b5a2c43
... ... @@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
24 24 import org.springframework.beans.factory.annotation.Autowired;
25 25 import org.springframework.data.domain.Sort;
26 26 import org.springframework.data.domain.Sort.Direction;
27   -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
28 27 import org.springframework.stereotype.Service;
29 28  
30 29 import java.io.BufferedOutputStream;
... ... @@ -104,9 +103,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
104 103 @Autowired
105 104 private ScheduleRealInfoRepository scheduleRealInfoRepository;
106 105  
107   - @Autowired
108   - NamedParameterJdbcTemplate jdbcTemplate;
109   -
110 106  
111 107 // 运管处接口
112 108 private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
... ... @@ -308,31 +304,31 @@ public class TrafficManageServiceImpl implements TrafficManageService{
308 304 try {
309 305 sf.append("<DLDS>");
310 306 List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
311   - List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLDGroup(date);
  307 + List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
312 308 Map<String,Object> map = new HashMap<String,Object>();
313   - for(ScheduleRealInfo schRealInfo:listGroup){
  309 + for(Map<String,Object> schRealInfo:listGroup){
314 310 if(schRealInfo != null){
315 311 //根据车辆自编号查询车牌号
316   - map.put("insideCode_eq", schRealInfo.getClZbh());
  312 + map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
317 313 Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
318 314 // 获取线路是否使用标识，如果未使用，则不查该线路数据
319   - line = lineRepository.findByLineCode(schRealInfo.getXlBm());
  315 + line = lineRepository.findByLineCode(schRealInfo.get("xlBm")+"");
320 316 if(line.getInUse() == null || line.getInUse() == 0){
321 317 continue;
322 318 }
323 319 sf.append("<DLD>");
324   - sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
325   - sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
326   - sf.append("<LPBH>"+schRealInfo.getLpName()+"</LPBH>");
  320 + sf.append("<RQ>"+date+"</RQ>");
  321 + sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm")+"")+"</XLBM>");
  322 + sf.append("<LPBH>"+schRealInfo.get("lpName")+"</LPBH>");
327 323 sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
328   - sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
  324 + sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
329 325 sf.append("<LDList>");
330 326  
331 327 int seqNumber = 0;
332 328 for(ScheduleRealInfo scheduleRealInfo:list){
333   - if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getLpName()
  329 + if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
334 330 .equals(scheduleRealInfo.getLpName())
335   - && schRealInfo.getClZbh().equals(scheduleRealInfo.getClZbh())){
  331 + && (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
336 332 if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
337 333 || scheduleRealInfo.getBcType().equals("out")){
338 334 continue;
... ... @@ -390,22 +386,22 @@ public class TrafficManageServiceImpl implements TrafficManageService{
390 386 StringBuffer sf = new StringBuffer();
391 387 try {
392 388 sf.append("<LCYHS>");
393   - List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
  389 + List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
394 390 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
395 391 Map<String,Object> map = new HashMap<String,Object>();
396   - for(ScheduleRealInfo schRealInfo:listGroup){
  392 + for(Map<String,Object> schRealInfo:listGroup){
397 393 if(schRealInfo != null){
398 394 //计算总公里和空驶公里，营运公里=总公里-空驶公里
399 395 double totalKilometers = 0,emptyKilometers =0;
400 396 sf.append("<LCYH>");
401   - map.put("insideCode_eq", schRealInfo.getClZbh());
  397 + map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
402 398 Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
403 399 // Cars car = carsRepository.findCarByClzbh(schRealInfo.getClZbh());
404   - sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
405   - sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
  400 + sf.append("<RQ>"+date+"</RQ>");
  401 + sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
406 402 sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
407 403 for(ScheduleRealInfo scheduleRealInfo:list){
408   - if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getClZbh()
  404 + if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
409 405 .equals(scheduleRealInfo.getClZbh())){
410 406 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
411 407 //如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
... ... @@ -436,7 +432,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
436 432 sf.append("<YH>"+""+"</YH>");
437 433 sf.append("<JZYL>"+""+"</JZYL>");
438 434 sf.append("<DH>"+""+"</DH>");
439   - sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
  435 + sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
440 436 sf.append("<BBSCBZ>"+0+"</BBSCBZ>");
441 437 sf.append("</LCYH>");
442 438 }
... ... @@ -466,18 +462,18 @@ public class TrafficManageServiceImpl implements TrafficManageService{
466 462 StringBuffer sf = new StringBuffer();
467 463 try {
468 464 sf.append("<DDRBS>");
469   - List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
  465 + List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
470 466 List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
471   - for(ScheduleRealInfo schRealInfo:listGroup){
  467 + for(Map<String,Object> schRealInfo:listGroup){
472 468 if(schRealInfo != null){
473 469 double jhlc = 0,zlc = 0,jhkslc = 0,sjkslc = 0;
474 470 int jhbc = 0,sjbc = 0,jhzgfbc = 0,sjzgfbc = 0,jhwgfbc = 0,sjwgfbc = 0;
475 471 sf.append("<DDRB>");
476   - sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
477   - sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
  472 + sf.append("<RQ>"+date+"</RQ>");
  473 + sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
478 474 for(ScheduleRealInfo scheduleRealInfo:list){
479 475 if(scheduleRealInfo != null){
480   - if(scheduleRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm())){
  476 + if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm())){
481 477 //计划
482 478 if(!scheduleRealInfo.isSflj()){
483 479 jhlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
... ... @@ -540,7 +536,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
540 536 sf.append("<SJZGFBC>"+sjzgfbc+"</SJZGFBC>");
541 537 sf.append("<JHWGFBC>"+jhwgfbc+"</JHWGFBC>");
542 538 sf.append("<SJWGFBC>"+sjwgfbc+"</SJWGFBC>");
543   - sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
  539 + sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
544 540 sf.append("<RBSCBZ>"+0+"</RBSCBZ>");
545 541 sf.append("</DDRB>");
546 542 }
... ...