Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents ad185331 de846074
Showing 10 changed files with 123 additions and 20 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_line_state/LineStateHandle.java
src/main/java/com/bsth/data/gpsdata/status_manager/gps_service_state/ServiceStateHandle.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/service/forecast/SampleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/GidFbFcnoFunction.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/readme.txt
src/main/resources/rules/functions.drl
src/main/resources/rules/plan.drl
@@ -56,15 +56,15 @@ public class CorrectSignalHandle extends SignalHandle {
             //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态
             if((!gps.isService() || gps.getUpDown() != updown) &&
                     !dayOfSchedule.emptyService(task)){
-                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "系统@同步");
+                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "同步@系统");
             }
             //需要切换线路
             if(!task.getXlBm().equals(gps.getLineId())){
-                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "系统@同步");
+                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "同步@系统");
             }
         }
         return true;
     }
-}
+}
 \ No newline at end of file
@@ -31,7 +31,7 @@ public class LineStateHandle {
     /** 重发次数 */
     private final static int MAX_SEND_COUNT=3;
     /** 重发间隔 */
-    private final static int SEND_SPACE=1000 * 60 * 5;
+    private final static int SEND_SPACE=1000 * 60 * 4;
     /** 最大有效时间 */
     private final static int MAX_AVAIL_TIME=1000 * 60 * 60 * 2;
@@ -13,7 +13,7 @@ import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
 /**
- * 设备营运状态处理
+ * 设备营运状态/上下行 处理
  * Created by panzhao on 2017/7/13.
  */
 @Component
@@ -31,9 +31,9 @@ public class ServiceStateHandle {
     /** 重发次数 */
     private final static int MAX_SEND_COUNT=3;
     /** 重发间隔 */
-    private final static int SEND_SPACE=1000 * 60 * 4;
+    private final static int SEND_SPACE=1000 * 60 * 3;
     /** 最大有效时间 */
-    private final static int MAX_AVAIL_TIME=1000 * 60 * 60;
+    private final static int MAX_AVAIL_TIME=1000 * 60 * 50;
     static{
         map = new ConcurrentHashMap();
@@ -67,9 +67,9 @@ public class ServiceStateHandle {
             if(gps == null)
                 return;
-            if(gps.getState().equals(sb.getState())){
+            if(gps.getState().equals(sb.getState()) && gps.getUpDown() == sb.getUpDown()){
                 map.remove(sb.getNbbm());
-                logger.info("营运状态切换成功，" + sb.getNbbm() + "、" + sb.getState());
+                logger.info("状态切换成功，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
             }
             else
                 reSend(sb);
@@ -88,14 +88,14 @@ public class ServiceStateHandle {
         long diff = System.currentTimeMillis() - sb.getSt();
         if(diff >= MAX_AVAIL_TIME){
             map.remove(sb.getNbbm());
-            logger.info("营运状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
+            logger.info("状态切换超过有效时间，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getSt());
             return;
         }
         if(diff >= SEND_SPACE){
             sb.setSender("补发@系统");
             changeState(sb);
-            logger.info("重发营运状态切换指令，" + sb.getNbbm() + "、" + sb.getState());
+            logger.info("重发状态切换指令，" + sb.getNbbm() + "、" + sb.getState() + "、" + sb.getUpDown());
             return;
         }
     }
@@ -154,6 +154,7 @@ public class GpsDataLoaderThread extends Thread {
         CloseableHttpResponse response = null;
         try {
+            logger.error("load start...");
             httpClient = HttpClients.createDefault();
             HttpGet get = new HttpGet(clientUrl);
             //超时时间
@@ -174,6 +175,7 @@ public class GpsDataLoaderThread extends Thread {
                 list = JSON.parseArray(stringBuffer.toString(), GpsEntity.class);
                 String nbbm;
+                logger.error("load end!");
                 for (GpsEntity gps : list) {
                     //没有设备号
@@ -34,7 +34,16 @@ public class PredicatesBuilder {
         Class<?> leftType = expression.getJavaType();
         Class<?> rightType = object.getClass();
-        if (Number.class.isAssignableFrom(leftType) &&
+		if(Date.class.isAssignableFrom(leftType) &&
+				String.class.isAssignableFrom(rightType)){
+			DateTime dateTime = new DateTime(object);
+			return cb.equal(expression, dateTime.toDate());
+		}
+		else {
+			return cb.equal(expression, object);
+		}
+
+        /*if (Number.class.isAssignableFrom(leftType) &&
                 (Number.class.isAssignableFrom(rightType) || String.class.isAssignableFrom(rightType))) { // Number == Number/String
             return cb.equal(expression, object);
         } else if (String.class.isAssignableFrom(leftType) &&
@@ -52,8 +61,7 @@ public class PredicatesBuilder {
             return cb.equal(expression, dateTime.toDate());
         } else {
             throw new RuntimeException("eq 不支持类型组合：" + expression.getJavaType() + "==" + object.getClass());
-        }
-
+        }*/
 	}
 	public static Predicate ne(CriteriaBuilder cb,Path<?> expression, Object object){
@@ -37,10 +37,12 @@ public class SampleServiceImpl extends BaseServiceImpl&lt;Sample, Long&gt; implements 
 		//转换站点名称
 		Iterator<Sample> iterator = rs.iterator();
 		Sample s;
+		String prefix;
 		while(iterator.hasNext()){
 			s = iterator.next();
-			s.setsName(BasicData.stationCode2NameMap.get(s.getsStation()));
-			s.seteName(BasicData.stationCode2NameMap.get(s.geteStation()));
+			prefix = s.getLineCode() + "_" + s.getUpdown() + "_";
+			s.setsName(BasicData.getStationNameByCode(s.getsStation(), prefix));
+			s.seteName(BasicData.getStationNameByCode(s.geteStation(), prefix));
 			rsList.add(s);
 		}
+package com.bsth.service.schedule.rules.shiftloop;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * 时刻表路牌下的分班班次发车顺序号。
+ */
+public class GidFbFcnoFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class GidFbInfoData implements Externalizable {
+        public Integer fbfcno;
+        public TTInfoDetail ttInfoDetail;
+
+        public GidFbInfoData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            fbfcno = (Integer) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(fbfcno);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new GidFbInfoData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+        gidFbInfoData.fbfcno = 999;
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        // 1块路牌有多个分班班次，取最早的时间作为起始分班班次发车顺序号
+        if (ttInfoDetail.getIsFB()) {
+            if (ttInfoDetail.getFcno() <= gidFbInfoData.fbfcno) {
+                gidFbInfoData.fbfcno = ttInfoDetail.getFcno();
+            }
+        }
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Integer.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        GidFbInfoData gidFbInfoData = (GidFbInfoData) context;
+
+        return gidFbInfoData.fbfcno;
+    }
+
+}
-翻班循环规则
 \ No newline at end of file
@@ -3,6 +3,7 @@ package com.bsth.service.schedule;
 import accumulate com.bsth.service.schedule.rules.ttinfo2.ErrorBcCountFunction ecount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidsCountFunction gidscount;
 import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbFcnoFunction gidfbfcno;
 import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq;
 import accumulate com.bsth.service.schedule.rules.validate.ValidRepeatBcFunction vrb;
 \ No newline at end of file
@@ -224,6 +224,7 @@ declare TTInfo_gid_stat
     maxFcno: Integer // 最大发车顺序号
     fbTime: LocalTime // 分班时间
+    fbfcno: Integer // 分班发车顺序号
 end
 rule "calcu_TTInfo_gid_stat"
@@ -234,6 +235,7 @@ rule &quot;calcu_TTInfo_gid_stat&quot;
         $gids: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidscount($ttd))
         $gid: String() from $gids
         $fbtime_str: String() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidfbtime($ttd))
+        $fbfcno: Integer() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), gidfbfcno($ttd))
         $maxfcno: Double() from accumulate ($ttd: TTInfoDetail(lp.id.toString() == $gid) from tTInfoDetailRepository.findByTtinfoId(Long.parseLong($ttInfoId)), max($ttd.getFcno()))
     then
         TTInfo_gid_stat ttInfo_gid_stat = new TTInfo_gid_stat();
@@ -243,11 +245,12 @@ rule &quot;calcu_TTInfo_gid_stat&quot;
         ttInfo_gid_stat.setMaxFcno($maxfcno.intValue());
         ttInfo_gid_stat.setFbTime(fcsjTime($fbtime_str));
+        ttInfo_gid_stat.setFbfcno($fbfcno);
         insert(ttInfo_gid_stat);
-//        log.info("xlid={},ttid={},gid={},maxfcno={},fbtime={}",
-//            $xlId, $ttInfoId, $gid, ttInfo_gid_stat.getMaxFcno(), ttInfo_gid_stat.getFbTime());
+//        log.info("xlid={},ttid={},gid={},maxfcno={},fbtime={},fbfcno={}",
+//            $xlId, $ttInfoId, $gid, ttInfo_gid_stat.getMaxFcno(), ttInfo_gid_stat.getFbTime(), ttInfo_gid_stat.getFbfcno());
 end
@@ -304,7 +307,10 @@ rule &quot;calcu_TTInfoDetail_Wraps&quot;
             LocalTime fcsj = fcsjTime(ttInfoDetail.getFcsj());
             LocalTime fbsj = ttInfo_gid_stat.getFbTime();
-            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : (fcsj.isEqual(fbsj) || fcsj.isAfter(fbsj)));
+            Integer fbfcno = ttInfo_gid_stat.getFbfcno();
+            // 不用时间判定，因为有的路牌，后面的班次都是凌晨的，时间反而比分班时间早，不合理，所以使用发车顺序号做第二次比较
+//            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : (fcsj.isEqual(fbsj) || fcsj.isAfter(fbsj)));
+            ttInfoDetail_wrap.setIsFb(fbsj == null ? false : ttInfoDetail.getFcno() >= fbfcno);
             ttInfoDetail_wrap.setSelf(ttInfoDetail);