Update

徐烜
1 parent c13b906b
Showing 7 changed files with 155 additions and 17 deletions
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/repository/schedule/SchedulePlanRuleResultRepository.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleCalcuParam_input.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResult_output.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResultsFunction.java
src/main/resources/rules/shiftloop_fb_2.drl
@@ -44,6 +44,11 @@ public class SchedulePlanRuleResult {
     /** 翻到哪个人员配置索引 */
     private String ecindex;
+    /** 时刻表id */
+    private String ttinfoId;
+    /** 时刻表名字 */
+    private String ttinfoName;
+
     /** 排班日期 */
     private Date scheduleDate;
@@ -191,4 +196,20 @@ public class SchedulePlanRuleResult {
     public void setXlName(String xlName) {
         this.xlName = xlName;
     }
+
+    public String getTtinfoId() {
+        return ttinfoId;
+    }
+
+    public void setTtinfoId(String ttinfoId) {
+        this.ttinfoId = ttinfoId;
+    }
+
+    public String getTtinfoName() {
+        return ttinfoName;
+    }
+
+    public void setTtinfoName(String ttinfoName) {
+        this.ttinfoName = ttinfoName;
+    }
 }
@@ -2,11 +2,27 @@ package com.bsth.repository.schedule;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Created by xu on 17/3/29.
  */
 @Repository
 public interface SchedulePlanRuleResultRepository extends BaseRepository<SchedulePlanRuleResult, Long> {
+
+    @Query("select t from SchedulePlanRuleResult t " +
+            "where not exists (select 1 from SchedulePlanRuleResult " +
+            "where createDate > t.createDate and scheduleDate < ?2 ) " +
+            "and t.xlId = ?1 and t.scheduleDate < ?2")
+    List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from);
+
+//    @Modifying
+//    @Query("delete from SchedulePlanRuleResult t " +
+//            "where t.xlId = ?1 and t.scheduleDate >= ?2 and t.scheduleDate <= ?3")
+//    void deleteByXlAndDate(String xlid, Date from, Date to);
 }
@@ -54,6 +54,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private BusinessRepository businessRepository;
     @Autowired
     private SchedulePlanRuleResultService schedulePlanRuleResultService;
+    @Autowired
+    private SchedulePlanRuleResultRepository schedulePlanRuleResultRepository;
     /** 日志记录器 */
     private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
@@ -87,6 +89,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 设置gloable对象，在drl中通过别名使用
         session.setGlobal("scheduleResult", scheduleResults_output);
         session.setGlobal("log", logger); // 设置日志
+        session.setGlobal("schedulePlanRuleResultRepository", schedulePlanRuleResultRepository);
         // 载入数据
         session.insert(scheduleCalcuParam_input);
@@ -12,6 +12,9 @@ public class ScheduleCalcuParam_input {
     /** 结束计算日期 */
     private DateTime toDate;
+    /** 线路Id */
+    private String xlId;
+
     /** 排班计划实体 */
     private SchedulePlan schedulePlan;
@@ -22,6 +25,7 @@ public class ScheduleCalcuParam_input {
         this.toDate = new DateTime((schedulePlan.getScheduleToTime()));
         this.schedulePlan = schedulePlan;
+        this.xlId = String.valueOf(schedulePlan.getXl().getId());
     }
     public DateTime getFromDate() {
@@ -47,4 +51,12 @@ public class ScheduleCalcuParam_input {
     public void setSchedulePlan(SchedulePlan schedulePlan) {
         this.schedulePlan = schedulePlan;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
 }
@@ -14,6 +14,8 @@ public class LpInfoResult_output {
     private String xlId;
     /** 时刻表Id */
     private String ttInfoId;
+    /** 时刻表名字 */
+    private String ttInfoName;
     public DateTime getDateTime() {
         return dateTime;
@@ -46,4 +48,12 @@ public class LpInfoResult_output {
     public void setTtInfoId(String ttInfoId) {
         this.ttInfoId = ttInfoId;
     }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
 }
@@ -66,6 +66,7 @@ public class LpInfoResultsFunction implements AccumulateFunction {
                 lpInfoResult_output.setLpId(String.valueOf(ttInfoDetail.getLp().getId()));
                 lpInfoResult_output.setXlId(String.valueOf(ttInfoDetail.getXl().getId()));
                 lpInfoResult_output.setTtInfoId(String.valueOf(ttInfoDetail.getTtinfo().getId()));
+                lpInfoResult_output.setTtInfoName(ttInfoDetail.getTtinfo().getName());
                 lpInfoResultsData.lpInfoResult_outputMap.put(
                         ttInfoDetail.getLp().getId(),
@@ -10,12 +10,14 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+import com.bsth.repository.schedule.SchedulePlanRuleResultRepository;
 import com.bsth.entity.schedule.temp.SchedulePlanRuleResult;
 import org.slf4j.Logger;
 global Logger log;
 global ScheduleResults_output scheduleResult;
+global SchedulePlanRuleResultRepository schedulePlanRuleResultRepository;
 /*
     存在（翻班格式）
@@ -109,6 +111,75 @@ rule &quot;calcu_days_2_&quot;
 end
+// 使用已经排过班的数据修正Calcu_days_result_pre
+// 1、避免每次从规则的启用日期开始算
+// 2、时刻表会不停的修正，如果每次都从规则启用日期开始算，会出错
+
+declare SchedulePlanRuleResult_wrap
+    ruleId: String // 规则Id
+    scheduleDate: DateTime // 排班日期
+
+    isUsed: Boolean = false // 是否被使用过
+
+    self: SchedulePlanRuleResult; // 原始对象数据
+end
+
+rule "Calcu_SchedulePlanRuleResult_wrap"
+    salience 950
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $sprr: SchedulePlanRuleResult() from schedulePlanRuleResultRepository.findLastByXl($xlId, $fromDate.toDate())
+
+    then
+        // 创建班序历史结果数据
+        SchedulePlanRuleResult_wrap schedulePlanRuleResult_wrap = new SchedulePlanRuleResult_wrap();
+        schedulePlanRuleResult_wrap.setRuleId($sprr.getRuleId());
+        schedulePlanRuleResult_wrap.setScheduleDate(new DateTime($sprr.getScheduleDate()));
+        schedulePlanRuleResult_wrap.setSelf($sprr);
+
+        insert(schedulePlanRuleResult_wrap);
+end
+
+
+// 1、启用日期 < 开始日期
+// 2、如果最近的排班规则历史时间在 (启用日期，开始日期) 之间，需要重新修正预处理数据
+rule "calcu_days_1_with_result"
+    no-loop
+    salience 960
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_start_date_2),
+            $ruleId: ruleId
+        )
+        $srrr_wrap: SchedulePlanRuleResult_wrap(
+            ruleId == $ruleId,
+            scheduleDate.isAfter($cdrp.calcu_start_date_1),
+            scheduleDate.isBefore($cdrp.calcu_start_date_2),
+            isUsed == false,
+            $scheduleDate: scheduleDate,
+            $self: self
+        )
+    then
+        // 修正排班数据
+        log.info("准备修正 ruleId={} historyDate={}", $ruleId, $scheduleDate);
+
+        $cdrp.setCalcu_index_lp(Integer.valueOf($self.getGidindex()));
+        $cdrp.setCalcu_index_ry(Integer.valueOf($self.getEcindex()));
+        $cdrp.setCalcu_start_date_1($scheduleDate);
+        update($cdrp);
+
+        $srrr_wrap.setIsUsed(true);
+        update($srrr_wrap);
+
+end
+
+
+
 //------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
 rule "Calcu_loop1_1_" // 路牌在时刻表中存在，就翻
     salience 900
@@ -191,7 +262,9 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         $liro: LpInfoResult_output(
             dateTime.isEqual($csd2),
             $gids.get($lpindex) == lpId,
-            $lpId: lpId
+            $lpId: lpId,
+            $ttinfoId: ttInfoId,
+            $ttinfoName: ttInfoName
         )
     then
         ScheduleResult_output ro = new ScheduleResult_output();
@@ -221,6 +294,8 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
         schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
         schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+        schedulePlanRuleResult.setTtinfoId($ttinfoId);
+        schedulePlanRuleResult.setTtinfoName($ttinfoName);
         scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
@@ -263,22 +338,22 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
         $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
-        // 保存排班规则循环结果 --> SchedulePlanRuleResult
-        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
-        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
-        schedulePlanRuleResult.setXlName($srf.getXl().getName());
-        schedulePlanRuleResult.setRuleId($ruleId);
-        schedulePlanRuleResult.setCcId($cid);
-        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
-        schedulePlanRuleResult.setGids($srf.getLpIds());
-        schedulePlanRuleResult.setGnames($srf.getLpNames());
-        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
-        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
-        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
-        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
-        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
-
-        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+//        // 保存排班规则循环结果 --> SchedulePlanRuleResult
+//        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+//        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
+//        schedulePlanRuleResult.setXlName($srf.getXl().getName());
+//        schedulePlanRuleResult.setRuleId($ruleId);
+//        schedulePlanRuleResult.setCcId($cid);
+//        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+//        schedulePlanRuleResult.setGids($srf.getLpIds());
+//        schedulePlanRuleResult.setGnames($srf.getLpNames());
+//        schedulePlanRuleResult.setGidindex(String.valueOf($lpindex));
+//        schedulePlanRuleResult.setEcids($srf.getRyConfigIds());
+//        schedulePlanRuleResult.setEcdbbms($srf.getRyDbbms());
+//        schedulePlanRuleResult.setEcindex(String.valueOf($ryindex));
+//        schedulePlanRuleResult.setScheduleDate($csd2.toDate());
+//
+//        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
         log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
             $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);