Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 012c45d8 448de2e9
Showing 17 changed files with 172 additions and 69 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1Flat.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/rerun/RerunRule_input.java
src/main/resources/rules/plan.drl
src/main/resources/rules/rerun.drl
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/service.js
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/form.html
src/test/resources/testdata/problem.properties
@@ -178,40 +178,77 @@ public class SchedulePlanInfo {
     }
     // 对应路牌套跑
-    public void setRerunInfoDylp(CarConfigInfo cc, EmployeeConfigInfo ec) {
-        // 关联的车辆信息
-        this.cl = cc.getCl().getId(); // 车辆id
-        this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
-
-        // 关联的驾驶员
-        EmployeeConfigInfo employeeConfigInfo = ec;
+    public void setRerunInfoDylp(CarConfigInfo cc, EmployeeConfigInfo ec, String useType) {
+        if ("hr".equals(useType)) {
+            // 关联的驾驶员
+            EmployeeConfigInfo employeeConfigInfo = ec;
-        this.j = employeeConfigInfo.getJsy().getId();
+            this.j = employeeConfigInfo.getJsy().getId();
 //        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-        if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-            String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-            if (jsy_temp.length > 1) {
-                this.jGh = jsy_temp[1];
-            } else {
-                this.jGh = jsy_temp[0];
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+                if (jsy_temp.length > 1) {
+                    this.jGh = jsy_temp[1];
+                } else {
+                    this.jGh = jsy_temp[0];
+                }
             }
-        }
-        this.jName = employeeConfigInfo.getJsy().getPersonnelName();
-        // 关联的售票员
-        if (employeeConfigInfo.getSpy() != null) {
-            this.s = employeeConfigInfo.getSpy().getId();
+            this.jName = employeeConfigInfo.getJsy().getPersonnelName();
+            // 关联的售票员
+            if (employeeConfigInfo.getSpy() != null) {
+                this.s = employeeConfigInfo.getSpy().getId();
 //            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                if (spy_temp.length > 1) {
-                    this.sGh = spy_temp[1];
+                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                    if (spy_temp.length > 1) {
+                        this.sGh = spy_temp[1];
+                    } else {
+                        this.sGh = spy_temp[0];
+                    }
+                }
+
+                this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+            }
+        } else if ("hc".equals(useType)) {
+            // 关联的车辆信息
+            this.cl = cc.getCl().getId(); // 车辆id
+            this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
+        } else { // 所有的
+            // 关联的车辆信息
+            this.cl = cc.getCl().getId(); // 车辆id
+            this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
+
+            // 关联的驾驶员
+            EmployeeConfigInfo employeeConfigInfo = ec;
+
+            this.j = employeeConfigInfo.getJsy().getId();
+//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
+            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+                if (jsy_temp.length > 1) {
+                    this.jGh = jsy_temp[1];
                 } else {
-                    this.sGh = spy_temp[0];
+                    this.jGh = jsy_temp[0];
                 }
             }
+            this.jName = employeeConfigInfo.getJsy().getPersonnelName();
+            // 关联的售票员
+            if (employeeConfigInfo.getSpy() != null) {
+                this.s = employeeConfigInfo.getSpy().getId();
+//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
+                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+                    if (spy_temp.length > 1) {
+                        this.sGh = spy_temp[1];
+                    } else {
+                        this.sGh = spy_temp[0];
+                    }
+                }
-            this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+                this.sName = employeeConfigInfo.getSpy().getPersonnelName();
+            }
         }
+
     }
     public SchedulePlanInfo(
@@ -68,6 +68,8 @@ public class RerunRule extends BEntity {
     /** 使用路牌 */
     @ManyToOne(cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
     private GuideboardInfo useLp;
+    /** 对应路牌替换类型，hr；换人，hc：换车，all：换人换车 */
+    private String useType;
     //--------- 对应班车 ----------/
     /** 车辆配置 */
@@ -251,4 +253,12 @@ public class RerunRule extends BEntity {
     public void setsName(String sName) {
         this.sName = sName;
     }
+
+    public String getUseType() {
+        return useType;
+    }
+
+    public void setUseType(String useType) {
+        this.useType = useType;
+    }
 }
@@ -76,6 +76,10 @@ public class ScheduleRule1Flat extends BEntity {
     /** 翻班格式（类似格式：1110011）*/
     private String fbgs;
+    /** 备注 */
+    @Column(length = 1000)
+    private String remark;
+
     public Long getId() {
         return id;
     }
@@ -164,4 +168,11 @@ public class ScheduleRule1Flat extends BEntity {
         this.fbgs = fbgs;
     }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
@@ -254,12 +254,15 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         List<RerunRule_input> rerunRule_inputs = scheduleRuleService.findRerunrule(Integer.parseInt(planResult.getXlId()));
         logger.info("套跑数量 {} 组", rerunRule_inputs.size());
+        // 主线路id
+        Integer mainXlId = schedulePlan.getXl().getId();
+
         if (rerunRule_inputs.size() > 0) {
             // 找出是对应路牌类型的线路，计算循环规则输出
             Set<String> xlids = new HashSet<>();
             for (RerunRule_input rerunRule_input: rerunRule_inputs) {
                 if ("dylp".equals(rerunRule_input.getType())) {
-                    xlids.add(rerunRule_input.getXl());
+                    xlids.add(rerunRule_input.getS_xl()); // 参与套跑的线路
                 }
             }
@@ -309,6 +312,8 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
             Date end1 = new Date();
             logger.info("套跑规则计算，耗时 {} ms", end1.getTime() - start1.getTime());
+            schedulePlan.getXl().setId(mainXlId);
+
         }
     }
@@ -349,7 +349,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             // 计算班次里程
                             if (StringUtils.isNotEmpty(jhlc)) {
-                                if ("in".equals(bctype) || "out".equals(bctype)) {
+                                if ("in".equals(bctype) || "out".equals(bctype) || "ldks".equals(bctype)) {
                                     bc_ks += 1;
                                     lc_ks += Double.valueOf(jhlc);
@@ -44,6 +44,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 ", rerun_ttinfodetail_fcsjs as m_fcsjs " +
                 ", use_xl as s_dylp_xl " +
                 ", use_lp as s_dylp_lp " +
+                ", use_type as s_dylp_type " +
                 ", cl as s_dybc_cl " +
                 ", cl_zbh as s_dybc_clzbh " +
                 ", j as s_dybc_j " +
@@ -53,7 +54,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 ", s_gh as s_dybc_sgh " +
                 ", s_name as s_dybc_sname " +
                 "from bsth_c_s_rerun_rule " +
-                "where rerun_xl = ? ";
+                "where is_cancel = 0 and rerun_xl = ? ";
         final List<RerunRule_input> rerunRule_inputs = new ArrayList<>();
@@ -74,6 +75,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                     if ("dylp".equals(resultSet.getString("type"))) {
                         rerunRule_input.setS_xl(String.valueOf(resultSet.getInt("s_dylp_xl")));
                         rerunRule_input.setS_lp(String.valueOf(resultSet.getLong("s_dylp_lp")));
+                        rerunRule_input.setUsetype(resultSet.getString("s_dylp_type"));
                     } else if ("dybc".equals(resultSet.getString("type"))) {
                         rerunRule_input.setCl(resultSet.getInt("s_dybc_cl"));
                         rerunRule_input.setZbh(resultSet.getString("s_dybc_clzbh"));
@@ -12,6 +12,7 @@ public class RerunRule_input {
     private String type; // 套跑类型（dylp-对应路牌, dybc-对应班车）
     private String s_xl; // 对应路牌，线路Id
     private String s_lp; // 对应路牌，路牌Id
+    private String usetype; // 对应路牌替换类型
     private Integer cl; // 对应班车，车辆Id
     private String zbh; // 对应班车，车辆自编号
@@ -141,4 +142,12 @@ public class RerunRule_input {
     public void setSname(String sname) {
         this.sname = sname;
     }
+
+    public String getUsetype() {
+        return usetype;
+    }
+
+    public void setUsetype(String usetype) {
+        this.usetype = usetype;
+    }
 }
@@ -386,8 +386,14 @@ rule &quot;Calcu_SchedulePlanInfo&quot;
             // 时刻表id
             String ttInfoId = ttInfoId_sd($lr.getTtInfoMapLoop(), sd);
             TTInfoDetail_Wraps ttInfoDetail_wraps = (TTInfoDetail_Wraps) $tts.getWrapsMap().get(ttInfoId);
-            List detaillist = (List) ttInfoDetail_wraps.getDetailsMap().get(gid);
+            if (ttInfoDetail_wraps == null) {
+                // 时刻表为空，直接跳过
+                // 如1118路，周末不开，此是时刻表指定一个空表
+                // TODO：这个以后要改的，选时刻表的规则要修正，没有默认的时刻表
+                continue;
+            }
+            List detaillist = (List) ttInfoDetail_wraps.getDetailsMap().get(gid);
             if (detaillist == null) {
                 // 这里翻到的路牌时刻表里可能没有，
                 // 因为没有考虑翻班格式（就是做几休几）
@@ -47,7 +47,7 @@ rule &quot;calcu_Dylp_CarConfig_Wraps&quot;
         $rp: RerunRule_param($xlId: mxlid)
         $dylpxlid: String() from $rp.getXlIds_dylp()
     then
-        List carConfigInfos =  carConfigInfoRepository.findByXlId(Integer.parseInt($xlId));
+        List carConfigInfos =  carConfigInfoRepository.findByXlId(Integer.parseInt($dylpxlid));
         Dylp_CarConfig_Wraps carConfig_wraps = new Dylp_CarConfig_Wraps();
         carConfig_wraps.setXlId($dylpxlid);
@@ -76,10 +76,10 @@ rule &quot;calcu_Dylp_EmployeeConfig_Wraps&quot;
         $rp: RerunRule_param($xlId: mxlid)
         $dylpxlid: String() from $rp.getXlIds_dylp()
     then
-        List employeeConfigInfos = employeeConfigInfoRepository.findByXlId(Integer.parseInt($xlId));
+        List employeeConfigInfos = employeeConfigInfoRepository.findByXlId(Integer.parseInt($dylpxlid));
         Dylp_EmployeeConfig_Wraps employeeConfig_wraps = new Dylp_EmployeeConfig_Wraps();
-        employeeConfig_wraps.setXlId($xlId);
+        employeeConfig_wraps.setXlId($dylpxlid);
         employeeConfig_wraps.setEcMap(new HashMap());
         for (int i = 0; i < employeeConfigInfos.size(); i++) {
@@ -118,6 +118,8 @@ rule &quot;calcu_Dylp_ScheduleResult_output_wrap&quot;
         wrap.setCc((CarConfigInfo) $ccmap.get($sr.getCarConfigId()));
         wrap.setEc((EmployeeConfigInfo) $ecmap.get($sr.getEmployeeConfigId()));
+//        log.info("xlid = {}", $xlId);
+
         insert(wrap);
 end
@@ -133,7 +135,7 @@ rule &quot;calcu_Dylp_rerun_update_dylp&quot;
             ttinfo == $ttinfo.toString(),
             lp == $lp.toString(),
             fcsj == $fcsj,
-            $sxl: s_xl, $slp: s_lp
+            $sxl: s_xl, $slp: s_lp, $type: usetype
         )
         $dsro: Dylp_ScheduleResult_output_wrap(
             xlId == $sxl,
@@ -143,7 +145,7 @@ rule &quot;calcu_Dylp_rerun_update_dylp&quot;
     then
 //        log.info("TODO：测试 {}", $fcsj);
-        $spi.setRerunInfoDylp($dsro.getCc(), $dsro.getEc());
+        $spi.setRerunInfoDylp($dsro.getCc(), $dsro.getEc(), $type);
 end
@@ -327,7 +327,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
+            {order: 'xl,isCancel,lpNo', direction: 'DESC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -3,7 +3,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
+            {order: 'xl,isCancel,lpNo', direction: 'DESC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -175,6 +175,14 @@
                     </div>
                 </div>
+                <div class="form-group has-success has-feedback"
+                     ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'">
+                    <label class="col-md-2 control-label">替换类型：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.rerunManageForSave.useType" dicgroup="dylptype" name="useType"></sa-Radiogroup>
+                    </div>
+                </div>
+
                 <div class="form-group has-success has-feedback" ng-if="ctrl.rerunManageForSave.rerunType == 'dybc'">
                     <label class="col-md-2 control-label">车辆配置*：</label>
@@ -175,6 +175,14 @@
                     </div>
                 </div>
+                <div class="form-group has-success has-feedback"
+                     ng-if="ctrl.rerunManageForSave.rerunType == 'dylp'">
+                    <label class="col-md-2 control-label">替换类型：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.rerunManageForSave.useType" dicgroup="dylptype" name="useType"></sa-Radiogroup>
+                    </div>
+                </div>
+
                 <div class="form-group has-success has-feedback" ng-if="ctrl.rerunManageForSave.rerunType == 'dybc'">
                     <label class="col-md-2 control-label">车辆配置*：</label>
@@ -169,6 +169,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             } else {
                 // 初始表单，从查询条件中获取线路id
                 self.rerunManageForSave.rerunXl.id = service.getSearchCondition()['rerunXl.id_eq'];
+                self.rerunManageForSave.useType = "all";
             }
             // 提交方法
@@ -167,20 +167,20 @@
                                           required >
                         </sa-Checkboxgroup>
-                        <input type="hidden" name="rule_days_h" ng-model="ctrl.ttInfoManageForForm.rule_days"
-                               remote-Validation
-                               remotevtype="tic_n_d"
-                               remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'rule_days_eq': ctrl.ttInfoManageForForm.rule_days} | json}}"
-                                />
+                        <!--<input type="hidden" name="rule_days_h" ng-model="ctrl.ttInfoManageForForm.rule_days"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="tic_n_d"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'rule_days_eq': ctrl.ttInfoManageForForm.rule_days} | json}}"-->
+                                <!--/>-->
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
                         请操作一下1
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.rule_days_h.$error.remote">
-                        常规有效日重复
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.rule_days_h.$error.remote">-->
+                        <!--常规有效日重复-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group">
@@ -193,18 +193,18 @@
                                 >
                         </sa-Dategroup>
-                        <input type="hidden" name="special_days_h" ng-model="ctrl.ttInfoManageForForm.special_days"
-                               remote-Validation
-                               remotevtype="tic_s_d"
-                               remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'special_days_eq': ctrl.ttInfoManageForForm.special_days} | json}}"
-                                />
+                        <!--<input type="hidden" name="special_days_h" ng-model="ctrl.ttInfoManageForForm.special_days"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="tic_s_d"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'special_days_eq': ctrl.ttInfoManageForForm.special_days} | json}}"-->
+                                <!--/>-->
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
                         请操作一下2
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.special_days_h.$error.remote">
-                        特殊有效日重复
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.special_days_h.$error.remote">-->
+                        <!--特殊有效日重复-->
+                    <!--</div>-->
                 </div>
                 <!--<div class="form-group">-->
@@ -167,18 +167,18 @@
                                           required >
                         </sa-Checkboxgroup>
-                        <input type="hidden" name="rule_days_h" ng-model="ctrl.ttInfoManageForForm.rule_days"
-                               remote-Validation
-                               remotevtype="tic_n_d"
-                               remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'rule_days_eq': ctrl.ttInfoManageForForm.rule_days} | json}}"
-                                />
+                        <!--<input type="hidden" name="rule_days_h" ng-model="ctrl.ttInfoManageForForm.rule_days"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="tic_n_d"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'rule_days_eq': ctrl.ttInfoManageForForm.rule_days} | json}}"-->
+                                <!--/>-->
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.rule_days.$error.required">
                         请操作一下1
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.rule_days_h.$error.remote">
-                        常规有效日重复
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.rule_days_h.$error.remote">-->
+                        <!--常规有效日重复-->
+                    <!--</div>-->
                 </div>
                 <div class="form-group">
@@ -191,19 +191,19 @@
                                 >
                         </sa-Dategroup>
-                        <input type="hidden" name="special_days_h" ng-model="ctrl.ttInfoManageForForm.special_days"
-                               remote-Validation
-                               remotevtype="tic_s_d"
-                               remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'special_days_eq': ctrl.ttInfoManageForForm.special_days} | json}}"
-                                />
+                        <!--<input type="hidden" name="special_days_h" ng-model="ctrl.ttInfoManageForForm.special_days"-->
+                               <!--remote-Validation-->
+                               <!--remotevtype="tic_s_d"-->
+                               <!--remotevparam="{{ {'id_eq': ctrl.ttInfoManageForForm.id, 'xl.id_eq': ctrl.ttInfoManageForForm.xl.id, 'special_days_eq': ctrl.ttInfoManageForForm.special_days} | json}}"-->
+                                <!--/>-->
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.special_days.$error.required">
                         请操作一下2
                     </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.special_days_h.$error.remote">
-                        特殊有效日重复
-                    </div>
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.special_days_h.$error.remote">-->
+                        <!--特殊有效日重复-->
+                    <!--</div>-->
                 </div>
                 <!--<div class="form-group">-->
@@ -9,10 +9,14 @@
 9=下拉框貌似中文不能搜索
 10=时刻表明细编辑，环线，选上下行，上下的站点在下行站点列表里
 ##11=人员基础信息导入问题，工号前要加公司代码
-12=套跑规则嵌入到主排班规则中
+##12=套跑规则嵌入到主排班规则中
 13=导入数据功能，需要加用户名
 14=路牌编号自动生成
 15=时刻表导入的时候表头后面不需要加数字
 16=时间框中文
 17=人员工号前公司编码自动加
+18=排班计划明细可以修改（修改到每个班次）
+19=线路运营概览
+20=排班规则备注
+21=时刻表，两点间空驶，算空驶