update...

panzh
1 parent b14d13ae
Showing 3 changed files with 17 additions and 6 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/XmlInfoPublishController.java
src/main/java/com/bsth/data/gps/process/DataMainProcessor.java
@@ -58,7 +58,7 @@ public class StartCommand implements CommandLineRunner {
             sexec.scheduleWithFixedDelay(fixedLoadCacheThread, 60 * 300, 60 * 300, TimeUnit.SECONDS);
             //定时刷新班次信息
-            sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 60 * 2, TimeUnit.SECONDS);
+            sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 30, TimeUnit.SECONDS);
             //gps socket client
             clientApp.init();
@@ -199,12 +199,23 @@ public class XmlInfoPublishController {
             sb.append("<cars lineid=\"" + lineid + "\">");
             for (GpsEntity v : vs) {
+                if (v.getStationCode().equals(stopid)
+                        && v.getInOut() != 1)
+                    continue; //已出当前站
+
                 sb.append("<car>");
                 sb.append("<terminal>" + BasicCacheData.device2plateMap.get(v.getDeviceId()) + "</terminal>");
-                //sb.append("<terminal>" + v.getNbbm() + "</terminal>");
-                sb.append("<stopdis>" + snMap.get(v.getDeviceId()) + "</stopdis>");
-                sb.append("<distance>" + df.format((disMap.get(v.getDeviceId()) + v.getDistance())) + "</distance>");
-                sb.append("<time>" + forecast.get(v.getDeviceId()) + "</time>");
+
+                if (v.getStationCode().equals(stopid)
+                        && v.getInOut() == 1) {//当前站 缓冲区内 的车
+                    sb.append("<stopdis>0</stopdis>");
+                    sb.append("<distance>0</distance>");
+                    sb.append("<time>0</time>");
+                } else {
+                    sb.append("<stopdis>" + snMap.get(v.getDeviceId()) + "</stopdis>");
+                    sb.append("<distance>" + df.format((disMap.get(v.getDeviceId()) + v.getDistance())) + "</distance>");
+                    sb.append("<time>" + forecast.get(v.getDeviceId()) + "</time>");
+                }
                 sb.append("</car>");
             }
@@ -52,7 +52,7 @@ public class DataMainProcessor {
     public void start() {
         Application.mainServices.scheduleWithFixedDelay(dataLoaderThread
-                , 40, 3, TimeUnit.SECONDS);
+                , 60, 3, TimeUnit.SECONDS);
     }
     public void process(ArrayListMultimap<String, GpsEntity> data) {