update

徐烜
1 parent b1952d3e
Showing 5 changed files with 99 additions and 26 deletions
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategy.java
src/main/java/com/bsth/service/schedule/rules/strategy/IStrategyImpl.java
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/detail_info.html
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableDetailManage.js
@@ -41,16 +41,9 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     @Override
     public Map<String, Object> save(SchedulePlan schedulePlan) {
-        // 查询参数
-        Map<String, Object> param = new HashMap<>();
-
-        // 1、查出指定线路的所有规则
-        Line xl = lineService.findById(schedulePlan.getXl().getId()); // 查找线路具体信息
-        param.clear();
-        param.put("xl.id_eq", xl.getId());
-        Iterable<ScheduleRule1Flat> scheduleRule1FlatIterable = scheduleRule1FlatService.list(param);
-        if (!scheduleRule1FlatIterable.iterator().hasNext())
-            throw new RuntimeException("线路：" + xl.getName() + " 没有配置规则！");
+        // 1-1、查找线路具体信息
+        Line xl = strategy.getLine(schedulePlan.getXl().getId());
+        // 1-2、查出指定线路的所有规则
         TTInfo ttInfo = strategy.getTTInfo(xl.getId()); // 时刻表id
         schedulePlan.setTtInfo(ttInfo); // 关联的时刻表
  
@@ -59,7 +52,7 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         ScheduleCalcuParam_input scheduleCalcuParam_input = new ScheduleCalcuParam_input(schedulePlan);
         // 每个规则对应的输入参数
         List<ScheduleRule_input> scheduleRule_inputs = new ArrayList<>();
-        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = scheduleRule1FlatIterable.iterator();
+        Iterator<ScheduleRule1Flat> scheduleRule1FlatIterator = strategy.getScheduleRule(xl.getId()).iterator();
         while (scheduleRule1FlatIterator.hasNext()) {
             ScheduleRule1Flat scheduleRule1Flat_temp = scheduleRule1FlatIterator.next();
             ScheduleRule_input scheduleRule_input = new ScheduleRule_input(scheduleRule1Flat_temp);
 package com.bsth.service.schedule.rules.strategy;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
 import com.google.common.collect.Multimap;
  
 import java.util.Map;
@@ -14,28 +16,42 @@ import java.util.Map;
 public interface IStrategy {
  
     /**
-     * 查找指定线路下，可用的时刻表;
+     * 获取线路信息。
+     * @param xlId 线路id
+     * @return
+     */
+    Line getLine(Integer xlId);
+
+    /**
+     * 获取指定线路下，可用的时刻表。
      * @param xlId 线路id
      * @return 时刻表
      */
     TTInfo getTTInfo(Integer xlId);
  
     /**
-     * 查找指定线路下，路牌与时刻明细对应的Map。
+     * 获取指定线路下，可用的排班规则。
+     * @param xlId
+     * @return
+     */
+    Iterable<ScheduleRule1Flat> getScheduleRule(Integer xlId);
+
+    /**
+     * 获取指定线路下，路牌与时刻明细对应的Map。
      * @param xlId 线路id
      * @return 路牌id为key，时刻明细 Collection<TTInfoDetail> 为value
      */
     Multimap<Long, TTInfoDetail> getGuideboardXlTTInfoDetailMaps(Integer xlId);
  
     /**
-     * 查找指定线路下，车辆配置与车辆信息对应的Map。
+     * 获取指定线路下，车辆配置与车辆信息对应的Map。
      * @param xlId 线路id
      * @return 车辆配置id为key，具体车辆配置信息为value。
      */
     Map<Long, CarConfigInfo> getCarConfigMaps(Integer xlId);
  
     /**
-     * 查找指定线路下，人员配置与人员对应的Map。
+     * 获取指定线路下，人员配置与人员对应的Map。
      * @param xlId 线路id
      * @return 人员配置id为key，具体人员配置信息为value。
      */
 package com.bsth.service.schedule.rules.strategy;
  
+import com.bsth.entity.Line;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
-import com.bsth.service.schedule.CarConfigInfoService;
-import com.bsth.service.schedule.EmployeeConfigInfoService;
-import com.bsth.service.schedule.TTInfoDetailService;
-import com.bsth.service.schedule.TTInfoService;
+import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.LineService;
+import com.bsth.service.schedule.*;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,12 +30,22 @@ public class IStrategyImpl implements IStrategy {
     private EmployeeConfigInfoService employeeConfigInfoService;
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
+    @Autowired
+    private LineService lineService;
+    @Autowired
+    private ScheduleRule1FlatService scheduleRule1FlatService;
+
+    @Override
+    public Line getLine(Integer xlId) {
+        Line xl = lineService.findById(xlId); // 查找线路具体信息
+        return xl;
+    }
  
     @Override
     public TTInfo getTTInfo(Integer xlId) {
         // TODO：本来要使用规则判定到底使用哪张时刻表，这里选用第一张
-        // 查询参数
-        Map<String, Object> param = new HashMap<>();
+        Map<String, Object> param = new HashMap<>(); // 查询参数
+        param.clear();
         param.put("xl.id_eq", xlId); // 线路id
         param.put("isCancel_eq", false); // 没有作废
         param.put("isEnableDisTemplate_eq", true); // 是否启用
@@ -47,6 +57,19 @@ public class IStrategyImpl implements IStrategy {
     }
  
     @Override
+    public Iterable<ScheduleRule1Flat> getScheduleRule(Integer xlId) {
+        Map<String, Object> param = new HashMap<>(); // 查询参数
+        Line xl = lineService.findById(xlId); // 查找线路具体信息
+        param.clear();
+        param.put("xl.id_eq", xl.getId());
+        Iterable<ScheduleRule1Flat> scheduleRule1FlatIterable = scheduleRule1FlatService.list(param);
+        if (!scheduleRule1FlatIterable.iterator().hasNext())
+            throw new RuntimeException("线路：" + xl.getName() + " 没有配置规则！");
+
+        return scheduleRule1FlatIterable;
+    }
+
+    @Override
     public Multimap<Long, TTInfoDetail> getGuideboardXlTTInfoDetailMaps(Integer xlId) {
         TTInfo ttInfo = getTTInfo(xlId);
         // 查询参数
@@ -119,21 +119,38 @@
                                         </li>
                                         <li class="divider"></li>
                                         <li>
-                                            <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell)">
+                                            <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 0)">
                                                 <i class="fa fa-file-excel-o"></i>
-                                                设置反向
+                                                设为上行
+                                                <i class="fa fa-arrow-up" aria-hidden="true"></i>
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell, 1)">
+                                                <i class="fa fa-file-excel-o"></i>
+                                                设为下行
+                                                <i class="fa fa-arrow-down" aria-hidden="true"></i>
                                             </a>
                                         </li>
                                         <li>
                                             <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, true)">
                                                 <i class="fa fa-file-excel-o"></i>
                                                 设置分班
+                                                <i class="fa fa-adjust" aria-hidden="true"></i>
                                             </a>
                                         </li>
                                         <li>
                                             <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, false)">
                                                 <i class="fa fa-file-excel-o"></i>
                                                 取消分班
+                                                <i class="fa fa-adjust" aria-hidden="true"></i>
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="javascript:" class="tool-action" ng-click="ctrl.changeBCType(cell, 'region')">
+                                                <i class="fa fa-file-excel-o"></i>
+                                                设为区间
+                                                <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
                                             </a>
                                         </li>
  
@@ -70,13 +70,13 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageCtrl&#39;, [&#39;TimeTabl
      * 反向操作。
      * @param cell 明细信息
      */
-    self.changeDirect = function(detailInfo) {
+    self.changeDirect = function(detailInfo, xldir) {
         timeTableDetailManageService.getDetail(detailInfo.ttdid).then(
             function(result) {
-                result.xlDir = result.xlDir == "0" ? "1" : "0";
+                result.xlDir = xldir;
                 timeTableDetailManageService.saveDetail(result).then(
                     function(result) {
-                        detailInfo.xldir = detailInfo.xldir == "0" ? "1" : "0";
+                        detailInfo.xldir = xldir;
                     },
                     function(result) {
                         alert("出错啦！");
@@ -113,6 +113,30 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageCtrl&#39;, [&#39;TimeTabl
         );
     };
  
+    /**
+     * 改变便次类型。
+     * @param detailInfo 明细信息
+     * @param type 班次类型
+     */
+    self.changeBCType = function(detailInfo, type) {
+        timeTableDetailManageService.getDetail(detailInfo.ttdid).then(
+            function(result) {
+                result.bcType = type;
+                timeTableDetailManageService.saveDetail(result).then(
+                    function(result) {
+                        detailInfo.bc_type = type;
+                    },
+                    function(result) {
+                        alert("出错啦！");
+                    }
+                );
+            },
+            function(result) {
+                alert("出错啦！");
+            }
+        );
+    };
+
 }]);
  
 angular.module('ScheduleApp').controller('TimeTableDetailManageFormCtrl', ['TimeTableDetailManageService', '$stateParams', '$state', function(timeTableDetailManageService, $stateParams, $state) {