Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java # src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java # src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr
潘钊
2 parents 635bde76 03747e39
Showing 8 changed files with 135 additions and 133 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/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr
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);
-package com.bsth.service.schedule.rules.ttinfo;
-
-import com.bsth.entity.schedule.TTInfo;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 时刻表_输入
- */
-public class TTInfo_input implements Comparable<TTInfo_input> {
-    /** 时刻表id */
-    private String ttInfoId;
-    /** 线路Id */
-    private String xlId;
-    /** 周一到周日是否启用 */
-    private List<Boolean> weekdays = new ArrayList<>();
-    /** 特殊节假日 */
-    private List<DateTime> specialDays = new ArrayList<>();
-    /** 最新修改时间 */
-    private DateTime updateDate;
-    /** 是否启用 */
-    private Boolean isEnable;
-    /** 启用日期 */
-    private DateTime qyDate;
-
-    public TTInfo_input() {
-
-    }
-
-    @Override
-    public int compareTo(TTInfo_input ttInfo_input) {
-        if (ttInfo_input != null) {
-            if (ttInfo_input.updateDate != null && this.updateDate != null)
-                return - this.updateDate.compareTo(ttInfo_input.updateDate);
-        }
-        return -1;
-    }
-
-    public TTInfo_input(TTInfo ttInfo) {
-        this.ttInfoId = String.valueOf(ttInfo.getId());
-        this.xlId = String.valueOf(ttInfo.getXl().getId());
-        String[] days = ttInfo.getRule_days().split(",");
-        System.out.println(days.length);
-        for (int i = 0; i < 7; i++) {
-            if ("1".equals(days[i])) {
-                weekdays.add(true);
-            } else {
-                weekdays.add(false);
-            }
-        }
-        if (StringUtils.isNotEmpty(ttInfo.getSpecial_days())) {
-            String[] sdays = ttInfo.getSpecial_days().split(",");
-            for (int i = 0; i < sdays.length; i++) {
-                specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
-                        parseDateTime(sdays[i]));
-            }
-        }
-
-        this.updateDate = new DateTime(ttInfo.getUpdateDate());
-        this.isEnable = ttInfo.getIsEnableDisTemplate();
-        this.qyDate = new DateTime(ttInfo.getQyrq());
-
-    }
-
-    public String getTtInfoId() {
-        return ttInfoId;
-    }
-
-    public void setTtInfoId(String ttInfoId) {
-        this.ttInfoId = ttInfoId;
-    }
-
-    public String getXlId() {
-        return xlId;
-    }
-
-    public void setXlId(String xlId) {
-        this.xlId = xlId;
-    }
-
-    public List<Boolean> getWeekdays() {
-        return weekdays;
-    }
-
-    public void setWeekdays(List<Boolean> weekdays) {
-        this.weekdays = weekdays;
-    }
-
-    public List<DateTime> getSpecialDays() {
-        return specialDays;
-    }
-
-    public void setSpecialDays(List<DateTime> specialDays) {
-        this.specialDays = specialDays;
-    }
-
-    public DateTime getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(DateTime updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public Boolean getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Boolean isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public DateTime getQyDate() {
-        return qyDate;
-    }
-
-    public void setQyDate(DateTime qyDate) {
-        this.qyDate = qyDate;
-    }
-}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.entity.schedule.TTInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 时刻表_输入
+ */
+public class TTInfo_input implements Comparable<TTInfo_input> {
+    /** 时刻表id */
+    private String ttInfoId;
+    /** 线路Id */
+    private String xlId;
+    /** 周一到周日是否启用 */
+    private List<Boolean> weekdays = new ArrayList<>();
+    /** 特殊节假日 */
+    private List<DateTime> specialDays = new ArrayList<>();
+    /** 最新修改时间 */
+    private DateTime updateDate;
+    /** 是否启用 */
+    private Boolean isEnable;
+    /** 启用日期 */
+    private DateTime qyDate;
+
+    public TTInfo_input() {
+
+    }
+
+    @Override
+    public int compareTo(TTInfo_input ttInfo_input) {
+        if (ttInfo_input != null) {
+            if (ttInfo_input.updateDate != null && this.updateDate != null)
+                return - this.updateDate.compareTo(ttInfo_input.updateDate);
+        }
+        return -1;
+    }
+
+    public TTInfo_input(TTInfo ttInfo) {
+        this.ttInfoId = String.valueOf(ttInfo.getId());
+        this.xlId = String.valueOf(ttInfo.getXl().getId());
+        String[] days = ttInfo.getRule_days().split(",");
+        System.out.println(days.length);
+        for (int i = 0; i < 7; i++) {
+            if ("1".equals(days[i])) {
+                weekdays.add(true);
+            } else {
+                weekdays.add(false);
+            }
+        }
+        if (StringUtils.isNotEmpty(ttInfo.getSpecial_days())) {
+            String[] sdays = ttInfo.getSpecial_days().split(",");
+            for (int i = 0; i < sdays.length; i++) {
+                specialDays.add(DateTimeFormat.forPattern("yyyy-MM-dd").
+                        parseDateTime(sdays[i]));
+            }
+        }
+
+        this.updateDate = new DateTime(ttInfo.getUpdateDate());
+        this.isEnable = ttInfo.getIsEnableDisTemplate();
+        this.qyDate = new DateTime(ttInfo.getQyrq());
+
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public List<Boolean> getWeekdays() {
+        return weekdays;
+    }
+
+    public void setWeekdays(List<Boolean> weekdays) {
+        this.weekdays = weekdays;
+    }
+
+    public List<DateTime> getSpecialDays() {
+        return specialDays;
+    }
+
+    public void setSpecialDays(List<DateTime> specialDays) {
+        this.specialDays = specialDays;
+    }
+
+    public DateTime getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(DateTime updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Boolean getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(Boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public DateTime getQyDate() {
+        return qyDate;
+    }
+
+    public void setQyDate(DateTime qyDate) {
+        this.qyDate = qyDate;
+    }
+}
@@ -120,7 +120,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 						user.sendMessage(message);
 					}
 				} catch (IOException e) {
-					e.printStackTrace();
+					logger.error("sendMessageToLine error ....", e);
 				}
 			}
 		}
@@ -2591,4 +2591,4 @@
 </slave-step-copy-partition-distribution>
    <slave_transformation>N</slave_transformation>
-</transformation>
+</transformation>
 \ No newline at end of file
@@ -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号更新日志'
 }