Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control.git into minhang

王通
2 parents a1eb7a0d 81cca300
Showing 12 changed files with 143 additions and 22 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/resources/rules/kBase3_validate_timetable.drl
src/main/resources/static/pages/base/timesmodel/js/add-form-reload.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/Main_v2_2_ExcelObj.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/main_v2_2.js
src/main/resources/static/pages/control/lineallot_v2/main.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
@@ -126,6 +126,8 @@ public class Cars extends BEntity implements Serializable {
     private String serviceNo;
     /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfdc;
+    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfmix;
     /** 备注/描述 */
     private String descriptions;
@@ -512,4 +514,12 @@ public class Cars extends BEntity implements Serializable {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
+
+    public Boolean getSfmix() {
+        return sfmix;
+    }
+
+    public void setSfmix(Boolean sfmix) {
+        this.sfmix = sfmix;
+    }
 }
@@ -12,10 +12,10 @@ import java.util.Date;
 public class BEntity {
     /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private SysUser createBy;
     /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private SysUser updateBy;
     /** 创建日期 */
@@ -123,7 +123,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             int colnums = poi_sheet.getRow(0).getLastCellNum();
             Row firstrow = poi_sheet.getRow(0);
             for (int i = 0; i < colnums; i++) {
-                org.apache.poi.ss.usermodel.Cell cell = firstrow.getCell(i);
+                Cell cell = firstrow.getCell(i);
                 if (i == 0) {
                     colList.add(PoiUtils.getStringValueFromCell(cell).trim());
                 } else {
@@ -258,7 +258,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             int colnums = poi_sheet.getRow(0).getLastCellNum();
             Row firstrow = poi_sheet.getRow(0);
             for (int i = 0; i < colnums; i++) {
-                org.apache.poi.ss.usermodel.Cell cell = firstrow.getCell(i);
+                Cell cell = firstrow.getCell(i);
                 colList.add(PoiUtils.getStringValueFromCell(cell).trim().replaceAll("(->\\d+)", ""));
             }
@@ -454,6 +454,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 0; i < groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -566,6 +579,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 1; i <= groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -644,7 +670,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             cell.setCellValue(bcObj.getFcsj() + "X");
                         } else { // 一个车次链
                             cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                            cell.setCellValue(bcObj.getFcsj() + "X");
+                            if (cell != null) {
+                                cell.setCellValue(bcObj.getFcsj() + "X");
+                            }
                         }
                         break;
                     case LC:
@@ -100,6 +100,7 @@ declare TTInfo_wrap
     weekdays: List // 周一到周日是否启用 List<Boolean>
     specialDays: List // 特殊节假日 List<DateTime>
     updateDate: DateTime // 最新修改时间
+    lineVersion : Integer // 线路版本
 end
 rule "TTInfo_wrap_result"
@@ -118,6 +119,7 @@ rule &quot;TTInfo_wrap_result&quot;
         ttInfo_wrap.setUpdateDate(new DateTime($ttinfo.getUpdateDate()));
         ttInfo_wrap.setWeekdays(new ArrayList());
         ttInfo_wrap.setSpecialDays(new ArrayList());
+        ttInfo_wrap.setLineVersion($ttinfo.getLineVersion());
         String[] days = $ttinfo.getRule_days().split(",");
         for (int i = 0; i < 7; i++) {
@@ -151,6 +153,7 @@ end
 declare TTInfoDetails_wrap
     ttInfoId: Long // 时刻表id
+    lineVersion: Integer // 线路版本
     bcInfoList: List // 班次信息列表 List<TTInfoDetail>
 end
@@ -165,6 +168,7 @@ rule &quot;Calcu_iter_days_special_day&quot; // 特殊日期匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays contains $calcu_date
         )
     then
@@ -189,6 +193,7 @@ rule &quot;Calcu_iter_days_special_day&quot; // 特殊日期匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
         }
@@ -208,6 +213,7 @@ rule &quot;Calcu_iter_days_normal_day&quot; // 平日匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays not contains $calcu_date,
             weekdays[$calcu_weekday - 1] == Boolean.TRUE
         )
@@ -234,6 +240,7 @@ rule &quot;Calcu_iter_days_normal_day&quot; // 平日匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
         }
@@ -253,6 +260,7 @@ rule &quot;Calcu_iter_days_other_day&quot; // 都没有的情况下，匹配
         TTInfo_wrap(
             $tid: id,
             $tname: name,
+            $lineVersion: lineVersion,
             specialDays not contains $calcu_date,
             weekdays[$calcu_weekday - 1] == false
         )
@@ -278,6 +286,7 @@ rule &quot;Calcu_iter_days_other_day&quot; // 都没有的情况下，匹配
             TTInfoDetails_wrap ttInfoDetails_wrap = new TTInfoDetails_wrap();
             ttInfoDetails_wrap.setTtInfoId($tid);
+            ttInfoDetails_wrap.setLineVersion($lineVersion);
             Map<String, Object> param = new HashMap<String, Object>();
             ttInfoDetails_wrap.setBcInfoList(tTInfoDetailRepository.findByTtinfoId($tid));
             insert(ttInfoDetails_wrap);
@@ -308,7 +317,7 @@ rule &quot;statinfo_result&quot; // 统计计算结果
         $statInfo.setYybc($yybc);
         $statInfo.setErrorbc($errorbc);
-        int lineVersion = ((TTInfoDetail) $ttInfoDetails_wrap.getBcInfoList().get(0)).getLineVersion();
+        int lineVersion = $ttInfoDetails_wrap.getLineVersion();
         $statInfo.setLineVersion(lineVersion);
         rs.getInfos().add($statInfo);
@@ -3,7 +3,7 @@
 	if (!$('body').hasClass('page-sidebar-closed')) {
 		$('.menu-toggler.sidebar-toggler').click();
 	}
-	
+
 	$('.openHaveSkb').on('click',function() {
 		var skbId = $("#skbNameSelect").val();
 		var argus = {
@@ -66,6 +66,8 @@
 			CSMap = getMaxCarAndStopSpace0(map,seMap);
             // 发车间隙
             map.fcjx = CSMap.fcjx;
+            map.stt = "1";
+            _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap);
 		}else if(map.baseRes== '1') {
 			CSMap = getMaxCarAndStopSpace1(map);
             // 发车间隙
@@ -77,6 +79,7 @@
             CSMap = getMaxCarAndStopSpace1(map);
         } else if (map.baseRes == '3') { // 主站停站使用v2_2版本
             _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap); // TODO：暂时使用v2_1版本的方法，通用的，后续再放到v2_2版本中
+            console.log(_paramObj);
             map.clzs = InternalScheduleObj_v2_2.calcuClzx(_paramObj);
             CSMap = getMaxCarAndStopSpace1(map);
         }
@@ -143,7 +146,7 @@
         // // 初始化右键菜单.
         // contextInit(graph);
-        if (map.baseRes == '3' || map.baseRes == '1') {
+        if (map.baseRes == '3' || map.baseRes == '1' || map.baseRes == '0') {
             // 导入导出设置
             // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
@@ -186,7 +189,7 @@
                 return _rtnBcArray;
             };
-            // Main_v2_2.exportExcelConfig(_dfun);
+            Main_v2_2.exportExcelConfig(_paramObj, _dfun);
         }
         // 关闭弹出层
@@ -581,10 +581,10 @@ var Main_v2_2_ExcelObj = (function() {
                         "zdzid": oGanttBc.zdz, // 终点站id
                         "isUp": bIsUp, // 是否上行
-                        "isFb": null, // 是否分班（_resetBdOutInLcBcGroup方法修正）
+                        "isFb": false, // 是否分班（_resetBdOutInLcBcGroup方法修正）
                         "bcType": oGanttBc.bcType, // 班次类型（bc、out、in、lc）
-                        "fcsj": oGanttBc.fcsj, // 发车时间描述
+                        "fcsj": (oGanttBc.fcsj == null ? "" : oGanttBc.fcsj), // 发车时间描述
                         "groupNo": -99, // 第几圈（_resetBdOutInLcBcGroup方法修正）
                         "groupBcNo": -99, // 圈里第几个班次（_resetBdOutInLcBcGroup方法修正）
@@ -43,7 +43,7 @@ var Main_v2_2 = function() {
             schedule.fnAdjustHeadway();
             // 4、计算吃饭班次
             schedule.fnCalcuEatBc();
-            // // 6、计算末班车
+            // // 6、计算末班车（TODO：这里家里末班车，貌似导出Excel会报错，待修正）
             // schedule.fnCalcuLastBc();
             // 7、重新设置停站时间
             schedule.fnReSetLayoverTime();
@@ -64,8 +64,8 @@ var Main_v2_2 = function() {
          * 导出时刻表配置。
          * @param fnGetGanttBc 获取gantt班次方法
          */
-        exportExcelConfig: function(fnGetGanttBc) {
-            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
+        exportExcelConfig: function(paramobj, fnGetGanttBc) {
+            var oExcel = new Main_v2_2_ExcelObj(paramobj, fnGetGanttBc);
             $('.exportAddXls').off('click');
             $('.exportAddXlsx').off('click');
@@ -144,7 +144,7 @@
         <div class="allot_wrap uk-flex-center" uk-grid>
             <div class="uk-card uk-card-hover uk-card-body uk-width-2-3@m"
                  style="padding-top: 20px;padding-bottom: 20px;">
-                <div class="company_search_wrap">
+                <div class="company_search_wrap" style="width: 99%">
                     <select class="uk-select company_search_select"></select>
                     <select class="uk-select fgs_search_select" disabled>
                         <option value="">分公司搜索</option>
@@ -153,6 +153,9 @@
                         <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
                         <input class="uk-input line_search_input" style="width: 310px;" placeholder="搜索线路">
                     </div>
+                        <button class="uk-button  uk-button-primary" style="font-size: 16px;float: right;" id="select_all" data-selectType="select_all_no"><i
+                                uk-icon=" " style="margin-right: 5px;" ></i>全选
+                        </button>
                 </div>
                 <hr>
                 <div class="line_list_all_wrap"></div>
@@ -164,8 +167,10 @@
                 <button class="uk-button uk-button-default uk-button-large" style="font-size: 16px" id="go_to_real_system_btn"><i
                         uk-icon=" icon: sign-in" style="margin-right: 5px;" ></i>进入线路调度
                 </button>
+
                 <label class="pattern_type_label"><input class="uk-checkbox" type="checkbox" > 主调模式登录</label>
                 <label class="new_window_open_label" title="可能会被浏览器阻止新建窗口" uk-tooltip><input class="uk-checkbox" type="checkbox"> 新窗口打开</label>
+
             </div>
             <div class="uk-alert-warning uk-width-2-3@m " uk-alert>
@@ -244,6 +249,7 @@
                 $('.item[data-id='+line.lineCode+']','.line_list_all_wrap').trigger('click');
             });
         }
+        selectButtonStatus();
     });
     $('.pattern_type_label').on('click', function () {
@@ -297,6 +303,7 @@
                     });
             $('.checked_list').append(span);
         }
+        selectButtonStatus();
     });
     /*$('.checked_list').on('click', '.item', function () {
@@ -469,6 +476,44 @@
     })();
     var storage = window.localStorage;
     $('#go_to_real_system_btn').on('click', go_to_xd_sys);
+    $('#select_all').on('click', function(){
+        if ($(this).attr("data-selectType")=="select_all_no"){
+            $('.line_list_all_wrap>.item').addClass('active');
+            $(this).text('全不选');
+            $(this).attr("data-selectType","select_all");
+            var linesArrays= $('.line_list_all_wrap span.item');
+            if(linesArrays&&linesArrays.length>0){
+                $('.checked_list').empty();
+                for (var i = 0; i < linesArrays.length; i++) {
+                    var span = $('<span data-id="'+$(linesArrays[i]).data('id')+'" class="item uk-card uk-card-default uk-animation-slide-bottom '+($(linesArrays[i]).hasClass('destroy')?"destroy":"")+'">'+$(linesArrays[i]).text()+'</span>')
+                        .one('webkitAnimationEnd', function () {
+                            $(this).removeClass('uk-animation-slide-bottom');
+                        });
+                    $('.checked_list').append(span);
+                }
+            }
+            $(this).removeClass('uk-button-primary');
+            $(this).addClass('uk-button-default');
+            return;
+        }
+        if ($(this).attr("data-selectType")=="select_all"){
+            $('.line_list_all_wrap>.item').removeClass('active');
+            $(this).text('全选');
+            $(this).attr("data-selectType","select_all_no");
+            $('.checked_list').empty();
+            $(this).removeClass('uk-button-default');
+            $(this).addClass('uk-button-primary');
+            return;
+        }
+    });
+    var selectButtonStatus=function(){
+        if($('.checked_list span.item').length==$('.line_list_all_wrap span.item').length){
+            $('#select_all').removeClass('uk-button-primary').addClass('uk-button-default').attr("data-selectType","select_all").text('全不选');
+        }else {
+            $('#select_all').removeClass('uk-button-default').addClass('uk-button-primary').attr("data-selectType","select_all_no").text('全选');
+        }
+    }
+
     /**
      * 进入线调
      */
@@ -608,7 +653,9 @@
         var lineCode = $(e).data('id');
         $('.item[data-id='+lineCode+']','.line_list_all_wrap').removeClass('active');
         $(e).remove();
+        selectButtonStatus();
     }
+
 </script>
 </body>
 </html>
 \ No newline at end of file
@@ -55,7 +55,7 @@
 								<td>
 									<select class="form-control form-filter " name="enabled_eq">
                                          <option value="">请选择...</option>
-                                         <option value="true">可用</option>
+                                         <option value="true" selected = "selected">可用</option>
                                          <option value="false">禁用</option>
                                      </select>
 								</td>
@@ -131,7 +131,7 @@ $(function(){
 	    increaseArea: '20%'
 	};
-	jsDoQuery(null,true);
+	jsDoQuery({'enabled_eq':true},true);
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
@@ -216,11 +216,21 @@ $(function(){
 		    	if(initPagination){
 		    		initPagination = false;
 		    		return;
-		    	}	
-		    	
-		    	
-		    	page = num - 1;
-		    	jsDoQuery(null, false);
+		    	}
+                var cells = $('tr.filter')[0].cells
+                    ,params = {}
+                    ,name;
+                $.each(cells, function(i, cell){
+                    var items = $('input,select', cell);
+                    for(var j = 0, item; item = items[j++];){
+                        name = $(item).attr('name');
+                        if(name){
+                            params[name] = $(item).val();
+                        }
+                    }
+                });
+                page = num - 1;
+                jsDoQuery(params, false);
 		    }
 		});
 	}
@@ -449,6 +449,13 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForSave.sfmix" dicgroup="truefalseType" name="sfmix"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
@@ -441,6 +441,13 @@
                 </div>
                 <div class="form-group">
+                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.busInfoForSave.sfmix" dicgroup="truefalseType" name="sfmix"></sa-Radiogroup>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"