Update

徐烜
1 parent de846074
Showing 10 changed files with 364 additions and 87 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/schedule/ScheduleRule1FlatRepository.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/shiftloop/ScheduleResult_output.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_Type.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
src/main/resources/rules/plan.drl
src/main/resources/rules/ruleWrap.drl
src/main/resources/rules/shiftloop_fb_2.drl
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
 import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
 import org.apache.commons.lang3.StringUtils;
 import javax.persistence.*;
@@ -267,7 +268,8 @@ public class SchedulePlanInfo extends BEntity {
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan,
             boolean isFirstBc, // 是否第一个班次
-            boolean isLastBc // 是否最后一个班次
+            boolean isLastBc, // 是否最后一个班次
+            ScheduleRule_Type sType // 类型
         ) {
         // TODO：关联的公司名称
@@ -294,47 +296,51 @@ public class SchedulePlanInfo extends BEntity {
         this.lpName = ttInfoDetail.getLp().getLpName();
         // 关联的车辆信息
-        this.cl = carConfigInfo.getCl().getId(); // 车辆id
-        this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
+        if (sType == ScheduleRule_Type.NORMAL) {
+            this.cl = carConfigInfo.getCl().getId(); // 车辆id
+            this.clZbh = carConfigInfo.getCl().getInsideCode(); // 自编号/内部编号
+        }
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
-        EmployeeConfigInfo employeeConfigInfo = null;
-        if (isFb) {
-            if (employeeConfigInfoList.size() > 1) {
-                employeeConfigInfo = employeeConfigInfoList.get(1);
+        if (sType == ScheduleRule_Type.NORMAL) {
+            EmployeeConfigInfo employeeConfigInfo = null;
+            if (isFb) {
+                if (employeeConfigInfoList.size() > 1) {
+                    employeeConfigInfo = employeeConfigInfoList.get(1);
+                } else {
+                    employeeConfigInfo = employeeConfigInfoList.get(0);
+                }
             } else {
                 employeeConfigInfo = employeeConfigInfoList.get(0);
             }
-        } else {
-            employeeConfigInfo = employeeConfigInfoList.get(0);
-        }
-        this.j = employeeConfigInfo.getJsy().getId();
+            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];
+            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.sGh = spy_temp[0];
+                    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();
+                this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+            }
         }
         // 时刻明细数据
@@ -360,42 +366,44 @@ public class SchedulePlanInfo extends BEntity {
         this.remark = ttInfoDetail.getRemark();
         // 使用车辆配置的停车场信息
-        String pzType = carConfigInfo.getPzType(); // 配置类型
-        if (pzType != null && !pzType.equals("BSY")) {
-            if ("ZW".equals(pzType)) { // 只看早晚进出场
-                if (isFirstBc) { // 第一个班次是出场
+        if (sType == ScheduleRule_Type.NORMAL) {
+            String pzType = carConfigInfo.getPzType(); // 配置类型
+            if (pzType != null && !pzType.equals("BSY")) {
+                if ("ZW".equals(pzType)) { // 只看早晚进出场
+                    if (isFirstBc) { // 第一个班次是出场
 //                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
-                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
-                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+                        this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                        this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
-                } else if (isLastBc) { // 最后一个班次是进场
+                    } else if (isLastBc) { // 最后一个班次是进场
 //                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
-                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
-                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+                        this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                        this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
-                }
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                    }
-            } else if ("FS".equals(pzType)) { // 所有进出场
-                if ("out".equals(this.bcType)) { // 出场班次
+                } else if ("FS".equals(pzType)) { // 所有进出场
+                    if ("out".equals(this.bcType)) { // 出场班次
 //                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
-                    this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
-                    this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
+                        this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
+                        this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpOutLc() : carConfigInfo.getDownOutLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
-                } else if ("in".equals(this.bcType)) {
+                    } else if ("in".equals(this.bcType)) {
 //                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
-                    this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
-                    this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
+                        this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
+                        this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
-                    this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
-                    this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                        this.jhlc = "0".equals(this.xlDir) ? carConfigInfo.getUpInLc() : carConfigInfo.getDownInLc();
+                        this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpInSj().intValue() : carConfigInfo.getDownInSj().intValue();
+                    }
                 }
             }
         }
@@ -29,4 +29,6 @@ public interface ScheduleRule1FlatRepository extends BaseRepository&lt;ScheduleRule
     ScheduleRule1Flat findOneExtend(Long aLong);
     List<ScheduleRule1Flat> findByXl(Line line);
+
+    List<ScheduleRule1Flat> findByXlId(Integer id);
 }
@@ -30,6 +30,7 @@ import org.kie.api.runtime.KieSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -43,7 +44,13 @@ import java.util.*;
 @Service
 public class SchedulePlanServiceImpl extends BServiceImpl<SchedulePlan, Long> implements SchedulePlanService {
     @Autowired
+    @Qualifier("kb1")
     private KieBase kieBase;
+
+    @Autowired
+    @Qualifier("kb2")
+    private KieBase kieBase2;
+
     @Autowired
     private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
     @Autowired
@@ -60,11 +67,49 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private BusinessRepository businessRepository;
     @Autowired
     private ScheduleRuleService scheduleRuleService;
+    @Autowired
+    private RerunRuleRepository rerunRuleRepository;
     /** 日志记录器 */
     private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
     /**
+     * 计算规则输入。
+     * @param schedulePlan
+     * @return
+     */
+    private List<ScheduleRule_input> calcuSrfList(SchedulePlan schedulePlan) {
+        // 1-1、构造drools规则输入数据，输出数据
+        // 全局计算参数
+        ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
+
+        // 规则输出数据
+        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
+
+        // 1-2、构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = kieBase2.newKieSession();
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("sriList", scheduleRule_inputs);
+        session.setGlobal("log", logger); // 设置日志
+
+        session.setGlobal("srf", scheduleRule1FlatRepository);
+        session.setGlobal("rrr", rerunRuleRepository);
+        session.setGlobal("srservice", scheduleRuleService);
+
+        // 载入数据
+        session.insert(scheduleCalcuParam_input);
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+        return scheduleRule_inputs;
+    }
+
+    /**
      * 循环规则输出。
      * @param schedulePlan 排班计划对象
      * @param lpInfoResults_output 时刻表每日路牌的情况
@@ -76,13 +121,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         // 全局计算参数
         ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
         // 每个规则对应的输入参数
-        List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
-        List<ScheduleRule1Flat> scheduleRule1Flats = scheduleRule1FlatRepository.findByXl(schedulePlan.getXl());
-
-        for (ScheduleRule1Flat scheduleRule1Flat: scheduleRule1Flats) {
-            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat);
-            scheduleRule_inputs.add(scheduleRule_input);
-        }
+        List<ScheduleRule_input> scheduleRule_inputs = calcuSrfList(schedulePlan);
         // 规则输出数据
         ScheduleResults_output scheduleResults_output = new ScheduleResults_output();
@@ -28,7 +28,7 @@ public class MyDroolsConfiguration {
      * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
      * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
      */
-    @Bean
+    @Bean(name = "kb1")
     public KieBase myKieBase() {
         // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
         // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
@@ -100,4 +100,65 @@ public class MyDroolsConfiguration {
         return kieBase;
     }
+
+    /**
+     * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
+     * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
+     */
+    @Bean(name = "kb2")
+    public KieBase myKieBase2() {
+        // Drools 6开始引入kie统一接口（jboss的jbpm工作流也使用kie接口了），整个定义方式和5差别很大
+        // 这里使用全api方式创建知识库对象，不使用xml的方式，提供最大的灵活性
+
+        // 1、创建kieservices
+        KieServices kieServices = KieServices.Factory.get();
+        // 2、创建KieModuleModel，默认是由kmodule.xml的方式创建，这里使用api方式闯将
+        KieModuleModel kieModuleModel = kieServices.newKieModuleModel();
+        // 2.1、创建KieBaseModel，类似kmodule.xml中的kbase标签
+        KieBaseModel kieBaseModel1 = kieModuleModel.newKieBaseModel("KBase2")
+                .setDefault(true)
+                .setEqualsBehavior(EqualityBehaviorOption.EQUALITY)
+                .setEventProcessingMode(EventProcessingOption.STREAM);
+        // 2.2、创建与kbase关联的KieSessionModel，类似kmodule.xml中的kbase内的ksession标签
+        kieBaseModel1.newKieSessionModel("KSession1")
+                .setDefault(true)
+                .setType(KieSessionModel.KieSessionType.STATEFUL)
+                .setClockType(ClockTypeOption.get("realtime"));
+
+        // 3、创建KieFileSystem，将模型xml，drl等写入，TODO：以后考虑从数据库中获取
+        KieFileSystem kfs = kieServices.newKieFileSystem();
+        // 3.1、写入KieBaseModel（内部包含了KieSessionModel的内容了，注意之前的KieSessionModel的创建方式）
+        kfs.writeKModuleXML(kieModuleModel.toXML());
+
+        // 3.2、写入drl（写法超多，有点混乱）
+        // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
+        // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
+
+        kfs.write("src/main/resources/ruleWrap.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/ruleWrap.drl"), "UTF-8"));
+
+        // TODO：还有其他drl....
+
+        // 4、创建KieBuilder，使用KieFileSystem构建
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
+        Results results = kieBuilder.getResults();
+        if (results.hasMessages(Message.Level.ERROR))
+            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+//        if (results.hasMessages(Message.Level.ERROR)) {
+//            logger.info("构建drools6错误：" + results.getMessages());
+//            return null;
+//        }
+
+        // 5、获取KieContainer
+        // TODO：ReleaseId用处很大，以后再议
+        ReleaseId releaseId = kieServices.getRepository().getDefaultReleaseId();
+        KieContainer kieContainer = kieServices.newKieContainer(releaseId);
+
+        // 6、创建kbase
+        KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration();
+        KieBase kieBase = kieContainer.newKieBase("KBase2", kieBaseConfiguration);
+
+        return kieBase;
+    }
 }
@@ -20,6 +20,9 @@ public class ScheduleResult_output {
     /** 线路id */
     private String xlId;
+    /** 排班输入规则类型 */
+    private ScheduleRule_Type sType = ScheduleRule_Type.NORMAL;
+
     public DateTime getSd() {
         return sd;
     }
@@ -67,4 +70,12 @@ public class ScheduleResult_output {
     public void setXlId(String xlId) {
         this.xlId = xlId;
     }
+
+    public ScheduleRule_Type getsType() {
+        return sType;
+    }
+
+    public void setsType(ScheduleRule_Type sType) {
+        this.sType = sType;
+    }
 }
+package com.bsth.service.schedule.rules.shiftloop;
+
+/**
+ * 排班规则_输入_输出_类型。
+ */
+public enum ScheduleRule_Type {
+    NORMAL, // 正常类型
+    // 套跑类型，使用套跑规则当作实际规则。
+    // 有的线路所有路牌都没有规则，或者只有部份规则，
+    // 则需要先补充temp规则，路牌id，人员配置id，车辆配置id都设为'NULL'
+    // 最后套跑规则重新排班覆盖temp规则
+    RERUN
+}
@@ -37,6 +37,9 @@ public class ScheduleRule_input {
     /** 车辆翻版（周一到周日是否启用） */
     private List<Boolean> weekdays = new ArrayList<>();
+    /** 排班输入规则类型 */
+    private ScheduleRule_Type sType = ScheduleRule_Type.NORMAL;
+
     /** 关联的原始规则 */
     private ScheduleRule1Flat self;
@@ -164,4 +167,11 @@ public class ScheduleRule_input {
         this.self = self;
     }
+    public ScheduleRule_Type getsType() {
+        return sType;
+    }
+
+    public void setsType(ScheduleRule_Type sType) {
+        this.sType = sType;
+    }
 }
@@ -27,7 +27,8 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import org.slf4j.Logger
 import org.joda.time.format.DateTimeFormat
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
 // 全局日志类（一般使用调用此规则的service类）
@@ -385,9 +386,11 @@ rule &quot;Calcu_SchedulePlanInfo&quot;
             // 路牌
             String gid = sro.getGuideboardId();
             // 车辆配置
-            CarConfigInfo carConfigInfo = (CarConfigInfo) $ccs.getCcMap().get(sro.getCarConfigId());
+            CarConfigInfo carConfigInfo = sro.getsType() == ScheduleRule_Type.NORMAL ?
+                (CarConfigInfo) $ccs.getCcMap().get(sro.getCarConfigId()) : null;
             // 人员配置
-            List eclist = ecList(employeeConfigInfoRepository, sro.getEmployeeConfigId());
+            List eclist = sro.getsType() == ScheduleRule_Type.NORMAL ?
+                ecList(employeeConfigInfoRepository, sro.getEmployeeConfigId()) : null;
             // 时刻表id
             String ttInfoId = ttInfoId_sd($lr.getTtInfoMapLoop(), sd);
@@ -419,7 +422,8 @@ rule &quot;Calcu_SchedulePlanInfo&quot;
                     eclist,
                     $param.getSchedulePlan(),
                     wrap.getIsFirstBc(),
-                    wrap.getIsLastBc()
+                    wrap.getIsLastBc(),
+                    sro.getsType()
                 );
                 // 获取公司，分公司信息
+package com.bsth.service.schedule.rulewrap;
+
+import org.joda.time.*;
+import java.util.*;
+import org.slf4j.Logger;
+
+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.ScheduleRule_Type;
+
+import com.bsth.repository.schedule.RerunRuleRepository;
+import com.bsth.repository.schedule.ScheduleRule1FlatRepository;
+
+import com.bsth.service.schedule.rules.rerun.RerunRule_input;
+import com.bsth.service.schedule.rules.ScheduleRuleService;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.schedule.CarConfigInfo
+import com.bsth.entity.schedule.EmployeeConfigInfo;
+
+// 全局日志类（一般使用调用此规则的service类）
+global Logger log;
+
+global ScheduleRule1FlatRepository srf;
+global RerunRuleRepository rrr;
+global ScheduleRuleService srservice;
+global List sriList;
+
+
+declare Sri_Wrap
+    xlId : String // 线路id
+    lpIds : List // 路牌id
+    srf : Object // ScheduleRule1Flat类型
+    sri : ScheduleRule_input; // ScheduleRule_input输入
+end
+
+rule "rw1"
+    salience 1000
+    when
+        ScheduleCalcuParam_input(
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $srf : Object() from srf.findByXlId(Integer.parseInt($xlId))
+    then
+        // 创建Sri_Wrap
+        Sri_Wrap sw = new Sri_Wrap();
+        sw.setXlId($xlId);
+        sw.setSrf($srf);
+        ScheduleRule_input sri = new ScheduleRule_input((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf());
+        sw.setSri(sri);
+        sw.setLpIds(sri.getGuideboardIds());
+
+        insert(sw);
+
+end
+
+rule "rw2"
+    salience 800
+    no-loop
+    when
+        ScheduleCalcuParam_input(
+            $fromDate : fromDate,
+            $toDate : toDate,
+            $xlId: xlId
+        )
+        $reu : RerunRule_input($lpId : lp) from srservice.findRerunrule(Integer.parseInt($xlId))
+        not Sri_Wrap(xlId == $xlId, lpIds contains $lpId)
+    then
+        // 套跑中有规则，主线路的路牌，主线路该路牌不存在，添加一个临时的，做处理
+        Sri_Wrap sw = new Sri_Wrap();
+        sw.setSrf(new com.bsth.entity.schedule.rule.ScheduleRule1Flat());
+        // 线路
+        Line xl = new Line();
+        xl.setId(Integer.valueOf($xlId));
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setXl(xl);
+        // id
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setId((new Date()).getTime());
+        // 启用日期
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setQyrq($fromDate.toDate());
+        // 车辆配置
+        CarConfigInfo cci = new CarConfigInfo();
+        cci.setId(new Date().getTime());
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setCarConfigInfo(cci);
+        // 人员配置
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setRyConfigIds("TEMP");
+        // 人员搭班编码
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setRyDbbms("TEMP");
+        // 起始人员
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setRyStart(1);
+        // 路牌id
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setLpIds($lpId);
+        // 起始路牌
+        ((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf()).setLpStart(1);
+
+        ScheduleRule_input sri = new ScheduleRule_input((com.bsth.entity.schedule.rule.ScheduleRule1Flat) sw.getSrf());
+        sri.setsType(ScheduleRule_Type.RERUN);
+        sw.setSri(sri);
+
+        sw.setXlId($xlId);
+
+        List lpIds = new ArrayList();
+        lpIds.add($lpId);
+        sw.setLpIds(lpIds);
+
+        insert(sw);
+end
+
+rule "rw3"
+    salience 600
+    when
+        $sri_wrap : Sri_Wrap($sri : sri, $xlId: xlId, $lpIds : lpIds)
+    then
+        log.info("线路id={},lpids={}", $xlId, $lpIds);
+        sriList.add($sri);
+end
 \ No newline at end of file
@@ -9,6 +9,7 @@ import com.bsth.service.schedule.utils.Md5Util;
 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.ScheduleRule_Type;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
@@ -342,33 +343,41 @@ rule &quot;Calcu_loop2_1_&quot; // 路牌在时刻表中存在，就翻
         ro.setCarConfigId($cid);
         ro.setXlId($xlid);
+        // 类型
+        ro.setsType($sri.getsType());
+
         scheduleResult.getResults().add(ro);
+//        log.info("gogoogogogogo");
+
         $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
         $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
         $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
-        // 保存排班规则循环结果 --> SchedulePlanRuleResult
-        SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
+        if ($sri.getsType() == ScheduleRule_Type.NORMAL) {
+            // 保存排班规则循环结果 --> SchedulePlanRuleResult
+            SchedulePlanRuleResult schedulePlanRuleResult = new SchedulePlanRuleResult($sp);
 //        schedulePlanRuleResult.setXlId(String.valueOf($srf.getXl().getId()));
-        schedulePlanRuleResult.setXlId($srf.getXl().getId());
-        schedulePlanRuleResult.setXlName($srf.getXl().getName());
-        schedulePlanRuleResult.setRuleId($ruleId);
-        schedulePlanRuleResult.setCcId($cid);
-        schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
-        schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
-        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());
-        schedulePlanRuleResult.setTtinfoId($ttinfoId);
-        schedulePlanRuleResult.setTtinfoName($ttinfoName);
-        schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
-        schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
-
-        scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+            schedulePlanRuleResult.setXlId($srf.getXl().getId());
+            schedulePlanRuleResult.setXlName($srf.getXl().getName());
+            schedulePlanRuleResult.setRuleId($ruleId);
+            schedulePlanRuleResult.setCcId($cid);
+            schedulePlanRuleResult.setCcZbh($srf.getCarConfigInfo().getCl().getInsideCode());
+            schedulePlanRuleResult.setGids($srf.getLpIds()); // 参与md5计算
+            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());
+            schedulePlanRuleResult.setTtinfoId($ttinfoId);
+            schedulePlanRuleResult.setTtinfoName($ttinfoName);
+            schedulePlanRuleResult.setQyrq($sri.getQyrq().toDate()); // 参与md5计算
+            schedulePlanRuleResult.setOrigingidindex(String.valueOf($sri.getSelf().getLpStart())); // 参与md5计算
+
+            scheduleResult.getSchedulePlanRuleResults().add(schedulePlanRuleResult);
+        }
+
 //        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
@@ -406,6 +415,9 @@ rule &quot;Calcu_loop2_2_&quot; // 路牌在时刻表中不存在，就不翻
         ro.setCarConfigId($cid);
         ro.setXlId($xlid);
+        // 类型
+        ro.setsType($sri.getsType());
+
         scheduleResult.getResults().add(ro);
         $cdrp.setCalcu_start_date_2($csd2.plusDays(1));