Merge branch 'pudong' of http://222.66.0.204:8090//panzhaov5/bsth_control into pudong

徐烜
2 parents 8ba2ec42 7c74f45f
Showing 4 changed files with 23 additions and 5 deletions
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/gpsdata_v2/cache/GpsCacheData.java
src/main/java/com/bsth/entity/directive/Directive.java
src/main/resources/static/pages/summary/temp_sch_detail/list.html
@@ -7,6 +7,8 @@ import com.bsth.entity.directive.Directive;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,8 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     @Override
     public void run() {
@@ -52,6 +56,8 @@ public class DirectivesPstThread extends Thread {
                             continue;
                         }
                     }
+                    //日期
+                    d60.setRq(fmtyyyyMMdd.print(d60.getTimestamp()));
                     d60Repository.save(d60);
                 }
@@ -9,6 +9,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * gps 数据缓存
@@ -17,10 +19,10 @@ import java.util.*;
 public class GpsCacheData {
     /**
-     * 每辆车缓存最后300条gps
+     * 每辆车缓存最后200条gps
      */
-    private static final int CACHE_SIZE = 300;
-    private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
+    private static final int CACHE_SIZE = 200;
+    private static ConcurrentMap<String, CircleQueue<GpsEntity>> gpsCacheMap = new ConcurrentHashMap<>();
     /**
      * 车辆执行班次的详细 进出站数据
@@ -28,6 +28,8 @@ public class Directive {
 	 * 时间戳
 	 */
 	protected Long timestamp;
+
+	private String rq;
 	/**
 	 * 时间 HH:mm
@@ -113,4 +115,12 @@ public class Directive {
 	public void setSender(String sender) {
 		this.sender = sender;
 	}
+
+	public String getRq() {
+		return rq;
+	}
+
+	public void setRq(String rq) {
+		this.rq = rq;
+	}
 }
@@ -172,8 +172,8 @@
                     <th>司机</th>
                     <th>售票员</th>
                     <th>班次</th>
-                    <th>烂班公里</th>
-                    <th>烂班时间</th>
+                    <th>临加公里</th>
+                    <th>临加时间</th>
                     <th>备注</th>
                 </tr>
                 </thead>