潘钊 / bsth_control · Commits

Commit 77a1385c797b1e6693ac08f9d6a39758380c4ab6

Authored by 潘钊
1 parent a529fbc8

update...

Inline Side-by-side
Showing 5 changed files with 12 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
  View file @77a1385
... ... @@ -49,7 +49,7 @@ public class DataHandleProcess {
49 49 static long lastTime;
50 50  
51 51 public static boolean isBlock() {
52   - return System.currentTimeMillis() - lastTime > 1000 * 20;
  52 + return System.currentTimeMillis() - lastTime > 1000 * 30;
53 53 }
54 54  
55 55 public void handle(List<GpsEntity> list) {
... ...
src/main/java/com/bsth/data/gpsdata_v2/handlers/ReverseRouteProcess.java
  View file @77a1385
... ... @@ -37,6 +37,9 @@ public class ReverseRouteProcess {
37 37 reversRoute(gps) && !GeoCacheData.isLoopLine(gps.getLineId())){
38 38  
39 39 ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
  40 +
  41 + if(null == sch)
  42 + return;
40 43 if(isInOut(sch) || !sch.getXlBm().equals(gps.getLineId()))
41 44 return;
42 45  
... ...
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
  View file @77a1385
... ... @@ -67,10 +67,10 @@ public class SocketClientLoader {
67 67  
68 68 list = JSON.parseArray(sb.toString(), GpsEntity.class);
69 69  
  70 + logger.info("load end ! size: " + list.size());
70 71 //过滤掉无效的点位
71 72 list = GpsDataUtils.clearInvalid(list);
72 73  
73   - logger.info("load end!");
74 74 for (GpsEntity gps : list) {
75 75 gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
76 76 }
... ...
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
  View file @77a1385
1 1 package com.bsth.data.schedule.thread;
2 2  
3   -import com.alibaba.fastjson.JSON;
4 3 import com.alibaba.fastjson.serializer.PropertyFilter;
5 4 import com.bsth.data.schedule.DayOfSchedule;
6 5 import com.bsth.entity.realcontrol.ScheduleRealInfo;
... ... @@ -83,13 +82,14 @@ public class SchedulePstThread extends Thread {
83 82 return;
84 83 //记录同步数据
85 84 logger.info("real schedule update size: " + saveList.size());
86   - logger.info(JSON.toJSONString(saveList, filter));
  85 + //logger.info(JSON.toJSONString(saveList, filter));
87 86  
88 87 //批量入库
89 88 update2Db();
90 89  
91 90 //清空容器
92 91 saveList.clear();
  92 + logger.info("update end! ");
93 93 }
94 94  
95 95 private void update2Db(){
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @77a1385
... ... @@ -569,17 +569,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
569 569 //公司 和 分公司名称
570 570 t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
571 571 t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
572   -
  572 + t.setCreateDate(new Date());
573 573 t.setScheduleDateStr(schDate);
574 574 t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
575 575 t.setRealExecDate(schDate);
  576 +
576 577 t.setCreateBy(user);
577 578 t.setSflj(true);
578 579 t.setLate(false);
579 580 t.setDfsj(t.getFcsj());
580 581 t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
581 582 t.setJhlcOrig(t.getJhlc());
582   -
  583 + t.setCreateDate(new Date());
  584 + t.setUpdateDate(new Date());
  585 + t.setSpId(-1L);
583 586 //起终点名称
584 587 String prefix = t.getXlBm() + "_" + t.getXlDir() + "_";
585 588 t.setQdzName(BasicData.getStationNameByCode(t.getQdzCode(), prefix));
... ...