update...

潘钊
1 parent 46b88679
Showing 3 changed files with 26 additions and 8 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -341,6 +341,13 @@ public class DayOfSchedule implements CommandLineRunner {
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
+                if(sch.getFcsj().equals("24:00"))
+                    sch.setFcsj("23:59");
+
+                if(sch.getFcsj().substring(0, 2).equals("24")){
+                    sch.setFcsj("00" + sch.getFcsj().substring(2));
+                }
+
                 fcsj = sch.getFcsj().trim();
                 //处理一下发车时间格式没有:号的问题
                 if (fcsj.indexOf(":") == -1 && fcsj.length() >= 4) {
@@ -823,8 +830,8 @@ public class DayOfSchedule implements CommandLineRunner {
                     first = executeCurr(nbbm);
             if(first.getBcType().equals("out")
-                && first.getDfsjT() < second.getDfsjT()
-                && doneSum(nbbm) == 0 && second.getDfsjT() > time)
+                    && first.getDfsjT() < second.getDfsjT()
+                    && doneSum(nbbm) == 0 && second.getDfsjT() > time)
                 return true;
         } catch (Exception e) {
             logger.error("", e);
@@ -840,10 +847,10 @@ public class DayOfSchedule implements CommandLineRunner {
     public int stopTimePlan(Object task) {
-        ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+    ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
-        sch.getzdsj
-        return -1;
+    sch.getzdsj
+    return -1;
     }*/
     /**
@@ -477,8 +477,8 @@ public class GpsServiceImpl implements GpsService {
                 sqlBefore += (k + ",");
                 sqlValues += "?,";
             }
-            sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ")";
-            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ")";
+            sqlBefore = sqlBefore.substring(0, sqlBefore.length() - 1) + ", create_ts)";
+            sqlValues = sqlValues.substring(0, sqlValues.length() - 1) + ", "+System.currentTimeMillis()+")";
             sql = sqlBefore + " " + sqlValues;
             Connection conn = DBUtils_MS.getConnection();
@@ -328,10 +328,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
 								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
-							if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
+
+							if(scheduleRealInfo.isDestroy()){
+								if(scheduleRealInfo.isReissue()){
+									scheduleRealInfo.setFcsjActualAll(scheduleRealInfo.getDfsj());
+									scheduleRealInfo.setZdsjActualAll(scheduleRealInfo.getZdsj());
+								}
+								else
+									continue;
+							}
+
+							if(scheduleRealInfo.getBcType().equals("in")
 									|| scheduleRealInfo.getBcType().equals("out")){
 								continue;
 							}
+
 							scheduleRealInfo.getQdzCode();
 							sf.append("<LD>");
 							sf.append("<SJGH>"+scheduleRealInfo.getjGh()+"</SJGH>");