浦东公交计划调度功能优化

1、计划排班时，添加时刻表路牌验证（验证路牌是否作废）

浦东公交计划调度功能优化
1、计划排班时，添加时刻表路牌验证（验证路牌是否作废）
徐烜
1 parent 453efa15
Showing 10 changed files with 140 additions and 67 deletions
src/main/java/com/bsth/repository/schedule/TTInfoDetailRepository.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/timetable/ErrorBcCountFunction.java
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/timetable/Result.java
src/main/resources/application-dev.properties
src/main/resources/datatools/config-dev.properties
src/main/resources/rules/kBase3_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
@@ -47,6 +47,7 @@ public interface TTInfoDetailRepository extends BaseRepository&lt;TTInfoDetail, Lon
     @Query(value = "select tt from TTInfoDetail tt where tt.ttinfo.id = ?1 and tt.lp.id = ?2 order by tt.fcno asc")
     List<TTInfoDetail> findBcdetails(Long ttinfoId, Long lpId);
  
+    @Query(value = "select tt from TTInfoDetail tt left join fetch tt.lp where tt.ttinfo.id = ?1 ")
     List<TTInfoDetail> findByTtinfoId(Long id);
  
     @Modifying
@@ -205,7 +205,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
  
         session.fireAllRules();
  
-        session.dispose();;
+        session.dispose();
  
         return result;
     }
@@ -5,6 +5,10 @@ import org.apache.commons.lang3.StringUtils;
 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;
  
 /**
  * Created by xu on 17/2/28.
@@ -18,24 +22,68 @@ public class ErrorBcCountFunction implements AccumulateFunction {
     public void writeExternal(ObjectOutput out) throws IOException {
     }
  
-    protected static class ErrorCountData implements Externalizable {
-        public long errorcount = 0;
+    protected static class ErrorCountData implements Serializable {
+        // TODO：这里暂时这样写，之后新版本去除
         public TTInfoDetail ttInfoDetail;
+        /** 错误班次map，key=ttinfodetailId value=ttinfodetail */
+        public Map<Long, TTInfoDetail> errorTtInfoDetailMap;
+        // 空班次数
+        public Integer nullBcCount;
+        /**  错误路牌map，key=路牌Id，value=路牌名字 */
+        public Map<Long, String> errorlpMap;
  
         public ErrorCountData() {
+            nullBcCount = 0;
+            errorTtInfoDetailMap = new HashMap<>();
+            errorlpMap = new HashMap<>();
         }
  
-        @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            errorcount = in.readLong();
-            ttInfoDetail = (TTInfoDetail) in.readObject();
+        public void accTTInfoDetail(TTInfoDetail ttInfoDetail) {
+            // 计算错误班次
+
+            if (ttInfoDetail.getTtinfo() == null) {
+                nullBcCount ++;
+                return;
+            }
+
+            // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
+            // 1、起点站编码，名字为空
+            // 2、终点站编码，名字为空
+            // 3、班次时间
+            // TODO：其他再议
+            if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+                    (ttInfoDetail.getBcsj() == null) ) {
+
+                errorTtInfoDetailMap.put(ttInfoDetail.getId(), ttInfoDetail);
+            }
+
+            // 计算错误路牌
+            if (ttInfoDetail.getLp().getIsCancel()) {
+                errorlpMap.put(ttInfoDetail.getLp().getId(), ttInfoDetail.getLp().getLpName());
+            }
         }
  
-        @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeLong(errorcount);
-            out.writeObject(ttInfoDetail);
+        public void reTTInfoDetail(TTInfoDetail ttInfoDetail) {
+            if (ttInfoDetail.getTtinfo() == null) {
+                nullBcCount --;
+                return;
+            }
+            if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
+                    StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+                    (ttInfoDetail.getBcsj() == null) ) {
+
+                errorTtInfoDetailMap.remove(ttInfoDetail.getId());
+            }
+            if (ttInfoDetail.getLp().getIsCancel()) {
+                errorlpMap.remove(ttInfoDetail.getLp().getId());
+            }
         }
+
     }
  
     @Override
@@ -44,60 +92,42 @@ public class ErrorBcCountFunction implements AccumulateFunction {
     }
  
     @Override
-    public void init(Serializable context) throws Exception {
-        ErrorCountData errorCountData = (ErrorCountData) context;
-        errorCountData.errorcount = 0;
-    }
+    public void init(Serializable context) throws Exception { }
  
     @Override
     public void accumulate(Serializable context, Object value) {
         ErrorCountData errorCountData = (ErrorCountData) context;
         TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        if (ttInfoDetail.getTtinfo() == null) {
-            errorCountData.errorcount ++;
-            return;
-        }
-
-        // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
-        // 1、起点站编码，名字为空
-        // 2、终点站编码，名字为空
-        // 3、班次时间
-        // TODO：其他再议
-        if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
-            (ttInfoDetail.getBcsj() == null) ) {
-
-            errorCountData.errorcount ++;
-        }
+        errorCountData.accTTInfoDetail(ttInfoDetail);
     }
  
     @Override
     public void reverse(Serializable context, Object value) throws Exception {
         ErrorCountData errorCountData = (ErrorCountData) context;
         TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
-
-        if (ttInfoDetail.getTtinfo() == null) {
-            errorCountData.errorcount --;
-            return;
-        }
-
-        if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
-                StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
-                StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-                StringUtils.isEmpty(ttInfoDetail.getZdzName()) ) {
-
-            errorCountData.errorcount --;
-        }
-
+        errorCountData.reTTInfoDetail(ttInfoDetail);
     }
  
     @Override
     public Object getResult(Serializable context) throws Exception {
         ErrorCountData errorCountData = (ErrorCountData) context;
-        return errorCountData.errorcount;
+
+        // 错误班次数
+        Integer errorBcCount = errorCountData.nullBcCount + errorCountData.errorTtInfoDetailMap.values().size();
+        // 错误路牌数
+        Integer errorLpCount = errorCountData.errorlpMap.values().size();
+        // 错误路牌描述
+        List<String> errorLpInfoList = new ArrayList<>();
+        for (String lpName: errorCountData.errorlpMap.values()) {
+            errorLpInfoList.add("路牌" + "[" + lpName + "]" + "已作废");
+        }
+
+        List<Object> resultObj = new ArrayList<>(3);
+        resultObj.add(errorBcCount);
+        resultObj.add(errorLpCount);
+        resultObj.add(errorLpInfoList);
+
+        return resultObj;
     }
  
     @Override
@@ -107,6 +137,6 @@ public class ErrorBcCountFunction implements AccumulateFunction {
  
     @Override
     public Class<?> getResultType() {
-        return Number.class;
+        return List.class;
     }
 }
@@ -35,7 +35,12 @@ public class Result {
         private Long yybc;
  
         /** 错误班次数 */
-        private Long errorbc;
+        private Integer errorbc;
+
+        /** 错误路牌数 */
+        private Integer errorlpCount;
+        /** 错误路牌描述 */
+        private List<String> errorlpInfo;
  
         public Long getTtid() {
             return ttid;
@@ -85,14 +90,10 @@ public class Result {
             this.yybc = yybc;
         }
  
-        public Long getErrorbc() {
+        public Integer getErrorbc() {
             return errorbc;
         }
  
-        public void setErrorbc(Long errorbc) {
-            this.errorbc = errorbc;
-        }
-
         public Integer getLineVersion() {
             return lineVersion;
         }
@@ -100,5 +101,25 @@ public class Result {
         public void setLineVersion(Integer lineVersion) {
             this.lineVersion = lineVersion;
         }
+
+        public void setErrorbc(Integer errorbc) {
+            this.errorbc = errorbc;
+        }
+
+        public Integer getErrorlpCount() {
+            return errorlpCount;
+        }
+
+        public void setErrorlpCount(Integer errorlpCount) {
+            this.errorlpCount = errorlpCount;
+        }
+
+        public List<String> getErrorlpInfo() {
+            return errorlpInfo;
+        }
+
+        public void setErrorlpInfo(List<String> errorlpInfo) {
+            this.errorlpInfo = errorlpInfo;
+        }
     }
 }
@@ -17,9 +17,9 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 ##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password=
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -48,4 +48,4 @@ http.rfid.url= http://114.80.178.12:29000/rfid
 ## http ticketing interface
 http.ticketing.interface= http://112.64.187.3:1080/gjService/request
 ## first last generate
-ms.fl.generate=true
 \ No newline at end of file
+ms.fl.generate=true
@@ -10,7 +10,7 @@ datatools.kvars_dbuname=root
 #数据库密码
 datatools.kvars_dbpwd=
 #数据库库名
-datatools.kvars_dbdname=control
+datatools.kvars_dbdname=test_control
  
 # 3、上传数据配置信息
 # 上传文件目录配置（根据不同的环境需要修正）
@@ -307,7 +307,7 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $inbc: Long() from accumulate (TTInfoDetail(bcType == "in") from $ttInfoDetails_wrap.getBcInfoList(), count())
         $outbc: Long() from accumulate (TTInfoDetail(bcType == "out") from $ttInfoDetails_wrap.getBcInfoList(), count())
         $yybc: Long() from accumulate (TTInfoDetail(bcType != "out", bcType != "in") from $ttInfoDetails_wrap.getBcInfoList(), count())
-        $errorbc: Long() from accumulate ($ttd: TTInfoDetail() from $ttInfoDetails_wrap.getBcInfoList(), ecount($ttd))
+        $errorbc: List() from accumulate ($ttd: TTInfoDetail() from $ttInfoDetails_wrap.getBcInfoList(), ecount($ttd))
     then
         log.info("时刻表={},id={},班次数={},进场={},出场={},营运={},错误={}", $statInfo.getTtname(), $statInfo.getTtid(), $allbc, $inbc, $outbc, $yybc, $errorbc);
  
@@ -315,7 +315,9 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $statInfo.setInbc($inbc);
         $statInfo.setOutbc($outbc);
         $statInfo.setYybc($yybc);
-        $statInfo.setErrorbc($errorbc);
+        $statInfo.setErrorbc((Integer) $errorbc.get(0));
+        $statInfo.setErrorlpCount((Integer) $errorbc.get(1));
+        $statInfo.setErrorlpInfo((List<String>) $errorbc.get(2));
  
         int lineVersion = $ttInfoDetails_wrap.getLineVersion();
         $statInfo.setLineVersion(lineVersion);
@@ -125,6 +125,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].$$ds = [];
  
                                         var errorTTInfos = 0;
+                                        var errorLpCount = 0;
  
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
@@ -140,6 +141,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                     yybc: obj.yybc,
  
                                                     errorbc: obj.errorbc,
+                                                    errorlpCount: obj.errorlpCount,
+                                                    errorlpInfo: obj.errorlpInfo,
  
                                                     lineVersion: obj.lineVersion
  
@@ -147,6 +150,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                                                 if (obj.errorbc > 0) {
                                                     errorTTInfos ++;
+                                                } else if (obj.errorlpCount > 0) {
+                                                    errorLpCount ++;
                                                 } else {
                                                     ttinfonames.push(obj.ttname);
                                                     ttinfoids.push(obj.ttid);
@@ -156,6 +161,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             if (errorTTInfos > 0) {
                                                 scope[ctrlAs].$$internalmodel = undefined;
                                                 scope[ctrlAs].error = "时刻表有错误班次";
+                                            } else if (errorLpCount > 0) {
+                                                scope[ctrlAs].$$internalmodel = undefined;
+                                                scope[ctrlAs].error = "时刻表有错误路牌";
                                             } else {
                                                 scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
@@ -228,4 +236,4 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
 \ No newline at end of file
+);
@@ -56,6 +56,8 @@
                     <div><span ng-bind="info.ttname"></span></div>
                     <div><span>统计班次：{{info.allbc}}个，出场：{{info.outbc}}个，进场：{{info.inbc}}个，营运：{{info.yybc}}个</span></div>
                     <div><span>异常班次：{{info.errorbc}}个</span></div>
+                    <div><span>异常路牌：{{info.errorlpCount}}个</span></div>
+                    <div><span>异常路牌描述：{{info.errorlpInfo.join(",")}}</span></div>
                 </script>
  
                 <div ng-repeat="info in $saScpdateCtrl.$$ds track by $index">
@@ -68,8 +70,8 @@
                                 {{info.ttname}}
                             </a>
                         </h3>
-                        <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-if="info.errorbc == 0"></span>
-                        <span class="glyphicon glyphicon-remove" aria-hidden="true" ng-if="info.errorbc > 0"></span>
+                        <span class="glyphicon glyphicon-ok" aria-hidden="true" ng-if="info.errorbc == 0 && info.errorlpCount == 0"></span>
+                        <span class="glyphicon glyphicon-remove" aria-hidden="true" ng-if="info.errorbc > 0 || info.errorlpCount > 0"></span>
                     </div>
                 </div>
             </div>
@@ -78,4 +80,4 @@
  
  
  
-</div>
 \ No newline at end of file
+</div>
@@ -5146,6 +5146,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                         scope[ctrlAs].$$ds = [];
  
                                         var errorTTInfos = 0;
+                                        var errorLpCount = 0;
  
                                         if (result && result.data && result.data.infos && result.data.infos.length > 0) {
                                             angular.forEach(result.data.infos, function(obj) {
@@ -5161,6 +5162,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                                     yybc: obj.yybc,
  
                                                     errorbc: obj.errorbc,
+                                                    errorlpCount: obj.errorlpCount,
+                                                    errorlpInfo: obj.errorlpInfo,
  
                                                     lineVersion: obj.lineVersion
  
@@ -5168,6 +5171,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
  
                                                 if (obj.errorbc > 0) {
                                                     errorTTInfos ++;
+                                                } else if (obj.errorlpCount > 0) {
+                                                    errorLpCount ++;
                                                 } else {
                                                     ttinfonames.push(obj.ttname);
                                                     ttinfoids.push(obj.ttid);
@@ -5177,6 +5182,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                             if (errorTTInfos > 0) {
                                                 scope[ctrlAs].$$internalmodel = undefined;
                                                 scope[ctrlAs].error = "时刻表有错误班次";
+                                            } else if (errorLpCount > 0) {
+                                                scope[ctrlAs].$$internalmodel = undefined;
+                                                scope[ctrlAs].error = "时刻表有错误路牌";
                                             } else {
                                                 scope[ctrlAs].$$internalmodel = "ok";
                                                 scope[ctrlAs].ttinfonames = ttinfonames.join(",");
@@ -5249,7 +5257,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(
             };
         }
     ]
-);
+);
+
 /**
  * saSrule指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：