潘钊 / bsth_control · Commits

Commit e73b4f616a7514ca792a5ec943753a4276133496

Authored by 潘钊
1 parent 46b88679
build: skipped

update...

Inline Side-by-side
Showing 3 changed files with 26 additions and 8 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @e73b4f6
... ... @@ -341,6 +341,13 @@ public class DayOfSchedule implements CommandLineRunner {
341 341 if (StringUtils.isEmpty(sch.getFcsj()))
342 342 sch.setFcsj("00:00");
343 343  
  344 + if(sch.getFcsj().equals("24:00"))
  345 + sch.setFcsj("23:59");
  346 +
  347 + if(sch.getFcsj().substring(0, 2).equals("24")){
  348 + sch.setFcsj("00" + sch.getFcsj().substring(2));
  349 + }
  350 +
344 351 fcsj = sch.getFcsj().trim();
345 352 //处理一下发车时间格式没有:号的问题
346 353 if (fcsj.indexOf(":") == -1 && fcsj.length() >= 4) {
... ... @@ -823,8 +830,8 @@ public class DayOfSchedule implements CommandLineRunner {
823 830 first = executeCurr(nbbm);
824 831  
825 832 if(first.getBcType().equals("out")
826   - && first.getDfsjT() < second.getDfsjT()
827   - && doneSum(nbbm) == 0 && second.getDfsjT() > time)
  833 + && first.getDfsjT() < second.getDfsjT()
  834 + && doneSum(nbbm) == 0 && second.getDfsjT() > time)
828 835 return true;
829 836 } catch (Exception e) {
830 837 logger.error("", e);
... ... @@ -840,10 +847,10 @@ public class DayOfSchedule implements CommandLineRunner {
840 847  
841 848 public int stopTimePlan(Object task) {
842 849  
843   - ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
  850 + ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
844 851  
845   - sch.getzdsj
846   - return -1;
  852 + sch.getzdsj
  853 + return -1;
847 854 }*/
848 855  
849 856 /**
... ...
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
  View file @e73b4f6
... ... @@ -477,8 +477,8 @@ public class GpsServiceImpl implements GpsService {
477 477 sqlBefore += (k + ",");
478 478 sqlValues += "?,";
479 479 }
480   - sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ")";
481   - sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ")";
  480 + sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
  481 + sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
482 482 sql = sqlBefore + " " + sqlValues;
483 483  
484 484 Connection conn = DBUtils_MS.getConnection();
... ...
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @e73b4f6
... ... @@ -328,10 +328,21 @@ public class TrafficManageServiceImpl implements TrafficManageService{
328 328 if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
329 329 .equals(scheduleRealInfo.getLpName())
330 330 && (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
331   - if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
  331 +
  332 + if(scheduleRealInfo.isDestroy()){
  333 + if(scheduleRealInfo.isReissue()){
  334 + scheduleRealInfo.setFcsjActualAll(scheduleRealInfo.getDfsj());
  335 + scheduleRealInfo.setZdsjActualAll(scheduleRealInfo.getZdsj());
  336 + }
  337 + else
  338 + continue;
  339 + }
  340 +
  341 + if(scheduleRealInfo.getBcType().equals("in")
332 342 || scheduleRealInfo.getBcType().equals("out")){
333 343 continue;
334 344 }
  345 +
335 346 scheduleRealInfo.getQdzCode();
336 347 sf.append("<LD>");
337 348 sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");
... ...