update

徐烜
1 parent ae363739
Showing 5 changed files with 83 additions and 37 deletions
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfoCalcuParam_input.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
src/main/resources/rules/ttinfo.drl
src/test/java/com/bsth/service/schedule/rules/DroolsRulesTest.java
@@ -117,7 +117,7 @@ public class IStrategyImpl implements IStrategy {
         session.setGlobal("results", ttInfoResults_output);
         TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
-                new DateTime(fromDate), new DateTime(toDate));
+                new DateTime(fromDate), new DateTime(toDate), String.valueOf(xlId));
         session.insert(ttInfoCalcuParam_input);
         for (TTInfo ttInfo : ttInfos) {
             TTInfo_input ttInfo_input = new TTInfo_input(ttInfo);
@@ -10,12 +10,15 @@ public class TTInfoCalcuParam_input {
     private DateTime fromDate;
     /** 结束计算日期 */
     private DateTime toDate;
+    /** 线路Id */
+    private String xlId;
     public TTInfoCalcuParam_input() {}
-    public TTInfoCalcuParam_input(DateTime fromDate, DateTime toDate) {
+    public TTInfoCalcuParam_input(DateTime fromDate, DateTime toDate, String xlId) {
         this.fromDate = fromDate;
         this.toDate = toDate;
+        this.xlId = xlId;
     }
     public DateTime getFromDate() {
@@ -33,4 +36,12 @@ public class TTInfoCalcuParam_input {
     public void setToDate(DateTime toDate) {
         this.toDate = toDate;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
 }
@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 时刻表_输入
  */
-public class TTInfo_input {
+public class TTInfo_input implements Comparable<TTInfo_input> {
     /** 时刻表id */
     private String ttInfoId;
     /** 线路Id */
@@ -30,6 +30,15 @@ public class 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());
@@ -29,11 +29,12 @@ declare Calcu_days_result
     calcu_days : Integer // 总共需要计算的天数
     calcu_start_date : DateTime // 开始计算日期
     calcu_end_date : DateTime // 结束计算日期
+    xlId : String // 线路Id
 end
 rule "calcu_days"
     when
-        TTInfoCalcuParam_input($fromDate : fromDate, $toDate : toDate, $fromDate.isBefore($toDate))
+        TTInfoCalcuParam_input($fromDate : fromDate, $toDate : toDate, $fromDate.isBefore($toDate), $xlId : xlId)
     then
         // 构造Calcu_days_result对象，进行下一阶段计算
         Calcu_days_result cdr = new Calcu_days_result();
@@ -45,8 +46,9 @@ rule &quot;calcu_days&quot;
         cdr.setCalcu_weekday($fromDate.getDayOfWeek());
         cdr.setCalcu_start_date($fromDate);
         cdr.setCalcu_end_date(($toDate));
+        cdr.setXlId($xlId);
-        log.info("总共塑腰计算的天数 calcu_days={} 之后的计算从第1天开始 ", p.getDays() + 1);
+        log.info("总共需要计算的天数 calcu_days={} 之后的计算从第1天开始 ", p.getDays() + 1);
         insert(cdr); // 插入fact数据，进入下一个阶段
 end
@@ -54,36 +56,37 @@ end
 //----------------- 第二阶段、判定时刻表是否启用 ----------------//
 declare Calcu_ttinfo_enable_result
-    xlid : String // 线路id
-    ttid : String // 时刻表id
+    xlId : String // 线路id
+    ttInfo_input_list : ArrayList // 可用时刻表列表
     calcu_date : DateTime // 计算日期
 end
 rule "calcu_ttinfo_enable"
     salience 900
     when
-        $calcu_days_result : Calcu_days_result($calcu_date : calcu_date, calcu_day <= calcu_days)
-        $tTInfo_input : TTInfo_input($xlid : xlId, $ttid : ttInfoId, isEnable == true)
+        $calcu_days_result : Calcu_days_result($calcu_date : calcu_date, calcu_day <= calcu_days, $xlId : xlId)
+        $ttInfo_input_list : ArrayList(size >= 1) from collect (TTInfo_input(xlId == $xlId, isEnable == true))
     then
         // 构造Calcu_ttinfo_enable_result对象，进行下一步计算
         Calcu_ttinfo_enable_result cter = new Calcu_ttinfo_enable_result();
-        cter.setXlid($xlid);
-        cter.setTtid($ttid);
+        cter.setXlId($xlId);
+        cter.setTtInfo_input_list($ttInfo_input_list);
         cter.setCalcu_date($calcu_date);
-        log.info("启用的时刻表：xlid={} ttid={} 计算日期={}", $xlid, $ttid, $calcu_date);
+        log.info("启用的时刻表：xlId={} 时刻表个数={}", $xlId, $ttInfo_input_list.size());
+
+        insert (cter);
-        insert(cter);
 end
-//----------------- 第三阶段 -------------------//
+//----------------- 第三阶段、时刻表的日期匹配 -------------------//
-rule "calcu_ttinfo_special_day"
+rule "calcu_ttinfo_special_day" // 特殊日期匹配
     salience 800
     when
-        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlid : xlid, $calcu_date : calcu_date)
-        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, $calcu_day : calcu_day)
-        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(xlId == $xlid, isEnable == true, specialDays contains $calcu_date))
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays contains $calcu_date) from $ttInfo_input_list)
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -92,20 +95,21 @@ rule &quot;calcu_ttinfo_special_day&quot;
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用特殊日期时刻表：xlid={} 时刻表个数={} 特殊日期={}", $xlid, $ttinfolist.size(), $calcu_date);
+        log.info("启用特殊日期时刻表：xlId={} 时刻表个数={} 特殊日期={}", $xlId, $ttinfolist.size(), $calcu_date);
-        // result输出
-        results.addXlTTInfos($xlid, $calcu_date, $ttinfolist);
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
         update($calcu_days_result);
 end
-rule "calcu_ttinfo_normal_day"
+rule "calcu_ttinfo_normal_day" // 平日匹配
     salience 700
     when
-        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlid : xlid, $calcu_date : calcu_date)
-        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
-        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(xlId == $xlid, isEnable == true, specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == true))
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == true) from $ttInfo_input_list)
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -114,20 +118,21 @@ rule &quot;calcu_ttinfo_normal_day&quot;
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用常规日期时刻表：xlid={} 时刻表个数={} 常规日期={} 星期几={}", $xlid, $ttinfolist.size(), $calcu_date, $calcu_weekday);
+        log.info("启用常规日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
-        // result输出
-        results.addXlTTInfos($xlid, $calcu_date, $ttinfolist);
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
         update($calcu_days_result);
 end
-rule "calcu_ttinfo_other_day"
+rule "calcu_ttinfo_other_day" // 都没有的情况下，匹配
     salience 500
     when
-        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlid : xlid, $calcu_date : calcu_date)
-        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
-        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(xlId == $xlid, isEnable == true, specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == false))
+        $calcu_ttinfo_enable_result : Calcu_ttinfo_enable_result($xlId : xlId, $calcu_date : calcu_date, $ttInfo_input_list : ttInfo_input_list)
+        $calcu_days_result : Calcu_days_result(calcu_date == $calcu_date, xlId == $xlId, $calcu_day : calcu_day, $calcu_weekday : calcu_weekday)
+        $ttinfolist : ArrayList(size >= 1) from collect (TTInfo_input(specialDays not contains $calcu_date, weekdays[$calcu_weekday - 1] == false) from $ttInfo_input_list)
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -136,10 +141,11 @@ rule &quot;calcu_ttinfo_other_day&quot;
         $calcu_days_result.setCalcu_date(new_calcu_date);
         $calcu_days_result.setCalcu_weekday(new_calcu_date.getDayOfWeek());
-        log.info("启用默认日期时刻表：xlid={} 时刻表个数={} 常规日期={} 星期几={}", $xlid, $ttinfolist.size(), $calcu_date, $calcu_weekday);
+        log.info("启用默认日期时刻表：xlId={} 时刻表个数={} 常规日期={} 星期几={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday);
-        // result输出
-        results.addXlTTInfos($xlid, $calcu_date, $ttinfolist);
+        // $ttinfolist按时间倒排序，result输出
+        Collections.sort($ttinfolist);
+        results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
         update($calcu_days_result);
@@ -75,9 +75,11 @@ public class DroolsRulesTest {
         // 2、创建fact对象
         TTInfoCalcuParam_input ttInfoCalcuParam_input = new TTInfoCalcuParam_input(
                 new DateTime(2016, 8, 1, 0, 0),
-                new DateTime(2016, 8, 10, 0, 0)
+                new DateTime(2016, 8, 10, 0, 0),
+                "1"
         );
+
         TTInfo_input ttInfo_input1 = new TTInfo_input();
         ttInfo_input1.setTtInfoId("1");
         ttInfo_input1.setXlId("1");
@@ -87,9 +89,25 @@ public class DroolsRulesTest {
         ttInfo_input1.setIsEnable(true);
         ttInfo_input1.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+        TTInfo_input ttInfo_input1_2 = new TTInfo_input();
+        ttInfo_input1_2.setTtInfoId("2");
+        ttInfo_input1_2.setXlId("1");
+        ttInfo_input1_2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
+        ttInfo_input1_2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
+        ttInfo_input1_2.setUpdateDate(new DateTime(2015, 2, 1, 0, 0));
+        ttInfo_input1_2.setIsEnable(true);
+        ttInfo_input1_2.setQyDate(new DateTime(2016, 1, 1, 0, 0));
+
+
+        TTInfoCalcuParam_input ttInfoCalcuParam_inpu2 = new TTInfoCalcuParam_input(
+                new DateTime(2016, 8, 1, 0, 0),
+                new DateTime(2016, 8, 10, 0, 0),
+                "2"
+        );
+
         TTInfo_input ttInfo_input2 = new TTInfo_input();
         ttInfo_input2.setTtInfoId("2");
-        ttInfo_input2.setXlId("1");
+        ttInfo_input2.setXlId("2");
         ttInfo_input2.setWeekdays(Arrays.asList(true, false, false, false, false, true, false));
         ttInfo_input2.getSpecialDays().add(new DateTime(2016, 8, 11, 0, 0));
         ttInfo_input2.setUpdateDate(new DateTime(2016, 1, 1, 0, 0));
@@ -98,6 +116,8 @@ public class DroolsRulesTest {
         session.insert(ttInfoCalcuParam_input);
         session.insert(ttInfo_input1);
+        session.insert(ttInfo_input1_2);
+        session.insert(ttInfoCalcuParam_inpu2);
         session.insert(ttInfo_input2);