嘉定公交调度系统计划调度功能优化4

1、修正新增排班时的界面，可以提示时刻表冲突和空的信息

嘉定公交调度系统计划调度功能优化4
1、修正新增排班时的界面，可以提示时刻表冲突和空的信息
徐烜
1 parent bbb3ad44
Showing 11 changed files with 250 additions and 106 deletions
src/main/java/com/bsth/service/schedule/SchedulePlanService.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/plan/PlanConfig.java
src/main/resources/META-INF/drools.packagebuilder.conf
src/main/resources/drools/KBase/validate/rule/KBase_validate_rule.drl
src/main/resources/drools/KBase/validate/timetable/KBase_validate_timetable.drl
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saScpdate.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saScpdateTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/test/java/com/bsth/service/schedule/PlanValidateTest.java
src/test/resources/META-INF/drools.packagebuilder.conf
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
-import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
-import org.springframework.web.bind.annotation.RequestParam;
+import com.bsth.service.schedule.plan.process._1_validate._1_timetable.PlanProcessValidateTimetableService;
+import com.bsth.service.schedule.plan.process._1_validate._2_rule.PlanProcessValidateRuleService;
 import java.util.Date;
 import java.util.Map;
@@ -28,7 +27,7 @@ public interface SchedulePlanService extends BService&lt;SchedulePlan, Long&gt; {
      * @param to 结束时间
      * @return
      */
-    Result validateTTInfo(Integer xlid, Date from, Date to);
+    PlanProcessValidateTimetableService.Result validateTTInfo(Integer xlId, Date from, Date to);
     /**
      * 验证规则。
@@ -37,7 +36,7 @@ public interface SchedulePlanService extends BService&lt;SchedulePlan, Long&gt; {
      * @param to 排班计划结束时间
      * @return
      */
-    ValidateRuleResult validateRule(Integer xlId, Date from, Date to);
+    PlanProcessValidateRuleService.Result validateRule(Integer xlId, Date from, Date to);
     /**
@@ -46,4 +45,4 @@ public interface SchedulePlanService extends BService&lt;SchedulePlan, Long&gt; {
      * @return
      */
      Map<String,Object> listwest(Map map);
-}
 \ No newline at end of file
+}
 package com.bsth.service.schedule.impl;
-import com.bsth.data.gpsdata_v2.entity.StationRoute;
-import com.bsth.entity.Line;
 import com.bsth.entity.schedule.SchedulePlan;
-import com.bsth.entity.schedule.TTInfo;
 import com.bsth.repository.BusinessRepository;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.schedule.*;
 import com.bsth.service.schedule.SchedulePlanService;
 import com.bsth.service.schedule.exception.ScheduleException;
-import com.bsth.service.schedule.impl.plan.kBase3.validate.rule.ValidateRuleResult;
-import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.CalcuParam;
-import com.bsth.service.schedule.impl.plan.kBase3.validate.timetable.Result;
 import com.bsth.service.schedule.impl.plan.DroolsSchedulePlan;
 import com.bsth.service.schedule.impl.plan.ScheduleRuleService;
+import com.bsth.service.schedule.plan.process._1_validate._1_timetable.PlanProcessValidateTimetableService;
+import com.bsth.service.schedule.plan.process._1_validate._1_timetable.PlanProcessValidateTimetableServiceDroolsImpl;
+import com.bsth.service.schedule.plan.process._1_validate._2_rule.PlanProcessValidateRuleService;
+import com.bsth.service.schedule.plan.process._1_validate._2_rule.PlanProcessValidateRuleServiceDroolsImpl;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
-import org.kie.api.runtime.KieSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -51,10 +47,6 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private KieBase preKBase;
     @Autowired
-    @Qualifier("KBase3")
-    private KieBase validateKBase;
-
-    @Autowired
     private ScheduleRule1FlatRepository scheduleRule1FlatRepository;
     @Autowired
     private TTInfoRepository ttInfoRepository;
@@ -160,63 +152,91 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         return null;
     }
+    @Autowired
+    @Qualifier("kBaseValidateTimetable_plus")
+    private KieBase kBaseValidateTimetable;
     @Override
-    public Result validateTTInfo(Integer xlid, Date from, Date to) {
-        // 构造drools session->载入数据->启动规则->计算->销毁session
-        // 创建session，内部配置的是stateful
-        KieSession session = validateKBase.newKieSession();
-        // 设置gloable对象，在drl中通过别名使用
-        session.setGlobal("log", logger);
-        session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
-
-        Result rs = new Result(); // 输出gloable对象
-        session.setGlobal("rs", rs);
-
-        // 载入数据
-        Line line = lineRepository.findOne(xlid);
-        session.insert(line);
-
-        CalcuParam calcuParam = new CalcuParam(
-                new DateTime(from), new DateTime(to), xlid);
-        session.insert(calcuParam);
-        List<TTInfo> ttInfos = ttInfoRepository.findByXlId(xlid);
-        for (TTInfo ttInfo: ttInfos) {
-            session.insert(ttInfo);
-        }
-
-        // 执行rule
-        session.fireAllRules();
-
-        // 执行完毕销毁，有日志的也要关闭
-        session.dispose();
+    public PlanProcessValidateTimetableService.Result validateTTInfo(Integer xlId, Date from, Date to) {
+        // 使用builder创建服务
+        PlanProcessValidateTimetableService planProcessValidateTimetableService =
+                PlanProcessValidateTimetableServiceDroolsImpl.getBuilder()
+                        .setkBaseValidateTimetable(kBaseValidateTimetable)
+                        .setJdbcTemplate(jdbcTemplate)
+                        .build();
+        PlanProcessValidateTimetableService.Result result =
+                planProcessValidateTimetableService.validateTTInfovalidateTTInfo(xlId, from, to);
+        return result;
-        return rs;
+//        // 构造drools session->载入数据->启动规则->计算->销毁session
+//        // 创建session，内部配置的是stateful
+//        KieSession session = validateKBase.newKieSession();
+//        // 设置gloable对象，在drl中通过别名使用
+//        session.setGlobal("log", logger);
+//        session.setGlobal("tTInfoDetailRepository", ttInfoDetailRepository);
+//
+//        Result rs = new Result(); // 输出gloable对象
+//        session.setGlobal("rs", rs);
+//
+//        // 载入数据
+//        Line line = lineRepository.findOne(xlid);
+//        session.insert(line);
+//
+//        CalcuParam calcuParam = new CalcuParam(
+//                new DateTime(from), new DateTime(to), xlid);
+//        session.insert(calcuParam);
+//        List<TTInfo> ttInfos = ttInfoRepository.findByXlId(xlid);
+//        for (TTInfo ttInfo: ttInfos) {
+//            session.insert(ttInfo);
+//        }
+//
+//        // 执行rule
+//        session.fireAllRules();
+//
+//        // 执行完毕销毁，有日志的也要关闭
+//        session.dispose();
+//
+//        return rs;
     }
+    @Autowired
+    @Qualifier("kBaseValidateRule_plus")
+    private KieBase kBaseValidateRule;
     @Override
-    public ValidateRuleResult validateRule(Integer xlId, Date from, Date to) {
-        KieSession session = validateKBase.newKieSession();
-        session.setGlobal("LOG", logger);
-        session.setGlobal("ccRepo", carConfigInfoRepository);
-        session.setGlobal("lpRepo", guideboardInfoRepository);
-        session.setGlobal("ecRepo", employeeConfigInfoRepository);
-        session.setGlobal("ruleRepo", scheduleRule1FlatRepository);
-
-        ValidateRuleResult result = new ValidateRuleResult();
-        session.setGlobal("result", result);
-
-        com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam calcuParam =
-                new com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam();
-        calcuParam.setXlId(xlId);
-        calcuParam.setFromDate(new DateTime(from));
-        calcuParam.setToDate(new DateTime(to));
-        session.insert(calcuParam);
-
-        session.fireAllRules();
+    public PlanProcessValidateRuleService.Result validateRule(Integer xlId, Date from, Date to) {
+        // 使用builder创建服务
+        PlanProcessValidateRuleService planProcessValidateRuleService =
+                PlanProcessValidateRuleServiceDroolsImpl.getBuilder()
+                        .setkBaseValidateRule(kBaseValidateRule)
+                        .setJdbcTemplate(jdbcTemplate)
+                        .build();
+
+        PlanProcessValidateRuleService.Result result =
+                planProcessValidateRuleService.validateRule(xlId, from, to);
+        return result;
-        session.dispose();;
-        return result;
+//        KieSession session = validateKBase.newKieSession();
+//        session.setGlobal("LOG", logger);
+//        session.setGlobal("ccRepo", carConfigInfoRepository);
+//        session.setGlobal("lpRepo", guideboardInfoRepository);
+//        session.setGlobal("ecRepo", employeeConfigInfoRepository);
+//        session.setGlobal("ruleRepo", scheduleRule1FlatRepository);
+//
+//        ValidateRuleResult result = new ValidateRuleResult();
+//        session.setGlobal("result", result);
+//
+//        com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam calcuParam =
+//                new com.bsth.service.schedule.impl.plan.kBase3.validate.rule.CalcuParam();
+//        calcuParam.setXlId(xlId);
+//        calcuParam.setFromDate(new DateTime(from));
+//        calcuParam.setToDate(new DateTime(to));
+//        session.insert(calcuParam);
+//
+//        session.fireAllRules();
+//
+//        session.dispose();;
+//
+//        return result;
     }
@@ -230,7 +250,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         if(map.get("fgsdm")!=null){
             fgs=map.get("fgsdm").toString();
         }
-        
+
         String sql ="" +
                 "SELECT sp.xl as xl,sp.tt_info_names as tt_info_name, " +
                 "  sp.schedule_from_time as from_time ,sp.schedule_to_time as to_time, " +
@@ -267,17 +287,17 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                     map.put("businessName", rs.getString("business_name"));
                     return map;
                 }
-                
+
             });
-        
+
             for (Map m : list) {
                 m.put("updataDate", sfd.format(sfd.parse(m.get("updataDate").toString())));
             }
         }catch (Exception e){
             e.printStackTrace();
         }
-                
-        
+
+
         //分页
         if(page.length() != 0 ){
             int currPage = Integer.valueOf(page);
@@ -287,8 +307,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         } else {
             modelMap.put("dataList", list);
         }
-        
-        
+
+
         return modelMap;
     }
 }
@@ -36,7 +36,7 @@ public class PlanConfig {
      * 验证时刻表kieBase。
      * @return
      */
-    @Bean(name = "kBaseValidateTimetable")
+    @Bean(name = "kBaseValidateTimetable_plus")
     public KieBase kBaseValidateTimetable() {
         KieBase kieBase = this.generateKieBase(
                 "kBaseValidateTimetable",
@@ -49,7 +49,7 @@ public class PlanConfig {
      * 验证规则kieBase。
      * @return
      */
-    @Bean(name = "kBaseValidateRule")
+    @Bean(name = "kBaseValidateRule_plus")
     public KieBase kBaseValidateRule() {
         KieBase kieBase = this.generateKieBase(
                 "kBaseValidateRule",
@@ -10,3 +10,11 @@ drools.accumulate.function.minruleqyrq = com.bsth.service.schedule.impl.plan.kBa
 drools.accumulate.function.vrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidRepeatBcFunction
 drools.accumulate.function.vwrb = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWholeRerunBcFunction
 drools.accumulate.function.vwlp = com.bsth.service.schedule.impl.plan.kBase1.core.validate.ValidWantLpFunction
+
+# kBase_validate_timetable.drl使用
+drools.accumulate.function.ecount2 = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_ErrorBcCount
+drools.accumulate.function.as = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateStatInfo
+drools.accumulate.function.ac = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateConflict
+drools.accumulate.function.ae = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateEmpty
+# kBase_validate_rule.drl使用
+drools.accumulate.function.srif2 = com.bsth.service.schedule.plan.process._1_validate._2_rule.drools.KBaseValidateRule_Function_ErrorInfo
@@ -54,7 +54,7 @@ rule &quot;calcu_error_info&quot;
         $param: KBaseValidateRule_Fact_CalcuParam($xlId: xlId, $fd: fromDate, $td: toDate)
         $allRuleList: ArrayList() from collect(KBaseValidateRule_Fact_Rule(xl.id == $xlId))
         $allWrapRuleList: ArrayList() from collect(WrapRule(rule.xl.id == $xlId))
-        $errorMap: Map() from accumulate ($wr: WrapRule(rule.xl.id == $xlId), srif($wr))
+        $errorMap: Map() from accumulate ($wr: WrapRule(rule.xl.id == $xlId), srif2($wr))
     then
         rs.setXlId($xlId);
         rs.setCount($allRuleList.size());
@@ -165,7 +165,7 @@ rule &quot;group_statinfo&quot;
         $inbc: Long() from accumulate (KBaseValidateTimeTable_Fact_TTInfoDetail(bcType == "in") from $bcInfoList, count())
         $outbc: Long() from accumulate (KBaseValidateTimeTable_Fact_TTInfoDetail(bcType == "out") from $bcInfoList, count())
         $yybc: Long() from accumulate (KBaseValidateTimeTable_Fact_TTInfoDetail(bcType != "out", bcType != "in") from $bcInfoList, count())
-        $errorbc: Long() from accumulate ($ttd: KBaseValidateTimeTable_Fact_TTInfoDetail() from $bcInfoList, ecount($ttd))
+        $errorbc: Long() from accumulate ($ttd: KBaseValidateTimeTable_Fact_TTInfoDetail() from $bcInfoList, ecount2($ttd))
     then
         LOGGER.info("时刻表={},id={},线路版本={},班次数={},进场={},出场={},营运={},错误={}",
             $statInfo.getTtname(), $statInfo.getTtid(), $lineVersion, $allbc, $inbc, $outbc, $yybc, $errorbc);
@@ -33,8 +33,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                     // 内部ng-model值，用于和required配对
                     self.$$internalmodel = undefined;
-                    // 内部数据源（时刻表的一些信息）
+                    // 内部数据源（时刻表的统计信息）
                     self.$$ds = [];
+                    // 内部数据源（时刻表的冲突信息）
+                    self.$$conflictDs = [];
+                    // 内部数据源（时刻表的空信息）
+                    self.$$emptyDs = [];
                 },
                 compile: function(tElem, tAttrs) {
@@ -122,10 +126,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                 var ttinfoids = [];
                                 QClass.val({xlid: xl_id, from: from_date, to: to_date},
                                     function(result) {
-                                        scope[ctrlAs].$$ds = [];
+                                        var errorList = [];
+                                        //---------------- 1、计算时刻表统计信息 ----------------//
+                                        scope[ctrlAs].$$ds = [];
                                         var errorTTInfos = 0;
-
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
                                                 scope[ctrlAs].$$ds.push({
@@ -154,17 +159,53 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             });
                                             if (errorTTInfos > 0) {
-                                                scope[ctrlAs].$$internalmodel = undefined;
-                                                scope[ctrlAs].error = "时刻表有错误班次";
+                                                errorList.push("时刻表有错误班次");
                                             } else {
-                                                scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
                                                 scope[ctrlAs].ttinfoids = ttinfoids.join(",");
                                             }
                                         } else {
+                                            errorList.push("无可用时刻表");
+                                        }
+
+                                        //---------------- 2、计算当天时刻表冲突信息 ----------------//
+                                        scope[ctrlAs].$$conflictDs = [];
+                                        if (result && result.data && result.data.conflictStatInfos && result.data.conflictStatInfos.length > 0) {
+                                            errorList.push("当天时刻表有冲突");
+                                            // 截取前五条数据显示，如果大于五条，加还有更多提示
+                                            var c_temp_list = result.data.conflictStatInfos.splice(0, 5);
+                                            angular.forEach(c_temp_list, function(obj) {
+                                                scope[ctrlAs].$$conflictDs.push({
+                                                    desc: obj.dateDesc + "匹配到" + obj.ttIdList.length + "张时刻表"
+                                                });
+                                            });
+                                            if (result.data.conflictStatInfos.length > 5) {
+                                                scope[ctrlAs].$$conflictDs.push({desc : "还有更多"});
+                                            }
+                                        }
+
+                                        //---------------- 3、计算当天空时刻表信息 ----------------//
+                                        scope[ctrlAs].$$emptyDs = [];
+                                        if (result && result.data && result.data.emptyStatInfos && result.data.emptyStatInfos.length > 0) {
+                                            // 截取前五条数据显示，如果大于五条，加还有更多提示
+                                            var e_temp_list = result.data.emptyStatInfos.splice(0, 5);
+                                            angular.forEach(e_temp_list, function(obj) {
+                                                scope[ctrlAs].$$emptyDs.push({
+                                                    desc: obj.dateDesc + "没有匹配到时刻表"
+                                                });
+                                            });
+                                            if (result.data.emptyStatInfos.length > 5) {
+                                                scope[ctrlAs].$$emptyDs.push({desc : "还有更多"});
+                                            }
+                                        }
+
+                                        //---------------- 4、输出错误，计算model ----------------//
+                                        if (errorList.length > 0) {
                                             scope[ctrlAs].$$internalmodel = undefined;
-                                            scope[ctrlAs].error = "无可用时刻表";
+                                            scope[ctrlAs].error = errorList.join("，");
+                                        } else {
+                                            scope[ctrlAs].$$internalmodel = "ok";
                                         }
                                     },
                                     function() {
@@ -172,9 +213,6 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].error = "获取时刻表数据失败！";
                                     }
                                 );
-
-
-                                scope[ctrlAs].$$internalmodel = "ok";
                             };
                             scope[ctrlAs].$$internal_model_refresh(); // 初始执行
@@ -228,4 +266,4 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
 \ No newline at end of file
+);
@@ -72,10 +72,48 @@
                         <span class="glyphicon glyphicon-remove" aria-hidden="true" ng-if="info.errorbc > 0"></span>
                     </div>
                 </div>
+
+                <script type="text/ng-template" id="$saScpdateCtrl_popover_2.html">
+                    <div><span>当天时刻表冲突详细信息，如下：</span></div>
+                    <div ng-repeat="info in $saScpdateCtrl.$$conflictDs track by $index">
+                        <span>{{info.desc}}</span>
+                    </div>
+                </script>
+                <div ng-if="$saScpdateCtrl.$$conflictDs.length > 0">
+                    <div class="alert alert-danger well-sm col-md-12" uib-popover-template="'$saScpdateCtrl_popover_2.html'"
+                         popover-class="increase-popover-width"
+                         popover-trigger="mouseenter">
+                        <h3 class="col-md-8">
+                            {{$saScpdateCtrl.$$conflictDs[0].desc}}
+                        </h3>
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                    </div>
+                </div>
+
+                <script type="text/ng-template" id="$saScpdateCtrl_popover_3.html">
+                    <div><span>当天没有时刻表详细信息，如下：</span></div>
+                    <div ng-repeat="info in $saScpdateCtrl.$$emptyDs track by $index">
+                        <span>{{info.desc}}</span>
+                    </div>
+                    <div><span>业务上确实当天无时刻表，需要调整时刻表或规则适应，方法如下：</span></div>
+                    <div><span>第一种方法：编写一张假的时刻表，使用假路牌（如添加一个假路牌一个假班次的时刻表）</span></div>
+                    <div><span>第二种方法：调整相关规则，指定翻班类型为翻班格式，当天没有时刻表的指定为0</span></div>
+                </script>
+                <div ng-if="$saScpdateCtrl.$$emptyDs.length > 0">
+                    <div class="alert alert-warning well-sm col-md-12" uib-popover-template="'$saScpdateCtrl_popover_3.html'"
+                         popover-class="increase-popover-width"
+                         popover-trigger="mouseenter">
+                        <h3 class="col-md-8">
+                            {{$saScpdateCtrl.$$emptyDs[0].desc}}
+                        </h3>
+                        <span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span>
+                    </div>
+                </div>
+
             </div>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -5033,8 +5033,12 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                     // 内部ng-model值，用于和required配对
                     self.$$internalmodel = undefined;
-                    // 内部数据源（时刻表的一些信息）
+                    // 内部数据源（时刻表的统计信息）
                     self.$$ds = [];
+                    // 内部数据源（时刻表的冲突信息）
+                    self.$$conflictDs = [];
+                    // 内部数据源（时刻表的空信息）
+                    self.$$emptyDs = [];
                 },
                 compile: function(tElem, tAttrs) {
@@ -5122,10 +5126,11 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                 var ttinfoids = [];
                                 QClass.val({xlid: xl_id, from: from_date, to: to_date},
                                     function(result) {
-                                        scope[ctrlAs].$$ds = [];
+                                        var errorList = [];
+                                        //---------------- 1、计算时刻表统计信息 ----------------//
+                                        scope[ctrlAs].$$ds = [];
                                         var errorTTInfos = 0;
-
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
                                                 scope[ctrlAs].$$ds.push({
@@ -5154,17 +5159,53 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             });
                                             if (errorTTInfos > 0) {
-                                                scope[ctrlAs].$$internalmodel = undefined;
-                                                scope[ctrlAs].error = "时刻表有错误班次";
+                                                errorList.push("时刻表有错误班次");
                                             } else {
-                                                scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
                                                 scope[ctrlAs].ttinfoids = ttinfoids.join(",");
                                             }
                                         } else {
+                                            errorList.push("无可用时刻表");
+                                        }
+
+                                        //---------------- 2、计算当天时刻表冲突信息 ----------------//
+                                        scope[ctrlAs].$$conflictDs = [];
+                                        if (result && result.data && result.data.conflictStatInfos && result.data.conflictStatInfos.length > 0) {
+                                            errorList.push("当天时刻表有冲突");
+                                            // 截取前五条数据显示，如果大于五条，加还有更多提示
+                                            var c_temp_list = result.data.conflictStatInfos.splice(0, 5);
+                                            angular.forEach(c_temp_list, function(obj) {
+                                                scope[ctrlAs].$$conflictDs.push({
+                                                    desc: obj.dateDesc + "匹配到" + obj.ttIdList.length + "张时刻表"
+                                                });
+                                            });
+                                            if (result.data.conflictStatInfos.length > 5) {
+                                                scope[ctrlAs].$$conflictDs.push({desc : "还有更多"});
+                                            }
+                                        }
+
+                                        //---------------- 3、计算当天空时刻表信息 ----------------//
+                                        scope[ctrlAs].$$emptyDs = [];
+                                        if (result && result.data && result.data.emptyStatInfos && result.data.emptyStatInfos.length > 0) {
+                                            // 截取前五条数据显示，如果大于五条，加还有更多提示
+                                            var e_temp_list = result.data.emptyStatInfos.splice(0, 5);
+                                            angular.forEach(e_temp_list, function(obj) {
+                                                scope[ctrlAs].$$emptyDs.push({
+                                                    desc: obj.dateDesc + "没有匹配到时刻表"
+                                                });
+                                            });
+                                            if (result.data.emptyStatInfos.length > 5) {
+                                                scope[ctrlAs].$$emptyDs.push({desc : "还有更多"});
+                                            }
+                                        }
+
+                                        //---------------- 4、输出错误，计算model ----------------//
+                                        if (errorList.length > 0) {
                                             scope[ctrlAs].$$internalmodel = undefined;
-                                            scope[ctrlAs].error = "无可用时刻表";
+                                            scope[ctrlAs].error = errorList.join("，");
+                                        } else {
+                                            scope[ctrlAs].$$internalmodel = "ok";
                                         }
                                     },
                                     function() {
@@ -5172,9 +5213,6 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].error = "获取时刻表数据失败！";
                                     }
                                 );
-
-
-                                scope[ctrlAs].$$internalmodel = "ok";
                             };
                             scope[ctrlAs].$$internal_model_refresh(); // 初始执行
@@ -5228,7 +5266,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
+
 /**
  * saSrule指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：
@@ -34,11 +34,11 @@ public class PlanValidateTest extends BaseTest_junit4 {
     }
     @Autowired
-    @Qualifier("kBaseValidateTimetable")
+    @Qualifier("kBaseValidateTimetable_plus")
     private KieBase kBaseValidateTimetable;
     @Autowired
-    @Qualifier("kBaseValidateRule")
+    @Qualifier("kBaseValidateRule_plus")
     private KieBase kBaseValidateRule;
     @Autowired
@@ -213,4 +213,6 @@ public class PlanValidateTest extends BaseTest_junit4 {
                         validateRuleResult.getErrorInfos().size()
                 });
     }
+
+    // TODO：有空再把排班的逻辑移植过来
 }
 # 貌似用import accumulate报错，使用配置文件方式
 # kBase_validate_timetable.drl使用
-drools.accumulate.function.ecount = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_ErrorBcCount
+drools.accumulate.function.ecount2 = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_ErrorBcCount
 drools.accumulate.function.as = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateStatInfo
 drools.accumulate.function.ac = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateConflict
 drools.accumulate.function.ae = com.bsth.service.schedule.plan.process._1_validate._1_timetable.drools.KBaseValidateTimeTable_Function_AccumulateEmpty
 # kBase_validate_rule.drl使用
-drools.accumulate.function.srif = com.bsth.service.schedule.plan.process._1_validate._2_rule.drools.KBaseValidateRule_Function_ErrorInfo
+drools.accumulate.function.srif2 = com.bsth.service.schedule.plan.process._1_validate._2_rule.drools.KBaseValidateRule_Function_ErrorInfo