update...

潘钊
1 parent a529fbc8
Showing 5 changed files with 12 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -49,7 +49,7 @@ public class DataHandleProcess {
     static long lastTime;
     public static boolean isBlock() {
-        return System.currentTimeMillis() - lastTime > 1000 * 20;
+        return System.currentTimeMillis() - lastTime > 1000 * 30;
     }
     public void handle(List<GpsEntity> list) {
@@ -37,6 +37,9 @@ public class ReverseRouteProcess {
                 reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
             ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+
+            if(null == sch)
+                return;
             if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
                 return;
@@ -67,10 +67,10 @@ public class SocketClientLoader {
             list = JSON.parseArray(sb.toString(), GpsEntity.class);
+            logger.info("load end ! size: " + list.size());
             //过滤掉无效的点位
             list = GpsDataUtils.clearInvalid(list);
-            logger.info("load end!");
             for (GpsEntity gps : list) {
                 gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
             }
 package com.bsth.data.schedule.thread;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -83,13 +82,14 @@ public class SchedulePstThread extends Thread {
             return;
         //记录同步数据
         logger.info("real schedule update size: " + saveList.size());
-        logger.info(JSON.toJSONString(saveList, filter));
+        //logger.info(JSON.toJSONString(saveList, filter));
         //批量入库
         update2Db();
         //清空容器
         saveList.clear();
+        logger.info("update end! ");
     }
     private void update2Db(){
@@ -569,17 +569,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
             t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
-
+            t.setCreateDate(new Date());
             t.setScheduleDateStr(schDate);
             t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
             t.setRealExecDate(schDate);
+
             t.setCreateBy(user);
             t.setSflj(true);
             t.setLate(false);
             t.setDfsj(t.getFcsj());
             t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
             t.setJhlcOrig(t.getJhlc());
-
+            t.setCreateDate(new Date());
+            t.setUpdateDate(new Date());
+            t.setSpId(-1L);
             //起终点名称
             String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
             t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));