Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 32fd47d4 0ad6ab86
Showing 18 changed files with 721 additions and 667 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.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/ScheduleRule_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/java/com/bsth/service/schedule/rules/ttinfo/LpInfoResults_output.java
src/main/java/com/bsth/service/schedule/rules/ttinfo/MinRuleQyrqFunction.java
src/main/resources/rules/functions.drl
src/main/resources/rules/shiftloop_fb_2.drl
src/main/resources/rules/ttinfo.drl
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/js/home/context_menu.js
 package com.bsth.controller.directive;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.directive.D80;
@@ -17,6 +7,15 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.directive.DirectiveService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
 /**
  * 
@@ -109,6 +108,20 @@ public class DirectiveController {
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.upDownChange(nbbm, upDown, user.getUserName());
 	}
+
+	/**
+	 *
+	 * @Title: upDownChange
+	 * @Description: TODO(状态切换，营运状态 和 上下行)
+	 * @param @param nbbm 车辆内部编码
+	 * @param @param upDon
+	 * @throws
+	 */
+	@RequestMapping(value = "/stateChange", method = RequestMethod.POST)
+	public int stateChange(@RequestParam String nbbm, @RequestParam Integer upDown, @RequestParam Integer state){
+		SysUser user = SecurityUtils.getCurrentUser();
+		return directiveService.stateChange(nbbm, upDown, state, user.getUserName());
+	}
 	/**
 	 * 
@@ -5,6 +5,10 @@ import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.List;
@@ -68,6 +72,8 @@ public abstract class SignalHandle {
      * }
      */
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     protected void transformUpdown(GpsEntity gps, ScheduleRealInfo sch) {
         int updown = Integer.parseInt(sch.getXlDir());
         //gps 切换走向
@@ -78,6 +84,8 @@ public abstract class SignalHandle {
         if (station != null) {
             gps.setStopNo(station.getCode());
         }
+
+        logger.info(fmtHHmm.print(gps.getTimestamp()) + " 车辆 ：" + gps.getNbbm() + " 切换到走向 : " + updown);
     }
     /**
@@ -7,6 +7,7 @@ import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -17,6 +18,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 进出站动作处理
  * Created by panzhao on 2016/12/27.
@@ -138,6 +142,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
+            if(sch.getBcType().equals("out")){
+                //出场时，切换成营运状态
+                directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
+            }
             //出站既出场
             outStationAndOutPark(sch);
             logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
@@ -164,6 +172,11 @@ public class InOutStationSignalHandle extends SignalHandle{
                 sendUtils.refreshSch(schPrev);
                 dayOfSchedule.save(schPrev);
+
+                if(schPrev.getBcType().equals("out")){
+                    //出场时，切换成营运状态
+                    directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
+                }
             }
         }
     }
@@ -204,8 +217,14 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.sendZdsj(sch, next, doneSum);
             //持久化
             dayOfSchedule.save(sch);
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            if(next != null){
+                //下发调度指令
+                directiveService.send60Dispatch(next, doneSum, "到站@系统");
+            }
+            else if(sch.getBcType().equals("in")){
+                //终班进场，切换成非营运状态
+                directiveService.send60Operation(sch.getClZbh(), 1, Integer.parseInt(sch.getXlDir()), null, "进场@系统");
+            }
             //准备执行下一个班次
             if (next != null) {
@@ -217,10 +236,59 @@ public class InOutStationSignalHandle extends SignalHandle{
                 transformUpdown(gps, next);
             }
         }
-        else if(sch.getFcsjActual() == null){
-            //有进站，但班次没有实发，向前追溯一下信号
-            scheduleSignalState.signalRetrospect(gps, sch);
+        else {
+            if(sch.getFcsjActual() == null){
+                //有进站，但班次没有实发，向前追溯一下信号
+                scheduleSignalState.signalRetrospect(gps, sch);
+            }
+
+            //如果当前班次是出场，并且进的是下一个班次的终点
+            if(sch.getBcType().equals("out")){
+                ScheduleRealInfo next = dayOfSchedule.next(sch);
+                if(next.getZdzCode().equals(gps.getStopNo())){
+                    List<ScheduleRealInfo> halfList = dayOfSchedule.findByNbbm(sch.getClZbh());
+                    //和当前进站信号最匹配的一个班次
+                    ScheduleRealInfo nearSch = nearScheduleByGpsIn(gps, halfList);
+
+                    if(nearSch != null){
+                        //直接跳到这个班次
+                        dayOfSchedule.addExecPlan(nearSch);
+                        //重新进站
+                        inStation(gps, prev);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 和当前进站信号最匹配的一个班次
+     * @param gps
+     * @param halfList
+     * @return
+     */
+    private ScheduleRealInfo nearScheduleByGpsIn(GpsEntity gps, List<ScheduleRealInfo> halfList){
+        if(halfList == null || halfList.size() == 0)
+            return null;
+
+        //排序
+        Collections.sort(halfList, new ScheduleComparator.FCSJ());
+        ScheduleRealInfo near = null;// = halfList.get(0);
+        ScheduleRealInfo sch;
+
+        String stopId = gps.getStopNo();
+        for(int i = 0; i < halfList.size(); i ++){
+            sch = halfList.get(i);
+            if(!sch.getZdzCode().equals(stopId))
+                continue;
+
+            if(sch.getZdsjT() < gps.getTimestamp())
+                near = sch;
+            else
+                break;
+
         }
+        return near;
     }
     /**
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-003"))
+            /*if(nbbm.equals("SXC-YD012"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -163,9 +163,8 @@ public class GpsDataRecovery implements ApplicationContextAware {
                     reverseSignalHandle.handle(gps, prevs);
                     //进出站动作处理
                     inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
-                    //Thread.sleep(50);
+                    GeoCacheData.putGps(gps);
                 }
             } catch (Exception e) {
                 logger.error("", e);
 package com.bsth.service.directive;
-import java.util.List;
-import java.util.Map;
-
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.D80;
@@ -11,6 +8,9 @@ import com.bsth.entity.directive.DC0_A3;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
 public interface DirectiveService extends BaseService<D60, Integer>{
 	/**
@@ -93,4 +93,6 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	int sendC0A5(String json);
     int refreshLineFile(String deviceId);
+
+    int stateChange(String nbbm, Integer upDown, Integer state, String userName);
 }
@@ -504,4 +504,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		return GatewayHttpUtils.postJson(new DirectiveCreator().createDeviceRefreshData(deviceId, gps.getLineId()));
 	}
+
+	@Override
+	public int stateChange(String nbbm, Integer upDown, Integer state, String userName) {
+		return send60Operation(nbbm, state, upDown, null, userName);
+	}
 }
@@ -177,6 +177,15 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
             session.insert(ttInfo_input);
         }
+
+        // 载入数据2
+        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = strategy.getScheduleRule(schedulePlan.getXl().getId()).iterator();
+        while (scheduleRule1FlatIterator.hasNext()) {
+            ScheduleRule1Flat scheduleRule1Flat_temp = scheduleRule1FlatIterator.next();
+            ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat_temp);
+            session.insert(scheduleRule_input);
+        }
+
         // 执行rule
         session.fireAllRules();
@@ -58,9 +58,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/HelloWorld.drl"), "UTF-8"));
-        kfs.write("src/main/resources/shiftloop_fb.drl", kieServices.getResources()
+        kfs.write("src/main/resources/shiftloop_fb_2.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
-                        "/rules/shiftloop_fb.drl"), "UTF-8"));
+                        "/rules/shiftloop_fb_2.drl"), "UTF-8"));
         kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/ttinfo.drl"), "UTF-8"));
@@ -12,6 +12,9 @@ import java.util.List;
  * 排班规则_输入。
  */
 public class ScheduleRule_input {
+    /** 线路Id */
+    private String xlId;
+
     /** 规则Id */
     private String ruleId;
     /** 规则启用日期 */
@@ -36,6 +39,7 @@ public class ScheduleRule_input {
     public ScheduleRule_input() {}
     public ScheduleRule_input(ScheduleRule1Flat scheduleRule1Flat) {
+        this.xlId = String.valueOf(scheduleRule1Flat.getXl().getId());
         this.ruleId = String.valueOf(scheduleRule1Flat.getId());
         this.qyrq = new DateTime(scheduleRule1Flat.getQyrq());
         List<String> lpIds = Splitter.on(",").splitToList(scheduleRule1Flat.getLpIds());
@@ -135,4 +139,12 @@ public class ScheduleRule_input {
     public void setWeekdays(List<Boolean> weekdays) {
         this.weekdays = weekdays;
     }
+
+    public String getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(String xlId) {
+        this.xlId = xlId;
+    }
 }
-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 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 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) {
-
-    }
-}
+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) {
+
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo;
+
+import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+import org.joda.time.DateTime;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * 最小的规则启用日期。
+ */
+public class MinRuleQyrqFunction implements AccumulateFunction {
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+    }
+
+    protected static class MinRuleQyrqData implements Externalizable {
+        public DateTime min;
+
+        public MinRuleQyrqData() {}
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            min = (DateTime) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeObject(min);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new MinRuleQyrqData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        // TODO：
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        MinRuleQyrqData minRuleQyrqData = (MinRuleQyrqData) context;
+        ScheduleRule_input scheduleRule_input = (ScheduleRule_input) value;
+
+        if (minRuleQyrqData.min == null) {
+            minRuleQyrqData.min = scheduleRule_input.getQyrq();
+        } else if (scheduleRule_input.getQyrq().isBefore(minRuleQyrqData.min)) {
+            minRuleQyrqData.min = scheduleRule_input.getQyrq();
+        }
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return false;
+    }
+
+    @Override
+    public void reverse(Serializable serializable, Object o) throws Exception {
+
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return DateTime.class;
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        MinRuleQyrqData minRuleQyrqData = (MinRuleQyrqData) context;
+        return minRuleQyrqData.min;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3,4 +3,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;
-import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
 \ No newline at end of file
+import accumulate com.bsth.service.schedule.rules.ttinfo.LpInfoResultsFunction lpinforesult;
+import accumulate com.bsth.service.schedule.rules.ttinfo.MinRuleQyrqFunction minruleqyrq
 \ 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
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-
+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={} from={} to={}", (p2.getDays() + 1), $ruleId, $fromDate, $toDate);
+
+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={} from={} to={}", (p2.getDays() + 1), $ruleId, $qyrq, $toDate);
+
+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 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
+        )
+        $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
+
+//------------------------- 第三阶段、计算规则准备数据2（第二组循环） ----------------------------//
+rule "Calcu_loop2_1_" // 路牌在时刻表中存在，就翻
+    salience 800
+    when
+        $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),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds,
+            $lprangesize : guideboardIds.size(),
+            $ryrangesize: employeeConfigIds.size()
+        )
+        $liro: LpInfoResult_output(
+            dateTime.isEqual($csd2),
+            $gids.get($lpindex) == lpId,
+            $lpId: lpId
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_index_lp(($lpindex + 1) % $lprangesize);
+        $cdrp.setCalcu_index_ry(($ryindex + 1) % $ryrangesize);
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        log.info("Calcu_loop2_1_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+rule "Calcu_loop2_2_" // 路牌在时刻表中不存在，就不翻
+    salience 800
+    when
+        $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),
+            $csd2: calcu_start_date_2,
+            $ced2: calcu_end_date_2,
+            $ruleId: ruleId,
+            $lpindex: calcu_index_lp,
+            $ryindex: calcu_index_ry
+        )
+        $sri: ScheduleRule_input(
+            ruleId == $ruleId,
+            $cid: carConfigId,
+            $gids: guideboardIds,
+            $eids: employeeConfigIds
+
+        )
+    then
+        ScheduleResult_output ro = new ScheduleResult_output();
+        ro.setRuleId($ruleId);
+        ro.setSd($csd2);
+        ro.setGuideboardId(String.valueOf($gids.get($lpindex)));
+        ro.setEmployeeConfigId(String.valueOf($eids.get($ryindex)));
+        ro.setCarConfigId($cid);
+
+        scheduleResult.getResults().add(ro);
+
+        $cdrp.setCalcu_start_date_2($csd2.plusDays(1));
+
+        log.info("Calcu_loop2_2_ ruleId={}, calcu_index_lp/ry={}/{}, from={}, to={}",
+            $ruleId, $cdrp.getCalcu_index_lp(), $cdrp.getCalcu_index_ry(), $csd2, $ced2);
+
+        update($cdrp);
+end
+
+
+
+
+
+
@@ -10,6 +10,8 @@ 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 com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
+
 import com.bsth.service.schedule.TTInfoDetailService;
 import com.bsth.entity.schedule.TTInfo;
@@ -38,7 +40,18 @@ function Map ttidParams(List ttinfolist) {
     TODO：规则说明，以后待说明
 */
-// TODO：
+//----------------- pre 预处理 param对象 -----------------------//
+
+rule "pre_calcu_TTInfoCalcuParam_input"
+    no-loop
+    salience 1000
+    when
+        $ttp: TTInfoCalcuParam_input($xlId : xlId)
+        $minqyrq: DateTime() from accumulate ($sri: ScheduleRule_input(xlId == $xlId), minruleqyrq($sri))
+    then
+        $ttp.setFromDate($minqyrq);
+        update($ttp);
+end
 //----------------- 第一阶段、计算规则准备数据（天数）----------------//
@@ -65,9 +65,9 @@
                   {{if obj.reply46 != 0}}
                   <div class="uk-badge uk-badge-danger"> 设备未响应</div>
                   {{else if obj.reply47 != 0}}
-                  <div class="uk-badge uk-badge-warning"> 驾驶员未确认</div>
+                  <div class="uk-badge uk-badge-warning"> 设备已响应</div>
                   {{else if obj.reply46 == 0 && obj.reply47 == 0}}
-                  <div class="uk-badge"> 成功</div>
+                  <div class="uk-badge"> 驾驶员已确认</div>
                   {{/if}}
                 {{/if}}
             </td>
@@ -39,6 +39,20 @@ var gb_home_context_menu = (function() {
         });
     };
+    //营运状态和上下行切换
+    var stateChange = function (nbbm, updown, state) {
+        $.post('/directive/stateChange', {
+            nbbm: nbbm,
+            upDown: updown,
+            state: state
+        }, function(rs) {
+            if (rs == 0)
+                notify_succ('指令已发出');
+            else
+                notify_err('发送失败，原因参考【指令下发记录】');
+        });
+    };
+
     // send phrase
     var sendPhrase = function() {
         var dom = temps['home-send-phrase-temp']({
@@ -139,11 +153,19 @@ var gb_home_context_menu = (function() {
     };
     var state_up_0 = function() {
-        changeUpDown(active_car, 0);
+        stateChange(active_car, 0, 0);
     };
     var state_down_0 = function() {
-        changeUpDown(active_car, 1);
+        stateChange(active_car, 1, 0);
+    };
+
+    var state_up_1 = function () {
+        stateChange(active_car, 0, 1);
+    };
+
+    var state_down_1 = function () {
+        stateChange(active_car, 1, 1);
     };
     var line_change = function() {
@@ -179,7 +201,6 @@ var gb_home_context_menu = (function() {
         });
     };
-
     var C0_A3 = function(){
       open_modal('/real_control_v2/fragments/home/c0_a3.html', {}, {center: false, bgclose: false});
     };
@@ -190,7 +211,9 @@ var gb_home_context_menu = (function() {
         state_up_0: state_up_0,
         state_down_0: state_down_0,
         line_change: line_change,
-        C0_A3: C0_A3
+        C0_A3: C0_A3,
+        state_up_1: state_up_1,
+        state_down_1: state_down_1
     };
     $.contextMenu({
@@ -210,6 +233,13 @@ var gb_home_context_menu = (function() {
             'fold_state': {
                 name: '状态切换',
                 items: {
+                    'state_up_1': {
+                        'name': '上行非营运'
+                    },
+                    'state_down_1': {
+                        'name': '下行非营运'
+                    },
+                    'sep3_2': '---------',
                     'state_up_0': {
                         'name': '上行营运'
                     },