时刻表v2.7.6

1、修改分班路牌数确定规则，［连班路牌小于2，则5休2之外的车辆数则为连班车辆数］，［总分班路牌数小于加班路牌数，则忽略其他分班路牌数］ 2、生成时刻表时，需要选择站点路由版本，和导入时刻表一致，后台导出逻辑里使用StationRouteService查找站点路由名字 3、修正导出生成的时刻表的格式，最后的几个班次为进场，到场，离场 4、修正导出生成的时刻表的格式，每个路牌的统计小时分钟使用冒号分割，不用中文 5、修改PoiUtils，CellType为String时，需要添加 [xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));]

时刻表v2.7.6
1、修改分班路牌数确定规则，［连班路牌小于2，则5休2之外的车辆数则为连班车辆数］，［总分班路牌数小于加班路牌数，则忽略其他分班路牌数］ 2、生成时刻表时，需要选择站点路由版本，和导入时刻表一致，后台导出逻辑里使用StationRouteService查找站点路由名字 3、修正导出生成的时刻表的格式，最后的几个班次为进场，到场，离场 4、修正导出生成的时刻表的格式，每个路牌的统计小时分钟使用冒号分割，不用中文 5、修改PoiUtils，CellType为String时，需要添加 [xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));]
徐烜
1 parent 67754b96
Showing 6 changed files with 117 additions and 40 deletions
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/utils/PoiUtils.java
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/js/add-form-reload.js
src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
src/main/resources/static/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js
 package com.bsth.service.schedule.datatools;
 import com.bsth.entity.Station;
+import com.bsth.entity.StationRoute;
+import com.bsth.service.StationRouteService;
 import com.bsth.service.StationService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.*;
@@ -18,6 +20,8 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.joda.time.DateTime;
+import org.joda.time.LocalTime;
+import org.joda.time.format.DateTimeFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,9 +46,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     /** 日志记录器 */
     private final static Logger LOGGER = LoggerFactory.getLogger(TTInfoDetailDataToolsImpl.class);
-    // TODO：之后改了
     @Autowired
-    private StationService stationService;
+    private StationRouteService stationRouteService;
     @Autowired
     @Qualifier(value = "dataToolsServiceImpl")
@@ -441,8 +444,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
-        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
-        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
+        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
         for (int i = 0; i < groupCount; i++) {
             PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 1),
                     station1.getStationName(), new Color(0x96b9d7));
@@ -553,8 +556,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头，添加一个进场，添加一个出场
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short)0, "路牌", new Color(0x96b9d7));
-        Station station1 = stationService.findById(lpObjList.get(0).getStationRouteId1());
-        Station station2 = stationService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
+        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (1),
                 "报到", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (2),
@@ -565,23 +568,28 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (i * 2 + 2),
                     station2.getStationName(), new Color(0x96b9d7));
         }
+
+        // 最后一个进场需要变成三个班次
+        // 1个分班进场班次，1个到场班次，1个离场班次
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 3),
-                "进场", new Color(0x96b9d7));
+                station2.getStationName(), new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 4),
+                "到场", new Color(0x96b9d7));
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 5),
                 "离场", new Color(0x96b9d7));
         // 路牌统计字段
-        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 5),
-                "总公里", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 6),
-                "营业公里", new Color(0x96b9d7));
+                "总公里", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 7),
-                "空驶公里", new Color(0x96b9d7));
+                "营业公里", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 8),
-                "总工时", new Color(0x96b9d7));
+                "空驶公里", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 9),
-                "营业工时", new Color(0x96b9d7));
+                "总工时", new Color(0x96b9d7));
         PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 10),
+                "营业工时", new Color(0x96b9d7));
+        PoiUtils.createStringXSSFCell(wb, lpHeadRow, (short) (groupCount * 2 + 11),
                 "营运班次", new Color(0x96b9d7));
         // 构建每个路牌的班次数据
@@ -598,6 +606,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 3));
             PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 4));
+            PoiUtils.createBlankXSSFCell(wb, lpRow, (short) (groupCount * 2 + 5));
             for (BcObj bcObj : lpObj.getBcObjList()) {
                 if (bcObj.getBcType() == BcType.NORMAL) {
@@ -626,7 +635,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                 } else if (bcObj.getBcType() == BcType.IN) {
                     if (bcObj.getGroupNo() == -2) {
                         Cell cell = lpRow.getCell((short) (groupCount * 2 + 3));
-                        cell.setCellValue(bcObj.getFcsj());
+                        cell.setCellValue(bcObj.getFcsj() + "X");
                     } else if (bcObj.getGroupNo() > 0) { //分班进场
                         Cell cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
                         // 停驶用 ※
@@ -635,22 +644,27 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                 } else if (bcObj.getBcType() == BcType.LC) {
                     if (bcObj.getGroupNo() == -2) {
+                        // 这个是到场，准备离场班次
                         Cell cell = lpRow.getCell((short) (groupCount * 2 + 4));
                         cell.setCellValue(bcObj.getFcsj());
+                        // 加10分钟表示真正离场时间
+                        cell = lpRow.getCell((short) (groupCount * 2 + 5));
+                        LocalTime localTime = LocalTime.parse(bcObj.getFcsj(), DateTimeFormat.forPattern("HH:mm"));
+                        cell.setCellValue(localTime.plusMinutes(10).toString(DateTimeFormat.forPattern("HH:mm")));
                     }
                 }
             }
             // 路牌统计字段
-            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 5), lpObj.getZlc());
-            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 6), lpObj.getYylc());
-            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 7), lpObj.getKslc());
-            PoiUtils.createStringXSSFCell(wb, lpRow, (short) (groupCount * 2 + 8),
-                    String.format("%d小时%d分钟", (int) (lpObj.getZgs() / 60), (int) (lpObj.getZgs() % 60)));
+            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 6), lpObj.getZlc());
+            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 7), lpObj.getYylc());
+            PoiUtils.createDoubleXSSFCell(wb, lpRow, (short) (groupCount * 2 + 8), lpObj.getKslc());
             PoiUtils.createStringXSSFCell(wb, lpRow, (short) (groupCount * 2 + 9),
-                    String.format("%d小时%d分钟", (int) (lpObj.getYygs() / 60), (int) (lpObj.getYygs() % 60)));
-            PoiUtils.createIntegerXSSFCell(wb, lpRow, (short) (groupCount * 2 + 10), lpObj.getYybc());
+                    String.format("%d%s%d", (int) (lpObj.getZgs() / 60), ":", (int) (lpObj.getZgs() % 60)));
+            PoiUtils.createStringXSSFCell(wb, lpRow, (short) (groupCount * 2 + 10),
+                    String.format("%d%s%d", (int) (lpObj.getYygs() / 60), ":", (int) (lpObj.getYygs() % 60)));
+            PoiUtils.createIntegerXSSFCell(wb, lpRow, (short) (groupCount * 2 + 11), lpObj.getYybc());
         }
@@ -670,6 +684,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         sheet.autoSizeColumn(groupCount * 2 + 8);
         sheet.autoSizeColumn(groupCount * 2 + 9);
         sheet.autoSizeColumn(groupCount * 2 + 10);
+        sheet.autoSizeColumn(groupCount * 2 + 11);
     }
     @Override
@@ -58,7 +58,7 @@ public class PoiUtils {
     public static XSSFCell createStringXSSFCell(
             XSSFWorkbook xssfWorkbook, XSSFRow xssfRow, short column, String value,
             Color backgroundColor) {
-        return createXSSFCell(
+        XSSFCell xssfCell = createXSSFCell(
                 xssfWorkbook, xssfRow, column,
                 value, XSSFCell.CELL_TYPE_STRING,
                 HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
@@ -66,11 +66,14 @@ public class PoiUtils {
                 (short) 13, new Color(0x2765A7), "宋体",
                 backgroundColor, FillPatternType.SOLID_FOREGROUND
         );
+        DataFormat dataFormat = xssfWorkbook.createDataFormat();
+        xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));
+        return xssfCell;
     }
     public static XSSFCell createStringXSSFCell(
             XSSFWorkbook xssfWorkbook, XSSFRow xssfRow, short column, String value) {
-        return createXSSFCell(
+        XSSFCell xssfCell = createXSSFCell(
             xssfWorkbook, xssfRow, column,
                 value, XSSFCell.CELL_TYPE_STRING,
                 HorizontalAlignment.CENTER, VerticalAlignment.CENTER,
@@ -78,6 +81,9 @@ public class PoiUtils {
                 (short) 13, new Color(0x2765A7), "宋体",
                 new Color(0xffffff), FillPatternType.SOLID_FOREGROUND
         );
+        DataFormat dataFormat = xssfWorkbook.createDataFormat();
+        xssfCell.getCellStyle().setDataFormat(dataFormat.getFormat("@"));
+        return xssfCell;
     }
     public static XSSFCell createDoubleXSSFCell(
@@ -150,8 +156,9 @@ public class PoiUtils {
         // 设定值
         if (valueType == XSSFCell.CELL_TYPE_STRING) {
-            cell.setCellValue(creationHelper.createRichTextString(
-                    WorkbookUtil.createSafeSheetName(String.valueOf(value))));
+//            cell.setCellValue(creationHelper.createRichTextString(
+//                    WorkbookUtil.createSafeSheetName(String.valueOf(value))));
+            cell.setCellValue(creationHelper.createRichTextString(String.valueOf(value)));
         } else if (valueType == XSSFCell.CELL_TYPE_NUMERIC) {
             if (value instanceof Date) { // 日期
                 cellStyle.setDataFormat(creationHelper.createDataFormat().getFormat("yyyy-mm-dd"));
@@ -120,7 +120,21 @@
 				                    </div>
 				            	</div>
 		                		<!--  线路名称 (* 必填项) END -->
-	                 		</div>		
+
+	                 		</div>
+
+                            <div class="form-group">
+                                <!-- 线路版本 -->
+                                <div class="col-md-6">
+                                    <label class="control-label col-md-5">
+                                        <span class="required"> * </span> 站点路由版本&nbsp;：
+                                    </label>
+                                    <div class="col-md-6">
+                                        <select name="lineVersion" class="form-control input-medium"   id="lineVersionSelect"></select>
+                                    </div>
+                                </div>
+                            </div>
+
                  	 		<!-- 表单分组组件 form-group END -->
                         </div>
                         <!-- 获取参数 -->
@@ -132,10 +146,10 @@
 								<div class="col-md-9">
 									<div class="icheck-list">
 										<label >
-											<input type="radio" class="icheck" name="baseRes" value=1 checked> 班型/人次/车辆
+											<input type="radio" class="icheck" name="baseRes" value=1> 班型/人次/车辆
 										</label>
                                         <label>
-                                            <input type="radio" class="icheck" name="baseRes" value=2> 发车间隔分析
+                                            <input type="radio" class="icheck" name="baseRes" value=2 checked> 发车间隔分析
                                         </label>
 										<label>
 											<input type="radio" class="icheck" name="baseRes" value=0> 客流大数据分析
@@ -201,6 +201,25 @@
 			$get('/tic_ec/' + skbId ,null, function(d){
 				if(d.status=='SUCCESS') {
 					$("#lineSelect").select2("val", d.data.xl.id + '_' + d.data.xl.lineCode + '_' + d.data.xl.name);
+
+					// 获取线路版本信息
+                    $get('/tic_ec/stationroute/' + d.data.xl.id, null, function(rs){
+                        // 构造select2内容
+                        var iSelVersion = 0;
+                        var aOption = [];
+                        aOption.push('<option value="">请选择...</option><optgroup label="线路版本">');
+                        $.each(rs.data, function(i, g) {
+                            aOption.push('<option value="'+ g.version + '">' + g.desc + '</option>');
+                            if (i == 0) {
+                                iSelVersion = g.version;
+                            }
+                        });
+                        aOption.push('</optgroup>');
+                        $('#lineVersionSelect').html(aOption.join("")).select2();
+                        if (iSelVersion > 0) {
+                            $("#lineVersionSelect").select2("val", iSelVersion);
+                        }
+                    });
 				}
 			});
 		}
@@ -395,10 +395,26 @@ var SKBFormWizard = function() {
 				// 返回参数详情模版.
 				return cb && cb ({'forminput':template(tempName,{map:map}),'datadisplay': template(tempName +'config',{map:null})});
 			}else if (n==2) {
-                return cb && cb({
+                // 更具站点路由版本获取起点终点站
+                var iversion = $('#lineVersionSelect').val();
+                $get('/stationroute/all',{'line.id_eq':lineId,'destroy_eq':0, 'versions_eq': iversion},function(result) {
+                    $.each(result, function(i, d) {
+                        if (d.stationMark == 'B' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.startStationName = d.stationName;
+                        } else if (d.stationMark == 'E' && d.directions == 0) {
+                            // alert(d.stationName);
+                            map.line.endStationName = d.stationName;
+                        }
+                    });
+
+
+                    return cb && cb({
                         'forminput': template(tempName, {map: map}),
                         'datadisplay': template(tempName + '_config', {map: null})
                     });
+                });
+
             }
 		});
 	}
@@ -476,6 +492,7 @@ var SKBFormWizard = function() {
 				rules : {
 					'skbName' : {required : true,},// 时刻表名称,必填项.
 					'lineName' : {required : true,},// 线路名称,必填项.
+                    'lineVersion': {required: true}, // 站点路由版本，必填项，
 					// 'krl' : {isBaseRes : true,number : true,digits : true,},// 客容量,当选择为客流方式时必填项、整数
 					'startStationFirstTime' : {required : true}, // 起始站首班时间,必填项. 
 					'startStationEndTime' : {required : true}, // 起始站末班时间 ,必填项. 
@@ -598,20 +615,20 @@ var SKBFormWizard = function() {
 					var argus = form.serializeJSON();
 					console.log(argus);
 					// 获取站点路由.
-					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0],'destroy_eq':0},function(result) {
+					$get('/stationroute/all',{'line.id_eq':argus.lineName.split('_')[0],'destroy_eq':0, 'versions_eq': argus.lineVersion},function(result) {
 						// 判断.
 						if(result) {
 							// 定义上行起点站,上行终点站,下行起点站,下行终点站.
 							var upB ='',upE='',downB='',downE='';
 							for(var r = 0 ; r<result.length;r++) {
 								if(result[r].directions==0 && result[r].stationMark =='B')
-									upB = result[r].station.id;
+									upB = result[r].id;
 								if(result[r].directions==0 && result[r].stationMark =='E')
-									upE = result[r].station.id;
+									upE = result[r].id;
 								if(result[r].directions==1 && result[r].stationMark =='B')
-									downB = result[r].station.id;
+									downB = result[r].id;
 								if(result[r].directions==1 && result[r].stationMark =='E')
-									downE = result[r].station.id;
+									downE = result[r].id;
 							}
 							argus.up_s = upB + '_' + upE;
 							argus.down_s = downB + '_' + downE;
@@ -628,7 +645,7 @@ var SKBFormWizard = function() {
 								$get('/tidc/all',{'ttinfo.id_eq':parseInt(argus.skbName)},function(data) {
 									if(data.status=='SUCCESS' && data.data.length>0) {
 										argus.istidc = 1;
-										layer.confirm('系统已存在该时刻表【'+ 
+										layer.confirm('系统已存在该时刻表【'+
 												  $("#skbNameSelect").select2("data")[0].text +
 												  '】明细,是否使用已有数据渲染模型？', {
 										  btn: ['确定并使用','取消并继续'] //按钮
@@ -648,7 +665,7 @@ var SKBFormWizard = function() {
 							layer.msg('系统不存在该线路的上、下行起终点站！');
 						}
 					});
-					
+
 					// 表单提交.
 					function submit(p,argus) {
                         var baseRes2 = $('#submit_argus_form input[name="baseRes"]:checked').val();// 获取参数方式值.
@@ -354,13 +354,18 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             alert("总配车数小于低谷最小配车");
             throw "总配车数小于低谷最小配车";
         }
+
         if (iDgminpc < 2) {
-            alert("连班路牌小于2，办不到啊");
-            throw "连班路牌小于2，办不到啊";
+            // alert("连班路牌小于2，办不到啊");
+            // throw "连班路牌小于2，办不到啊";
+            console.log("连班路牌小于2，则5休2之外的车辆数则为连班车辆数");
+            iDgminpc = iCls - i_5_2_lpes;
         }
         if (iCls - iDgminpc < i_5_2_lpes) {
-            alert("总分班路牌数小于加班路牌数");
-            throw "总分班路牌数小于加班路牌数";
+            // alert("总分班路牌数小于加班路牌数");
+            // throw "总分班路牌数小于加班路牌数";
+            console.log("总分班路牌数小于加班路牌数，则忽略其他分班路牌数");
+            iDgminpc = iCls - i_5_2_lpes;
         }
         //// 修正连班路牌数，班次间隔大于20的，加1，直至班次间隔小于20