Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

廖磊
2 parents 0b70499d 4a9bde17
Showing 14 changed files with 742 additions and 26 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/repository/sys/DutyEmployeeRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.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/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResults_output.java
src/main/java/com/bsth/service/sys/impl/DutyEmployeeServiceImpl.java
src/main/resources/rules/functions.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/ttinfo.drl
@@ -35,6 +35,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findByLines(lines);
 	}
+	@RequestMapping(value = "/car")
+	public List<ScheduleRealInfo> findByCar(String nbbm){
+		return dayOfSchedule.findByNbbm(nbbm);
+	}
+
 	/**
 	 * 
 	 * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id
@@ -46,7 +46,7 @@ public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    //按线路分组的 “计划” 排班数据
+    //按线路分组的 “原始计划” 排班数据
     public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
     // 按车辆分组的班次数据
@@ -463,6 +463,9 @@ public class ScheduleRealInfo {
 	public void setJhlc(Double jhlc) {
 		this.jhlc = jhlc;
+		//临加班次 计划公里 和 实际计划公里一样
+		if(this.isSflj())
+			this.setJhlcOrig(this.getJhlc());
 	}
 	public String getSjlc() {
@@ -33,15 +33,15 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "info.lp_name as lpName, " +
             "info.cl as clId, " +
             "info.cl_zbh as clZbh, " +
-            "group_concat(info.fcsj) ccsj, " +
-            "group_concat(info.bc_type) bctype, " +
+            "group_concat(info.fcsj order by info.fcno) ccsj, " +
+            "group_concat(info.bc_type order by info.fcno) bctype, " +
             "group_concat(distinct info.j) jsyId, " +
             "group_concat(distinct info.j_gh) jsyGh, " +
             "group_concat(distinct info.j_name) jsyName, " +
             "group_concat(distinct info.s) spyId, " +
             "group_concat(distinct info.s_gh) spyGh, " +
             "group_concat(distinct info.s_name) spyName, " +
-            "group_concat(info.fcno) fcno, " +
+            "group_concat(info.fcno order by info.fcno) fcno, " +
             "max(info.update_date) as updateDate, " +
             "max(user.user_name) as updateUserName, " +
             "max(info.tt_info_name) as ttInfoName " +
@@ -49,7 +49,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "where info.xl = ?1 and " +
             "info.schedule_date = ?2 " +
             "group by info.xl_name, info.schedule_date, info.lp, info.lp_name, info.cl, info.cl_zbh " +
-            "order by info.xl_name, info.schedule_date, info.lp, info.fcno ", nativeQuery = true)
+            "order by info.xl_name, info.schedule_date, info.lp ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
     @Modifying
@@ -13,6 +13,7 @@ import java.util.List;
 @Repository
 public interface DutyEmployeeRepository extends BaseRepository<DutyEmployee, Long>{
-    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
-    List<DutyEmployee> findByLineAndTime(String lineCode, long st, long et);
+    //@Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts > ?2 and t.ts < ?3")
+    @Query("select t from DutyEmployee t where t.codeIdx like %?1% and t.ts < ?2")
+    List<DutyEmployee> findByLineAndTime(String lineCode, long et);
 }
@@ -341,7 +341,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             t.setLate(false);
             t.setDfsj(t.getFcsj());
             t.setZdsjT(sdfyyyyMMddHHmm.parse(schDate + t.getZdsj()).getTime());
-
+            t.setJhlcOrig(t.getJhlc());
             //班次历时
             t.setBcsj(DateUtils.calcHHmmDiff(t.getFcsj(), t.getZdsj()) / 1000 / 60);
@@ -1066,8 +1066,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if (StringUtils.isNotEmpty(jhlc)) {
                     if(Double.parseDouble(jhlc) == 0 && sch.getJhlcOrig() != 0)
                         destroy(sch.getId() + "", "", map.get("adjustExps").toString());
-                    else
+                    else{
                         sch.setJhlc(Double.parseDouble(jhlc));
+                    }
                 }
             }
@@ -15,9 +15,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
-import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
-import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
+import com.bsth.service.schedule.rules.ttinfo.*;
 import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
 import com.bsth.service.schedule.rules.ttinfo2.Result;
 import org.joda.time.DateTime;
@@ -96,7 +94,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * 循环规则输出。
      * @param schedulePlan
      */
-    private ScheduleResults_output loopRuleOutput(SchedulePlan schedulePlan) {
+    private ScheduleResults_output loopRuleOutput(SchedulePlan schedulePlan, LpInfoResults_output lpInfoResults_output) {
         // 获取主线路
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
@@ -126,6 +124,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
             session.insert(scheduleRule_input);
         }
+        for (LpInfoResult_output lpInfoResult_output: lpInfoResults_output.getLpInfoResult_outputs()) {
+            session.insert(lpInfoResult_output);
+        }
         // 执行rule
         session.fireAllRules();
@@ -138,11 +139,11 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     }
     /**
-     * 时刻表选择（判定每天使用的时刻表）。
+     * 时刻表选择（判定每天使用的时刻表，以及路牌数据输出）。
      * @param schedulePlan
-     * @return
+     * @return TTInfoResults_output, LpInfoResults_output
      */
-    private TTInfoResults_output ttInfoOutput(SchedulePlan schedulePlan) {
+    private Object[] ttInfoOutput(SchedulePlan schedulePlan) {
         // 获取线路的所有未作废的时刻表
         List<TTInfo> ttInfos = getTTInfos(schedulePlan.getXl().getId());
@@ -156,6 +157,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 );
         // 规则输出数据
         TTInfoResults_output ttInfoResults_output = new TTInfoResults_output();
+        LpInfoResults_output lpInfoResults_output = new LpInfoResults_output();
         // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
         // 创建session，内部配置的是stateful
@@ -163,8 +165,11 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 设置gloable对象，在drl中通过别名使用
         session.setGlobal("results", ttInfoResults_output);
+        session.setGlobal("lpInfoResults_output", lpInfoResults_output);
         session.setGlobal("log", logger); // 设置日志
+        session.setGlobal("tTInfoDetailService", ttInfoDetailService);
+
         // 载入数据
         session.insert(ttInfoCalcuParam_input);
         for (TTInfo ttInfo : ttInfos) {
@@ -178,7 +183,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
-        return ttInfoResults_output;
+        return new Object[] {ttInfoResults_output, lpInfoResults_output};
     }
@@ -225,19 +230,39 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save2(SchedulePlan schedulePlan) {
-        // 1、循环规则计算输出
-        ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan);
-        // 2、时刻表选择
-        TTInfoResults_output ttInfoResults_output = ttInfoOutput(schedulePlan);
+        // 1、时刻表数据及每日路牌数据计算
+        Object[] ttInfoRets = ttInfoOutput(schedulePlan);
+        TTInfoResults_output ttInfoResults_output = (TTInfoResults_output) ttInfoRets[0];
+        LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
+
+        // 2、循环规则计算输出
+        ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
+
         // 3、计划输出
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
-        schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
         schedulePlan.setTtInfoId("todo"); // TODO：待修正
         schedulePlan.setTtInfoNames("todo"); // TODO：待修正
+        schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
+
         super.save(schedulePlan);
+
+
+//        // 1、循环规则计算输出
+//        ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan);
+//        // 2、时刻表选择
+//        TTInfoResults_output ttInfoResults_output = ttInfoOutput(schedulePlan);
+//        // 3、计划输出
+//        PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
+//
+//        schedulePlan.getSchedulePlanInfoList().addAll(planResult.getSchedulePlanInfos());
+//        schedulePlan.setTtInfoId("todo"); // TODO：待修正
+//        schedulePlan.setTtInfoNames("todo"); // TODO：待修正
+//
+//        super.save(schedulePlan);
+
         return new SchedulePlan();
     }
+package com.bsth.service.schedule.rules.ttinfo;
+
+import org.joda.time.DateTime;
+
+/**
+ * 每日路爬信息。
+ */
+public class LpInfoResult_output {
+    /** 具体日期 */
+    private DateTime dateTime;
+    /** 路牌Id */
+    private String lpId;
+    /** 线路Id */
+    private String xlId;
+    /** 时刻表Id */
+    private String ttInfoId;
+
+    public DateTime getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(DateTime dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getLpId() {
+        return lpId;
+    }
+
+    public void setLpId(String lpId) {
+        this.lpId = lpId;
+    }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
+
+    public String getTtInfoId() {
+        return ttInfoId;
+    }
+
+    public void setTtInfoId(String ttInfoId) {
+        this.ttInfoId = ttInfoId;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 路牌信息统计函数。
+ */
+public class LpInfoResultsFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class LpInfoResultsData implements Externalizable {
+        public List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
+        public Map<Long, LpInfoResult_output> lpInfoResult_outputMap = new HashMap<>();
+        public TTInfoDetail ttInfoDetail;
+
+        public LpInfoResultsData() {}
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(lpInfoResult_outputs);
+            out.writeObject(ttInfoDetail);
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            lpInfoResult_outputs = (List<LpInfoResult_output>) in.readObject();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new LpInfoResultsData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        lpInfoResultsData.lpInfoResult_outputs = new ArrayList<>();
+        lpInfoResultsData.lpInfoResult_outputMap = new HashMap<>();
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getLp() != null) {
+            if (lpInfoResultsData.lpInfoResult_outputMap.get(ttInfoDetail.getLp().getId()) == null) {
+                LpInfoResult_output lpInfoResult_output = new LpInfoResult_output();
+                lpInfoResult_output.setLpId(String.valueOf(ttInfoDetail.getLp().getId()));
+                lpInfoResult_output.setXlId(String.valueOf(ttInfoDetail.getXl().getId()));
+                lpInfoResult_output.setTtInfoId(String.valueOf(ttInfoDetail.getTtinfo().getId()));
+
+                lpInfoResultsData.lpInfoResult_outputMap.put(
+                        ttInfoDetail.getLp().getId(),
+                        lpInfoResult_output);
+            }
+        }
+
+        lpInfoResultsData.lpInfoResult_outputs.clear();
+        lpInfoResultsData.lpInfoResult_outputs.addAll(
+                lpInfoResultsData.lpInfoResult_outputMap.values());
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public void reverse(Serializable context, Object value) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        lpInfoResultsData.lpInfoResult_outputMap.remove(ttInfoDetail.getLp().getId());
+
+        lpInfoResultsData.lpInfoResult_outputs.clear();
+        lpInfoResultsData.lpInfoResult_outputs.addAll(
+                lpInfoResultsData.lpInfoResult_outputMap.values());
+
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        LpInfoResultsData lpInfoResultsData = (LpInfoResultsData) context;
+        return lpInfoResultsData.lpInfoResult_outputs;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return List.class;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by xu on 17/3/21.
+ */
+public class LpInfoResults_output {
+
+    private List<LpInfoResult_output> lpInfoResult_outputs = new ArrayList<>();
+
+    public List<LpInfoResult_output> getLpInfoResult_outputs() {
+        return lpInfoResult_outputs;
+    }
+
+    public void setLpInfoResult_outputs(List<LpInfoResult_output> lpInfoResult_outputs) {
+        this.lpInfoResult_outputs = lpInfoResult_outputs;
+    }
+
+    public void add(LpInfoResult_output lpInfoResult_output) {
+
+    }
+}
@@ -39,6 +39,6 @@ public class DutyEmployeeServiceImpl extends BaseServiceImpl&lt;DutyEmployee, Long&gt;
      */
     public List<DutyEmployee> getDutyEmployee(String lineCode, String startTime, String endTime) {
         DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm");
-        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",", fmtyyyyMMddHHmm.parseMillis(startTime), fmtyyyyMMddHHmm.parseMillis(endTime));
+        return dutyEmployeeRepository.findByLineAndTime(lineCode + ",",  fmtyyyyMMddHHmm.parseMillis(endTime));
     }
 }
@@ -2,4 +2,5 @@ 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;
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.shiftloop.GidFbTimeFunction gidfbtime;
+import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 \ No newline at end of file
+package com.bsth.service.schedule.shiftloop;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
+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 org.slf4j.Logger;
+
+global Logger log;
+global ScheduleResults_output scheduleResult;
+
+/*
+    存在（翻班格式）
+*/
+
+//------------------------- 第一阶段、计算规则准备数据（天数） ----------------------------//
+
+declare Calcu_days_result_pre
+    ruleId: String // 规则Id
+
+    calcu_index_lp : Integer // 计算之后路牌的起始索引
+    calcu_index_ry : Integer // 计算之后人员的起始索引
+
+    // 1、第一部分循环需要用到的数据（当开始日期大于启用日期的时候才有）
+    calcu_start_date_1: DateTime // 第一部分开始计算日期
+    calcu_end_date_1: DateTime // 第一部分结束计算日期
+
+    // 2、第二部分循环需要用到的数据
+    sdays : Integer // 总共需要排班的天数
+    calcu_start_date_2 : DateTime // 开始计算日期
+    calcu_end_date_2 : DateTime // 结束计算日期
+
+end
+
+/*
+    计算启用日期，开始计算日期，结束计算日期，相差天数
+    1、规则启用日期小于开始计算日期
+    2、规则启用日期大于等于开始日期，小于等于结束日期
+*/
+// 1、启用日期 < 开始日期
+rule "calcu_days_1_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval($qyrq.isBefore($fromDate))
+    then
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($fromDate);
+        Period p2 = new Period($fromDate, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($fromDate);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        insert(cdrp);
+
+        log.info("总共需要排班的天数 sdays={} ruleId={}", (p2.getDays() + 1), $ruleId);
+
+end
+
+// 启用日期 属于 [开始日期，结束日期]
+rule "calcu_days_2_"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
+            $fromDate : fromDate,
+            $toDate : toDate
+        )
+        ScheduleRule_input(
+            $ruleId : ruleId, $qyrq : qyrq,
+            $lpindex : startGbdIndex, $ryindex: startEIndex)
+        eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
+    then
+        // 构造Calcu_days_result_pre，用于路牌
+        Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
+        cdrp.setRuleId($ruleId);
+        cdrp.setCalcu_index_lp($lpindex);
+        cdrp.setCalcu_index_ry($ryindex);
+        cdrp.setCalcu_start_date_1($qyrq);
+        cdrp.setCalcu_end_date_1($qyrq);
+        Period p2 = new Period($qyrq, $toDate, PeriodType.days());
+        cdrp.setSdays(p2.getDays() + 1);
+        cdrp.setCalcu_start_date_2($qyrq);
+        cdrp.setCalcu_end_date_2($toDate);
+
+        insert(cdrp);
+
+        log.info("总共需要排班的天数 sdays={} ruleId={}", (p2.getDays() + 1), $ruleId);
+
+end
+
+//------------------------- 第二阶段、计算规则准备数据2（第一组循环） ----------------------------//
+rule "Calcu_loop1_1_" // 时刻表的关联的路牌不存在，调整翻版规则
+    salience 900
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $gids: guideboardIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd1),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+        log.info("Calcu_loop1_1_ ruleId={}, calcu_index_lp/ry={}/{}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+rule "Calcu_loop1_2_" // 时刻表的关联路牌存在，就翻
+    salience 800
+    when
+        $cdrp: Calcu_days_result_pre(
+            calcu_start_date_1.isBefore(calcu_end_date_1),
+            $csd1: calcu_start_date_1,
+            $ced1: calcu_end_date_1,
+            $ruleId: ruleId
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $rangesize : guideboardIds.size()
+        )
+    then
+        $cdrp.setCalcu_start_date_1($csd1.plusDays(1));
+
+        log.info("Calcu_loop1_2_ ruleId={}, calcu_index_lp/ry={}/{}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry());
+
+        update($cdrp);
+end
+
+
+//----------------------- 路牌范围循环计算 ------------------------//
+
+//declare Calcu_guideboard_index_result
+//    ruleId : String // 规则Id
+//    calcu_index : Integer // 计算之后的起始索引
+//end
+//
+//// 启用日期等于开始日期
+//rule "calcu_guideboard_index_qyrq_eq_startrq"
+//    when
+//        $calcu_days_result : Calcu_days_result(
+//            qyrq_days == 0,
+//            $ruleId: ruleId
+//        )
+//        $scheduleRule_input : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $oindex : startGbdIndex
+//        )
+//    then
+//        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
+//        cgir.setRuleId($ruleId);
+//        cgir.setCalcu_index($oindex);
+//
+//        log.info("calcu_guideboard_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+//
+//        insert(cgir);
+//end
+//
+//// 开始日期大于启用日期
+//rule "calcu_guideboard_index_startrq_gt_qyrq"
+//    when
+//        $calcu_days_result : Calcu_days_result(
+//            qyrq_days > 0,
+//            $ruleId: ruleId, $qyrq_days: qyrq_days,
+//            $calcu_start_date: calcu_start_date
+//        )
+//        $scheduleRule_input : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $qyrq: qyrq,
+//            $rangesize : guideboardIds.size(),
+//            $oindex : startGbdIndex,
+//            $weekdays: weekdays
+//        )
+//    then
+//        // 开始时间
+//        DateTime initDate = $qyrq;
+//        int index = $oindex;
+//        int resultIndex = index;
+//
+//        while (!initDate.isAfter($calcu_start_date)) {
+//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+//                resultIndex = index;
+//                index = (index + 1) % $rangesize;
+//            }
+//            initDate = initDate.plusDays(1);
+//        }
+//
+//        Calcu_guideboard_index_result cgir = new Calcu_guideboard_index_result();
+//        cgir.setRuleId($ruleId);
+//        cgir.setCalcu_index(resultIndex);
+//
+//        log.info("calcu_guideboard_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+//
+//        insert(cgir);
+//end
+//
+////----------------------- 人员范围循环计算 ------------------------//
+//
+//declare Calcu_employee_index_result
+//    ruleId : String // 规则Id
+//    calcu_index : Integer // 计算之后的起始索引
+//end
+//
+//// 启用日期等于开始日期
+//rule "calcu_employee_index_qyrq_eq_startrq"
+//    when
+//        $calcu_days_result : Calcu_days_result(
+//            qyrq_days == 0,
+//            $ruleId: ruleId)
+//        $scheduleRule_input : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $oindex : startEIndex)
+//    then
+//        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
+//        cgir.setRuleId($ruleId);
+//        cgir.setCalcu_index($oindex);
+//
+//        log.info("calcu_employee_index_qyrq_eq_startrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+//
+//        insert(cgir);
+//end
+//
+//// 开始日期大于启用日期
+//rule "calcu_employee_index_startrq_gt_qyrq"
+//    when
+//        $calcu_days_result : Calcu_days_result(
+//            qyrq_days > 0,
+//            $ruleId: ruleId, $qyrq_days: qyrq_days,
+//            $calcu_start_date: calcu_start_date
+//        )
+//        $scheduleRule_input : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $qyrq: qyrq,
+//            $rangesize : employeeConfigIds.size(),
+//            $oindex : startEIndex,
+//            $weekdays: weekdays
+//        )
+//    then
+//        // 开始时间
+//        DateTime initDate = $qyrq;
+//        int index = $oindex;
+//        int resultIndex = index;
+//
+//        while (!initDate.isAfter($calcu_start_date)) {
+//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+//                resultIndex = index;
+//                index = (index + 1) % $rangesize;
+//            }
+//            initDate = initDate.plusDays(1);
+//        }
+//
+//        Calcu_employee_index_result cgir = new Calcu_employee_index_result();
+//        cgir.setRuleId($ruleId);
+//        cgir.setCalcu_index(resultIndex);
+//
+//        log.info("calcu_employee_index_startrq_gt_qyrq ruleId={}, calcu_index={}", $ruleId, cgir.getCalcu_index());
+//
+//        insert(cgir);
+//
+//end
+//
+////------------------------- 第三阶段、循环计算 ------------------------//
+//
+////----------------------- 路牌范围循环计算 ------------------------//
+//declare loop_guideboard_result
+//    ruleId : String // 规则id
+//    go_list : List // 路牌循环的列表
+//end
+//
+//// 循环路牌计算
+//rule "Calcu_loop_guideboard_result"
+//    when
+//        Calcu_days_result(
+//            $ruleId: ruleId,
+//            $startDate : calcu_start_date,
+//            $calcu_end_date: calcu_end_date
+//        )
+//        $ruleData : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $rangesize : guideboardIds.size(),
+//            $weekdays: weekdays
+//        )
+//        $indexData : Calcu_guideboard_index_result(
+//            ruleId == $ruleId
+//        )
+//    then
+//        DateTime initDate = $startDate; // 开始时间
+//        DateTime endDate = $calcu_end_date; // 结束实际
+//        List<ScheduleResult_output> scheduleResult_outputs =
+//            new ArrayList<ScheduleResult_output>();
+//
+//        int i = $indexData.getCalcu_index();
+//        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
+//            i = (i + 1) % $rangesize;
+//        }
+//
+//        while (!initDate.isAfter(endDate)) {
+//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+//                ScheduleResult_output ro = new ScheduleResult_output();
+//                ro.setRuleId($ruleId);
+//                ro.setSd(initDate);
+//                ro.setGuideboardId($ruleData.getGuideboardIds().get(i));
+//                ro.setCarConfigId($ruleData.getCarConfigId());
+//                scheduleResult_outputs.add(ro);
+//
+//                i = (i + 1) % $rangesize;
+//            }
+//
+//            initDate = initDate.plusDays(1);
+//        }
+//
+//        loop_guideboard_result clgr = new loop_guideboard_result();
+//        clgr.setRuleId($ruleId);
+//        clgr.setGo_list(scheduleResult_outputs);
+//
+//        log.info(String.valueOf(scheduleResult_outputs.size()));
+//
+//        insert(clgr);
+//
+//end
+//
+////----------------------- 人员范围循环计算 ------------------------//
+//declare loop_employee_result
+//    ruleId : String // 规则id
+//    eo_list : List // 人员循环的列表
+//end
+//
+//// 循环人员计算
+//rule "Calcu_loop_employee_result"
+//    when
+//        Calcu_days_result(
+//            $ruleId: ruleId,
+//            $startDate : calcu_start_date,
+//            $calcu_end_date: calcu_end_date
+//        )
+//        $ruleData : ScheduleRule_input(
+//            ruleId == $ruleId,
+//            $rangesize : employeeConfigIds.size(),
+//            $weekdays: weekdays
+//        )
+//        $indexData : Calcu_employee_index_result(
+//            ruleId == $ruleId
+//        )
+//    then
+//        DateTime initDate = $startDate; // 开始时间
+//        DateTime endDate = $calcu_end_date; // 结束实际
+//        List<ScheduleResult_output> scheduleResult_outputs =
+//            new ArrayList<ScheduleResult_output>();
+//
+//        int i = $indexData.getCalcu_index();
+//        if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue() == false) {
+//            i = (i + 1) % $rangesize;
+//        }
+//
+//        while (!initDate.isAfter(endDate)) {
+//            if (((Boolean) $weekdays.get(initDate.getDayOfWeek() - 1)).booleanValue()) {
+//                ScheduleResult_output ro = new ScheduleResult_output();
+//                ro.setRuleId($ruleId);
+//                ro.setSd(initDate);
+//                ro.setEmployeeConfigId($ruleData.getEmployeeConfigIds().get(i));
+//                ro.setCarConfigId($ruleData.getCarConfigId());
+//                scheduleResult_outputs.add(ro);
+//
+//                i = (i + 1) % $rangesize;
+//            }
+//
+//            initDate = initDate.plusDays(1);
+//        }
+//
+//        loop_employee_result clgr = new loop_employee_result();
+//        clgr.setRuleId($ruleId);
+//        clgr.setEo_list(scheduleResult_outputs);
+//
+//        log.info(String.valueOf(scheduleResult_outputs.size()));
+//
+//        insert(clgr);
+//end
+//
+////------------------------- 第四阶段、范围组循环计算 ----------------------------//
+//
+//global ScheduleResults_output scheduleResult;
+//
+//rule "output"
+//    when
+//        loop_guideboard_result(
+//            go_list.size() > 0,
+//            $ruleId : ruleId, $go_list : go_list
+//        )
+//        loop_employee_result(
+//            ruleId == $ruleId,
+//            eo_list.size() == $go_list.size(),
+//            $eo_list : eo_list
+//        )
+//    then
+//        for (int i = 0; i < $go_list.size(); i++) {
+//            ScheduleResult_output go = (ScheduleResult_output) $go_list.get(i);
+//            ScheduleResult_output eo = (ScheduleResult_output) $eo_list.get(i);
+//            go.setEmployeeConfigId(eo.getEmployeeConfigId());
+//            scheduleResult.getResults().add(go);
+//        }
+//
+//end
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+
@@ -7,19 +7,39 @@ import com.bsth.service.schedule.rules.ttinfo.TTInfoCalcuParam_input;
 import com.bsth.service.schedule.rules.ttinfo.TTInfo_input;
 import com.bsth.service.schedule.rules.ttinfo.TTInfoResult_output;
 import com.bsth.service.schedule.rules.ttinfo.TTInfoResults_output;
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResult_output;
+import com.bsth.service.schedule.rules.ttinfo.LpInfoResults_output;
-import org.slf4j.Logger;
+import com.bsth.service.schedule.TTInfoDetailService;
+
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.schedule.TTInfoDetail;
+
+import org.slf4j.Logger
 // 全局日志
 global Logger log;
+// service
+global TTInfoDetailService tTInfoDetailService;
 // return输出
 global TTInfoResults_output results
+global LpInfoResults_output lpInfoResults_output
+
+function Map ttidParams(List ttinfolist) {
+    // 获取第一张时刻表id
+    TTInfo_input ttInfo_input = (TTInfo_input) ttinfolist.get(0);
+    Map param = new HashMap();
+    param.put("ttinfo.id_eq", Long.parseLong(ttInfo_input.getTtInfoId()));
+    return param;
+}
 /*
     TODO：规则说明，以后待说明
 */
+// TODO：
+
 //----------------- 第一阶段、计算规则准备数据（天数）----------------//
 declare Calcu_days_result
@@ -91,6 +111,7 @@ rule &quot;calcu_ttinfo_special_day&quot; // 特殊日期匹配
         $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)
+        $lpInfoResults: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailService.list(ttidParams($ttinfolist)), lpinforesult($ttd))
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -105,6 +126,13 @@ rule &quot;calcu_ttinfo_special_day&quot; // 特殊日期匹配
         Collections.sort($ttinfolist);
         results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+        // lp输出
+        for (int i = 0; i < $lpInfoResults.size(); i++) {
+            LpInfoResult_output lpInfoResult_output = (LpInfoResult_output) $lpInfoResults.get(i);
+            lpInfoResult_output.setDateTime($calcu_date); // 设定时间
+            lpInfoResults_output.getLpInfoResult_outputs().add(lpInfoResult_output);
+        }
+
         update($calcu_days_result);
 end
@@ -114,6 +142,7 @@ rule &quot;calcu_ttinfo_normal_day&quot; // 平日匹配
         $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)
+        $lpInfoResults: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailService.list(ttidParams($ttinfolist)), lpinforesult($ttd))
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -122,12 +151,19 @@ 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={} 时刻表个数={} 常规日期={} 星期几={} 路牌size={}", $xlId, $ttinfolist.size(), $calcu_date, $calcu_weekday, $lpInfoResults.size());
         // $ttinfolist按时间倒排序，result输出
         Collections.sort($ttinfolist);
         results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+        // lp输出
+        for (int i = 0; i < $lpInfoResults.size(); i++) {
+            LpInfoResult_output lpInfoResult_output = (LpInfoResult_output) $lpInfoResults.get(i);
+            lpInfoResult_output.setDateTime($calcu_date); // 设定时间
+            lpInfoResults_output.getLpInfoResult_outputs().add(lpInfoResult_output);
+        }
+
         update($calcu_days_result);
 end
@@ -137,6 +173,7 @@ rule &quot;calcu_ttinfo_other_day&quot; // 都没有的情况下，匹配
         $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)
+        $lpInfoResults: List() from accumulate ($ttd: TTInfoDetail() from tTInfoDetailService.list(ttidParams($ttinfolist)), lpinforesult($ttd))
     then
         // 更新Calcu_days_result对象
         int new_calcu_day = $calcu_day + 1;
@@ -151,6 +188,13 @@ rule &quot;calcu_ttinfo_other_day&quot; // 都没有的情况下，匹配
         Collections.sort($ttinfolist);
         results.addXlTTInfos($xlId, $calcu_date, $ttinfolist);
+        // lp输出
+        for (int i = 0; i < $lpInfoResults.size(); i++) {
+            LpInfoResult_output lpInfoResult_output = (LpInfoResult_output) $lpInfoResults.get(i);
+            lpInfoResult_output.setDateTime($calcu_date); // 设定时间
+            lpInfoResults_output.getLpInfoResult_outputs().add(lpInfoResult_output);
+        }
+
         update($calcu_days_result);
 end
 \ No newline at end of file