update

潘钊
1 parent 74e0e099
Showing 6 changed files with 10 additions and 8 deletions
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/static/pages/control/line/index.html
@@ -31,7 +31,8 @@ public class FirstScheduleCheckThread extends Thread{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	private final static long THREE_MINUTES = 1000 * 60 * 3L;
+	//提前半小时下发指令
+	private final static long THREE_MINUTES = 1000 * 60 * 30L;
 	@Override
 	public void run() {
@@ -55,7 +55,7 @@ public class PilotReport {
 	//private static ScheduleComparator.FCNO schComp;
-	private static ArrayListMultimap<Integer, D80> d80MultiMap;
+	private static ArrayListMultimap<String, D80> d80MultiMap;
 	Logger logger = LoggerFactory.getLogger(PilotReport.class);
@@ -68,7 +68,7 @@ public class PilotReport {
 		//入库
 		d80Repository.save(d80);
 		//入缓存
-		d80MultiMap.put(d80.getData().getLineId(), d80);
+		d80MultiMap.put(d80.getData().getLineId().toString(), d80);
 		String nbbm = BasicData.deviceId2NbbmMap.get(d80.getDeviceId());
 		//处理
@@ -251,7 +251,7 @@ public class PilotReport {
 	 * @Description: TODO(根据lineCode 获取未处理的80数据) 
 	 */
 	public List<D80> unconfirmed80(Integer lineCode){
-		List<D80> lineAll = d80MultiMap.get(lineCode)
+		List<D80> lineAll = d80MultiMap.get(lineCode.toString())
 				,rs = new ArrayList<>();
 		for(D80 d80 : lineAll)
@@ -283,7 +283,7 @@ public class PilotReport {
 	public void clear(String lineCode){
 		logger.info("清除 80数据 before: " + d80MultiMap.size());
-		d80MultiMap.removeAll(Integer.parseInt(lineCode));
+		d80MultiMap.removeAll(lineCode);
 		logger.info("清除 80数据 after: " + d80MultiMap.size());
 	}
@@ -437,7 +437,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		Collections.sort(d80s, new Comparator<D80>() {
 			@Override
 			public int compare(D80 o1, D80 o2) {
-				return (int) (o1.getTimestamp() - o2.getTimestamp());
+				return (int) (o2.getTimestamp() - o1.getTimestamp());
 			}
 		});
@@ -315,6 +315,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			t.setRealExecDate(schDate);
 			t.setCreateBy(user);
 			t.setSflj(true);
+			t.setLate(false);
 			//班次历时
 			t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
@@ -120,7 +120,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 						user.sendMessage(message);
 					}
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("sendMessageToLine error ....", e);
 				}
 			}
 		}
@@ -228,7 +228,7 @@ function countDown(name){
 <script>
 var updateLog = {
-	text: '<div class="updete_log"><p>1、修正因设备状态异常导致的第一个营运班次被跳过问题。</p><p>2、修复发车信息微调报出的“未知异常”问题。</p></div>'
+	text: '<div class="updete_log"><p>1、...</p></div>'
 	,title: '2016年8月28号更新日志'
 }