Update

徐烜
1 parent e38abc75
Showing 12 changed files with 432 additions and 32 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/MyDroolsConfiguration.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleService.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/rerun/RerunRule_param.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResult_output.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleResults_output.java
src/main/resources/rules/rerun.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/test/resources/testdata/problem.properties
@@ -164,6 +164,42 @@ public class SchedulePlanInfo {
     public SchedulePlanInfo() {}
+    public void setRerunInfo(CarConfigInfo cc, EmployeeConfigInfo ec) {
+        // 关联的车辆信息
+        this.cl = cc.getCl().getId(); // 车辆id
+        this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
+
+        // 关联的驾驶员
+        EmployeeConfigInfo employeeConfigInfo = ec;
+
+        this.j = employeeConfigInfo.getJsy().getId();
+//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+        if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+            String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+            if (jsy_temp.length > 1) {
+                this.jGh = jsy_temp[1];
+            } else {
+                this.jGh = jsy_temp[0];
+            }
+        }
+        this.jName = employeeConfigInfo.getJsy().getPersonnelName();
+        // 关联的售票员
+        if (employeeConfigInfo.getSpy() != null) {
+            this.s = employeeConfigInfo.getSpy().getId();
+//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                if (spy_temp.length > 1) {
+                    this.sGh = spy_temp[1];
+                } else {
+                    this.sGh = spy_temp[0];
+                }
+            }
+
+            this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+        }
+    }
+
     public SchedulePlanInfo(
             Line xl,
             ScheduleResult_output scheduleResult_output,
@@ -3,6 +3,8 @@ package com.bsth.entity.schedule.temp;
 import com.bsth.entity.schedule.SchedulePlan;
 import javax.persistence.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.Date;
 /**
@@ -72,6 +74,38 @@ public class SchedulePlanRuleResult {
         this.createDate = new Date();
     }
+    public static String generateInsertSql() {
+        String sql = "insert into bsth_c_s_sp_rule_rst" +
+                "(xl_id,xl_name,rule_id,cc_id,cc_zbh," +
+                "gids,gnames,gidindex,ecids,ecdbbms,ecindex," +
+                "ttinfo_id,ttinfo_name,schedule_date," +
+                "sysuser_id,sysuser_name,create_date) " +
+                "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+        return sql;
+    }
+
+    public void preparedStatementSet(PreparedStatement ps) throws SQLException {
+        ps.setInt(1, this.getXlId());
+        ps.setString(2, this.getXlName());
+        ps.setString(3, this.getRuleId());
+        ps.setString(4, this.getCcId());
+        ps.setString(5, this.getCcZbh());
+        ps.setString(6, this.getGids());
+        ps.setString(7, this.getGnames());
+        ps.setString(8, this.getGidindex());
+        ps.setString(9, this.getEcids());
+        ps.setString(10, this.getEcdbbms());
+        ps.setString(11, this.getEcindex());
+        ps.setString(12, this.getTtinfoId());
+        ps.setString(13, this.getTtinfoName());
+        ps.setDate(14, new java.sql.Date(this.getScheduleDate().getTime()));
+        ps.setString(15, this.getSysuserId());
+        ps.setString(16, this.getSysuserName());
+        ps.setTimestamp(17, new java.sql.Timestamp(this.getCreateDate().getTime()));
+
+    }
+
     public Long getId() {
         return id;
     }
@@ -2,6 +2,7 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.bsth.repository.BusinessRepository;
@@ -13,6 +14,7 @@ import com.bsth.service.schedule.rules.ScheduleRuleService;
 import com.bsth.service.schedule.rules.plan.PlanCalcuParam_input;
 import com.bsth.service.schedule.rules.plan.PlanResult;
 import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.rules.rerun.RerunRule_param;
 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;
@@ -102,6 +104,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 执行完毕销毁，有日志的也要关闭
         session.dispose();
+        // 保存循环规则结果数据
+        scheduleRuleService.generateRuleResult(scheduleResults_output.getSchedulePlanRuleResults());
+
 //        logger.info("循环规则输出={}", scheduleResults_output.showGuideboardDesc1());
         return scheduleResults_output;
@@ -217,15 +222,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param schedulePlan
      * @return
      */
-    private PlanResult SchedulePlanWithOutRerun(SchedulePlan schedulePlan) {
-        // pre、如果排班的数据之前已经有了，删除之前的数据
-        Date startpre = new Date();
-        scheduleRuleService.deelteSchedulePlanInfo(
-                schedulePlan.getXl().getId(),
-                schedulePlan.getScheduleFromTime(),
-                schedulePlan.getScheduleToTime());
-        Date endpre = new Date();
-
+    private PlanResult schedulePlanWithOutRerun(SchedulePlan schedulePlan) {
         // 1、时刻表数据及每日路牌数据计算
         Date start1 = new Date();
         Object[] ttInfoRets = ttInfoOutput(schedulePlan);
@@ -241,8 +238,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
         Date end3 = new Date();
-        logger.info("删除数据 {} ms，drool时刻表每日路牌计算 {} ms，drool循环规则计算 {} ms，drool计划数据 {} ms",
-                endpre.getTime() - startpre.getTime(),
+        logger.info("drool时刻表每日路牌计算 {} ms，drool循环规则计算 {} ms，drool计划数据 {} ms",
                 end1.getTime() - start1.getTime(),
                 end2.getTime() - start2.getTime(),
                 end3.getTime() - start3.getTime());
@@ -250,24 +246,99 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         return planResult;
     }
+    /**
+     * 套跑计划排班数据。
+     * @param planResult
+     */
+    private void rerunPlanResult(PlanResult planResult, SchedulePlan schedulePlan) {
+        List<RerunRule_input> rerunRule_inputs = scheduleRuleService.findRerunrule(Integer.parseInt(planResult.getXlId()));
+        logger.info("套跑数量 {} 组", rerunRule_inputs.size());
+
+        if (rerunRule_inputs.size() > 0) {
+            // 找出是对应路牌类型的线路，计算循环规则输出
+            Set<String> xlids = new HashSet<>();
+            for (RerunRule_input rerunRule_input: rerunRule_inputs) {
+                if ("dylp".equals(rerunRule_input.getType())) {
+                    xlids.add(rerunRule_input.getXl());
+                }
+            }
+
+            List<ScheduleResults_output> scheduleResults_outputs = new ArrayList<>();
+            Date start1 = new Date();
+            for (String xlid: xlids) {
+                schedulePlan.getXl().setId(Integer.parseInt(xlid)); // 套跑的线路默认跟着主线路设定走
+                // 获取套跑线路的循环规则计算输出
+                Object[] ttInfoRets = ttInfoOutput(schedulePlan);
+                LpInfoResults_output lpInfoResults_output = (LpInfoResults_output) ttInfoRets[1];
+                ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
+                scheduleResults_outputs.add(scheduleResults_output);
+            }
+
+            // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+            // 创建session，内部配置的是stateful
+            KieSession session = kieBase.newKieSession();
+
+            // 设置gloable对象，在drl中通过别名使用
+            session.setGlobal("planResult", planResult);
+            session.setGlobal("log", logger); // 设置日志
+
+            session.setGlobal("carConfigInfoRepository", carConfigInfoRepository);
+            session.setGlobal("employeeConfigInfoRepository", employeeConfigInfoRepository);
+
+            // 载入数据
+            RerunRule_param rerunRule_param = new RerunRule_param();
+            rerunRule_param.setMxlid(planResult.getXlId());
+            rerunRule_param.setXlIds_dylp(xlids);
+            session.insert(rerunRule_param);
+            for (RerunRule_input rri: rerunRule_inputs) {
+                session.insert(rri);
+            }
+            for (SchedulePlanInfo spi: planResult.getSchedulePlanInfos()) {
+                session.insert(spi);
+            }
+            for (ScheduleResults_output sro: scheduleResults_outputs) {
+                session.insert(sro);
+            }
+
+            // 执行rule
+            session.fireAllRules();
+
+            // 执行完毕销毁，有日志的也要关闭
+            session.dispose();
+
+            Date end1 = new Date();
+            logger.info("套跑规则计算，耗时 {} ms", end1.getTime() - start1.getTime());
+
+        }
+
+    }
+
     public SchedulePlan save(SchedulePlan schedulePlan) {
+        // pre、如果排班的数据之前已经有了，删除之前的数据
+        Date startpre = new Date();
+        scheduleRuleService.deelteSchedulePlanInfo(
+                schedulePlan.getXl().getId(),
+                schedulePlan.getScheduleFromTime(),
+                schedulePlan.getScheduleToTime());
+        Date endpre = new Date();
+
         // 1、查找线路，这是主线路
         Line xl = lineRepository.findOne(schedulePlan.getXl().getId());
         logger.info("<--- 排班master线路 id={}, name={}, 开始排班", xl.getId(), xl.getName());
         // 2、确定主线路排班（无套跑规则）
-        PlanResult planResult = SchedulePlanWithOutRerun(schedulePlan);
+        PlanResult planResult = schedulePlanWithOutRerun(schedulePlan);
-        // TODO 3、确定套跑规则
-        List<RerunRule_input> rerunRule_inputs = scheduleRuleService.findRerunrule(schedulePlan.getXl().getId());
-        logger.info("套跑数量 {} 组", rerunRule_inputs.size());
+        // 3、确定套跑规则
+        rerunPlanResult(planResult, schedulePlan);
         // 4、保存数据（jdbcTemplate 批量插入）
         Date start4 = new Date();
         scheduleRuleService.generateSchedulePlan(schedulePlan, planResult.getSchedulePlanInfos());
         Date end4 = new Date();
-        logger.info("保存主线路数据 {} 条 耗时 {} ms --->",
+        logger.info("删除数据 {} ms，保存主线路数据 {} 条 耗时 {} ms --->",
+                endpre.getTime() - startpre.getTime(),
                 planResult.getSchedulePlanInfos().size(),
                 end4.getTime() - start4.getTime());
@@ -71,6 +71,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/plan.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/plan.drl"), "UTF-8"));
+        kfs.write("src/main/resources/rerun.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/rerun.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
@@ -31,6 +31,12 @@ public interface ScheduleRuleService {
     void generateSchedulePlan(SchedulePlan schedulePlan, List<SchedulePlanInfo> schedulePlanInfos);
     /**
+     * 生成排班规则结果。
+     * @param schedulePlanRuleResults
+     */
+    void generateRuleResult(List<SchedulePlanRuleResult> schedulePlanRuleResults);
+
+    /**
      * 删除排班计划。
      * @param id 排班计划id
      */
@@ -71,10 +71,10 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                     rerunRule_input.setType(resultSet.getString("type"));
                     // 对应班次类型
-                    if ("dybc".equals(resultSet.getString("type"))) {
+                    if ("dylp".equals(resultSet.getString("type"))) {
                         rerunRule_input.setS_xl(String.valueOf(resultSet.getInt("s_dylp_xl")));
                         rerunRule_input.setS_lp(String.valueOf(resultSet.getLong("s_dylp_lp")));
-                    } else if ("dylp".equals(resultSet.getString("type"))) {
+                    } else if ("dybc".equals(resultSet.getString("type"))) {
                         rerunRule_input.setCl(resultSet.getInt("s_dybc_cl"));
                         rerunRule_input.setZbh(resultSet.getString("s_dybc_clzbh"));
                         rerunRule_input.setJ(resultSet.getInt("s_dybc_j"));
@@ -94,15 +94,6 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
         return rerunRule_inputs;
     }
-    public void test() {
-        jdbcTemplate.query("", new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet resultSet) throws SQLException {
-
-            }
-        });
-    }
-
     @Override
     public List<SchedulePlanRuleResult> findLastByXl(String xlid, Date from) {
         String sql = "select * from bsth_c_s_sp_rule_rst a " +
@@ -142,6 +133,35 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
         jdbcTemplate.update(sql, xlid, datefrom, dateto);
     }
+    @Override
+    public void generateRuleResult(List<SchedulePlanRuleResult> schedulePlanRuleResults) {
+        // 、批量插入排班规则结果
+        List<List<SchedulePlanRuleResult>> lists = new ArrayList<>();
+        int batchSize = 2000;
+        int loopCount = schedulePlanRuleResults.size() / batchSize;
+        int otherCount = schedulePlanRuleResults.size() % batchSize;
+        for (int i = 0; i < loopCount; i++) {
+            lists.add(schedulePlanRuleResults.subList(i * batchSize, i * batchSize + batchSize));
+        }
+        if (otherCount > 0) {
+            lists.add(schedulePlanRuleResults.subList(loopCount * batchSize, loopCount * batchSize + otherCount));
+        }
+
+        for (final List<SchedulePlanRuleResult> list : lists) {
+            jdbcTemplate.batchUpdate(SchedulePlanRuleResult.generateInsertSql(), new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+                    SchedulePlanRuleResult schedulePlanRuleResult = list.get(i);
+                    schedulePlanRuleResult.preparedStatementSet(preparedStatement);
+                }
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+        }
+    }
+
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
     public void generateSchedulePlan(final SchedulePlan schedulePlan, final List<SchedulePlanInfo> schedulePlanInfos) {
+package com.bsth.service.schedule.rules.rerun;
+
+import java.util.Set;
+
+/**
+ * Created by xu on 17/4/27.
+ */
+public class RerunRule_param {
+    /** 主线路id */
+    private String mxlid;
+
+    /** 对应路牌的套跑线路 */
+    private Set<String> xlIds_dylp;
+
+    // TODO：
+
+
+    public Set<String> getXlIds_dylp() {
+        return xlIds_dylp;
+    }
+
+    public void setXlIds_dylp(Set<String> xlIds_dylp) {
+        this.xlIds_dylp = xlIds_dylp;
+    }
+
+    public String getMxlid() {
+        return mxlid;
+    }
+
+    public void setMxlid(String mxlid) {
+        this.mxlid = mxlid;
+    }
+}
@@ -17,6 +17,9 @@ public class ScheduleResult_output {
     /** 车辆配置id */
     private String carConfigId;
+    /** 线路id */
+    private String xlId;
+
     public DateTime getSd() {
         return sd;
     }
@@ -56,4 +59,12 @@ public class ScheduleResult_output {
     public void setCarConfigId(String carConfigId) {
         this.carConfigId = carConfigId;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
 }
@@ -9,6 +9,9 @@ import java.util.*;
  * 输出结果集合。
  */
 public class ScheduleResults_output {
+    /** 线路Id */
+    private String xlid;
+
     /** 输出列表 */
     private List<ScheduleResult_output> results = new ArrayList<>();
@@ -71,5 +74,13 @@ public class ScheduleResults_output {
         return stringBuilder.toString();
     }
-    // TODO：人员输出
+    public String getXlid() {
+        return xlid;
+    }
+
+    public void setXlid(String xlid) {
+        this.xlid = xlid;
+    }
+
+// TODO：人员输出
 }
+package com.bsth.service.schedule.rerun;
+
+import org.joda.time.*;
+import java.util.*;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
+
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.rules.rerun.RerunRule_param;
+
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.repository.schedule.EmployeeConfigInfoRepository;
+
+import org.slf4j.Logger
+import com.bsth.entity.schedule.CarConfigInfo
+import java.util.HashMap
+import com.bsth.entity.schedule.EmployeeConfigInfo
+import com.bsth.entity.schedule.SchedulePlanInfo;
+
+// 全局日志类（一般使用调用此规则的service类）
+global Logger log;
+
+global CarConfigInfoRepository carConfigInfoRepository;
+global EmployeeConfigInfoRepository employeeConfigInfoRepository;
+
+// 输出
+
+
+/*
+    规则说明：
+    1、对应路牌规则：将对应路牌的车辆，人员替换指定的套跑班次已有的配置
+    2、对应班车规则：直接使用指定的人员，车辆替换指定的套跑班次已有的配置
+*/
+
+//-------------------- 第一阶段、计算对应路牌套跑的车辆配置，人员配置数据 -----------------//
+
+//--------------- 车辆配置信息载入 -------------//
+declare Dylp_CarConfig_Wraps
+    xlId: String // 线路Id
+    ccMap: Map // 车辆配置Map Map<id, CarConfigInfo>
+end
+
+rule "calcu_Dylp_CarConfig_Wraps"
+    salience 1000
+    when
+        $rp: RerunRule_param($xlId: mxlid)
+        $dylpxlid: String() from $rp.getXlIds_dylp()
+    then
+        List carConfigInfos =  carConfigInfoRepository.findByXlId(Integer.parseInt($xlId));
+
+        Dylp_CarConfig_Wraps carConfig_wraps = new Dylp_CarConfig_Wraps();
+        carConfig_wraps.setXlId($dylpxlid);
+        carConfig_wraps.setCcMap(new HashMap());
+
+        for (int i = 0; i < carConfigInfos.size(); i++) {
+            CarConfigInfo carConfigInfo = (CarConfigInfo) carConfigInfos.get(i);
+            carConfig_wraps.getCcMap().put(carConfigInfo.getId().toString(), carConfigInfo);
+        }
+
+        insert(carConfig_wraps);
+
+        log.info("calcu_Dylp_CarConfig_Wraps");
+
+end
+
+//--------------- 人员配置信息载入 --------------//
+declare Dylp_EmployeeConfig_Wraps
+    xlId: String // 线路Id
+    ecMap: Map // 人员配置Map Map<id, EmployeeConfigInfo>
+end
+
+rule "calcu_Dylp_EmployeeConfig_Wraps"
+    salience 1000
+    when
+        $rp: RerunRule_param($xlId: mxlid)
+        $dylpxlid: String() from $rp.getXlIds_dylp()
+    then
+        List employeeConfigInfos = employeeConfigInfoRepository.findByXlId(Integer.parseInt($xlId));
+
+        Dylp_EmployeeConfig_Wraps employeeConfig_wraps = new Dylp_EmployeeConfig_Wraps();
+        employeeConfig_wraps.setXlId($xlId);
+        employeeConfig_wraps.setEcMap(new HashMap());
+
+        for (int i = 0; i < employeeConfigInfos.size(); i++) {
+            EmployeeConfigInfo employeeConfigInfo = (EmployeeConfigInfo) employeeConfigInfos.get(i);
+            employeeConfig_wraps.getEcMap().put(employeeConfigInfo.getId().toString(), employeeConfigInfo);
+        }
+
+        insert(employeeConfig_wraps);
+
+        log.info("calcu_Dylp_EmployeeConfig_Wraps");
+
+end
+
+//-------------------- 第二阶段、包装对应路牌的循环规则输出 -----------------//
+
+declare Dylp_ScheduleResult_output_wrap
+    xlId: String // 线路
+    sd: DateTime // 日期
+    lp: String // 路牌
+    cc: CarConfigInfo // 使用的车辆配置
+    ec: EmployeeConfigInfo // 使用的人员配置
+end
+
+rule "calcu_Dylp_ScheduleResult_output_wrap"
+    salience 900
+    when
+        $sro: ScheduleResults_output($xlId: xlid)
+        $sr: ScheduleResult_output() from $sro.getResults()
+        Dylp_CarConfig_Wraps(xlId == $xlId, $ccmap: ccMap)
+        Dylp_EmployeeConfig_Wraps(xlId == $xlId, $ecmap: ecMap)
+    then
+        Dylp_ScheduleResult_output_wrap wrap = new Dylp_ScheduleResult_output_wrap();
+        wrap.setXlId($xlId);
+        wrap.setSd($sr.getSd());
+        wrap.setLp($sr.getGuideboardId());
+        wrap.setCc((CarConfigInfo) $ccmap.get($sr.getCarConfigId()));
+        wrap.setEc((EmployeeConfigInfo) $ecmap.get($sr.getEmployeeConfigId()));
+
+        insert(wrap);
+end
+
+//-------------------- 第三阶段、套跑线路，替换班次的车辆，人员 --------------------//
+rule "calcu_Dylp_rerun_update"
+    salience 800
+//    no-loop
+    when
+        $spi: SchedulePlanInfo($xlid: xl, $sd: scheduleDate, $lp: lp, $fcsj: fcsj, $ttinfo: ttInfo)
+        $ri: RerunRule_input(
+            type == "dylp",
+            xl == $xlid.toString(),
+            ttinfo == $ttinfo.toString(),
+            lp == $lp.toString(),
+            fcsj == $fcsj,
+            $sxl: s_xl, $slp: s_lp
+        )
+        $dsro: Dylp_ScheduleResult_output_wrap(
+            xlId == $sxl,
+            lp == $slp,
+            sd.getMillis() == $sd.getTime()
+        )
+    then
+//        log.info("TODO：测试 {}", $fcsj);
+
+        $spi.setRerunInfo($dsro.getCc(), $dsro.getEc());
+
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,13 +55,16 @@ rule &quot;calcu_days_1_&quot;
         ScheduleCalcuParam_input(
             fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
             $fromDate : fromDate,
-            $toDate : toDate
+            $toDate : toDate,
+            $xlId: xlId
         )
         ScheduleRule_input(
             $ruleId : ruleId, $qyrq : qyrq,
             $lpindex : startGbdIndex, $ryindex: startEIndex)
         eval($qyrq.isBefore($fromDate))
     then
+        scheduleResult.setXlid($xlId);
+
         // 构造Calcu_days_result_pre，用于路牌
         Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
         cdrp.setRuleId($ruleId);
@@ -87,13 +90,16 @@ rule &quot;calcu_days_2_&quot;
         ScheduleCalcuParam_input(
             fromDate.isBefore(toDate) || fromDate.isEqual(toDate),
             $fromDate : fromDate,
-            $toDate : toDate
+            $toDate : toDate,
+            $xlId: xlId
         )
         ScheduleRule_input(
             $ruleId : ruleId, $qyrq : qyrq,
             $lpindex : startGbdIndex, $ryindex: startEIndex)
         eval((!$qyrq.isBefore($fromDate)) && (!$qyrq.isAfter($toDate)))
     then
+        scheduleResult.setXlid($xlId);
+
         // 构造Calcu_days_result_pre，用于路牌
         Calcu_days_result_pre cdrp = new Calcu_days_result_pre();
         cdrp.setRuleId($ruleId);
@@ -243,7 +249,7 @@ end
 rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
     salience 800
     when
-        ScheduleCalcuParam_input($sp: schedulePlan)
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
         $cdrp: Calcu_days_result_pre(
             calcu_start_date_1.isEqual(calcu_end_date_1),
             calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
@@ -276,6 +282,7 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
         ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
         ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
         scheduleResult.getResults().add(ro);
@@ -313,7 +320,7 @@ end
 rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
     salience 800
     when
-        ScheduleCalcuParam_input($sp: schedulePlan)
+        ScheduleCalcuParam_input($sp: schedulePlan, $xlid: xlId)
         $cdrp: Calcu_days_result_pre(
             calcu_start_date_1.isEqual(calcu_end_date_1),
             calcu_start_date_2.isBefore(calcu_end_date_2) || calcu_start_date_2.isEqual(calcu_end_date_2),
@@ -337,6 +344,7 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
         ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
         ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
         ro.setCarConfigId($cid);
+        ro.setXlId($xlid);
         scheduleResult.getResults().add(ro);
@@ -14,4 +14,5 @@
 14=路牌编号自动生成
 15=时刻表导入的时候表头后面不需要加数字
 16=时间框中文
+17=人员工号前公司编码自动加