潘钊 / bsth_control · Commits

Commit 49a78bc531321844774a8c38e02ecf44d25870c1

Authored by 潘钊
1 parent dc029c67

update...

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
src/main/java/com/bsth/data/schedule/auto_exec/RealScheduleAutoExecHandler.java
  View file @49a78bc
... ... @@ -4,6 +4,7 @@ import com.bsth.data.gpsdata.status_manager.GpsStatusManager;
4 4 import com.bsth.data.schedule.DayOfSchedule;
5 5 import com.bsth.entity.realcontrol.ScheduleRealInfo;
6 6 import com.bsth.websocket.handler.SendUtils;
  7 +import org.apache.commons.lang3.StringUtils;
7 8 import org.springframework.beans.factory.annotation.Autowired;
8 9 import org.springframework.stereotype.Component;
9 10  
... ... @@ -29,12 +30,12 @@ public class RealScheduleAutoExecHandler {
29 30 boolean flag = false;
30 31 long t = System.currentTimeMillis();
31 32  
32   - if (sch.getDfsjT() < t) {
  33 + if (StringUtils.isEmpty(sch.getFcsjActual()) && sch.getDfsjT() < t) {
33 34 sch.setFcsjActualAll(sch.getDfsjT());
34 35 flag = true;
35 36 }
36 37  
37   - if (sch.getZdsjT() < t) {
  38 + if (StringUtils.isEmpty(sch.getZdsjActual()) && sch.getZdsjT() < t) {
38 39 sch.setZdsjActualAll(sch.getZdsjT());
39 40  
40 41 //准备执行下一个班次
... ... @@ -43,7 +44,7 @@ public class RealScheduleAutoExecHandler {
43 44 dayOfSchedule.addExecPlan(next);
44 45 //套跑 -下发线路切换指令
45 46 if(!next.getXlBm().equals(sch.getXlBm())){
46   - gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
  47 + gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "auto@系统");
47 48 }
48 49 }
49 50  
... ...