update

潘钊
1 parent 9f6fce8d
Showing 14 changed files with 337 additions and 29 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/common/CommonMapped.java
src/main/java/com/bsth/vehicle/common/CommonRefreshThread.java
src/main/resources/fatso/start.js
src/main/resources/static/index.html
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/child_pages/vehicAndper_adjust.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -242,4 +242,8 @@
 			<url>http://repo.spring.io/milestone</url>
 		</pluginRepository>
 	</pluginRepositories>
+	
+	<properties>
+	    <start-class>com.bsth.Application</start-class>
+	</properties>
 </project>
@@ -103,4 +103,30 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public List<Map<String, String>> findCarByLine(@RequestParam String lineCode){
 		return scheduleRealInfoService.findCarByLine(lineCode);
 	}
+	
+	/**
+	 * 
+	 * @Title: sreachNbbm 
+	 * @Description: TODO(搜索车辆内部编码) 
+	 * @throws
+	 */
+	@RequestMapping(value = "/sreachVehic", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachVehic(@RequestParam String nbbm){
+		return scheduleRealInfoService.sreachVehic(nbbm);
+	}
+	
+	/**
+	 * 
+	 * @Title: adjust 
+	 * @Description: TODO(调整人车) 
+	 * @param @param id 班次ID
+	 * @param @param nbbm 内部编码
+	 * @param @param jsy  驾驶员
+	 * @param @param spy  售票员
+	 * @throws
+	 */
+	@RequestMapping(value = "/adjust", method = RequestMethod.POST)
+	public Map<String, Object> adjust(@RequestParam Long id, @RequestParam String nbbm, @RequestParam String jsy, @RequestParam String spy){
+		return scheduleRealInfoService.adjust(id, nbbm, jsy, spy);
+	}
 }
@@ -24,4 +24,39 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String, String>> findCarByLine(String lineCode);
+	List<Map<String, String>> sreachVehic(String nbbm);
+
+	Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy);
+	
+	/**
+	 * 
+	 * @Title: adjustCar 
+	 * @Description: TODO(班次调整车辆) 
+	 * @param @param schedule 班次
+	 * @param @param car 车辆自编号
+	 * @throws
+	 */
+	void adjustCar(ScheduleRealInfo schedule, String car);
+	
+	/**
+	 * 
+	 * @Title: adjustDriver 
+	 * @Description: TODO(班次调整驾驶员) 
+	 * @param @param schedule 班次
+	 * @param @param driver 驾驶员工号
+	 * @throws
+	 */
+	void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName);
+	
+	/**
+	 * 
+	 * @Title: adjustConductor 
+	 * @Description: TODO(班次调整售票员) 
+	 * @param @param schedule 班次
+	 * @param @param conductor 售票员工号
+	 * @throws
+	 */
+	void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName);
+	
+
 }
@@ -7,9 +7,11 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.transaction.Transactional;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.CarConfigInfo;
@@ -29,6 +32,7 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.service.realcontrol.buffer.ScheduleBuffer;
+import com.bsth.vehicle.common.CommonMapped;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
@@ -242,4 +246,83 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		ScheduleBuffer.put(t);
 		return map;
 	}
+
+	@Override
+	public List<Map<String, String>> sreachVehic(String nbbm) {
+		//转大写
+		nbbm = nbbm.toUpperCase();
+		
+		List<Map<String, String>> list = new ArrayList<>();
+		Map<String, String> map;
+		Set<String> allSet = CommonMapped.vehicCompanyMap.keySet();
+		
+		Line line;
+		for(String k : allSet){
+			if(k.indexOf(nbbm) != -1){
+				//所属线路
+				map = new HashMap<>();
+				line = CommonMapped.vehicLineMap.get(k);
+				map.put("id", k);
+				map.put("text", k);
+				if(null != line){
+					map.put("lineName", line.getName());
+					map.put("lineCode", line.getLineCode());
+				}
+				
+				list.add(map);
+			}
+			
+			if(list.size() > 20)
+				break;
+		}
+		return list;
+	}
+
+	@Override
+	public Map<String, Object> adjust(Long id, String nbbm, String jsy, String spy) {
+		//班次
+		ScheduleRealInfo schedule = ScheduleBuffer.pkSchedulMap.get(id);
+		
+		//换车
+		if(!StringUtils.isBlank(nbbm)){
+			adjustCar(schedule, nbbm);
+		}
+		
+		List<String> tempArray;
+		//换驾驶员
+		if(!StringUtils.isBlank(jsy)){
+			tempArray = Splitter.on("/").splitToList(jsy);
+			adjustDriver(schedule, tempArray.get(0), tempArray.get(1));
+		}
+		
+		//换售票员
+		if(!StringUtils.isBlank(spy)){
+			tempArray = Splitter.on("/").splitToList(spy);
+			adjustConductor(schedule, tempArray.get(0), tempArray.get(1));
+		}
+		
+		ScheduleBuffer.persistentList.add(schedule);
+		
+		Map<String, Object> map = new HashMap<>();
+		map.put("status", 200);
+		map.put("t", schedule);
+		return map;
+	}
+
+	@Override
+	public void adjustCar(ScheduleRealInfo schedule, String car) {
+		schedule.setClZbh(car);
+	}
+
+	@Override
+	public void adjustDriver(ScheduleRealInfo schedule, String driver, String driverName) {
+		schedule.setjGh(driver);
+		schedule.setjName(driverName);
+	}
+
+	@Override
+	public void adjustConductor(ScheduleRealInfo schedule, String conductor, String conductorName) {
+		schedule.setsGh(conductor);
+		schedule.setsName(conductorName);
+	}
 }
@@ -2,6 +2,7 @@ package com.bsth.vehicle.common;
 import java.util.Map;
+import com.bsth.entity.Line;
 import com.google.common.collect.BiMap;
 /**
@@ -35,6 +36,11 @@ public class CommonMapped {
 	public static Map<String , String> vehicCompanyMap;
 	/**
+	 * 车辆和线路对照
+	 */
+	public static Map<String, Line> vehicLineMap;
+	
+	/**
 	 * 站点编码和名称对照，包括停车场
 	 *（K: 站点编码 ，V：站点名称）
 	 */
@@ -11,10 +11,13 @@ import org.springframework.stereotype.Component;
 import com.bsth.entity.CarPark;
 import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
 import com.bsth.entity.Station;
+import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
@@ -38,6 +41,9 @@ public class CommonRefreshThread extends Thread{
 	@Autowired
 	CarParkRepository carParkRepository;
+	@Autowired
+	CarConfigInfoRepository carConfigInfoRepository;
+	
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
@@ -45,13 +51,33 @@ public class CommonRefreshThread extends Thread{
 		try {
 			initVehicMapp();
 			initStationCodeMap();
+			initVehicLineMap();
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.error("", e);
 		}
 	}
 	/**
 	 * 
+	 * @Title: initVehicLineMap 
+	 * @Description: TODO(根据车辆配置，加载车辆和线路对照数据) 
+	 * @throws
+	 */
+	private void initVehicLineMap() {
+		Iterator<CarConfigInfo> allIterator = carConfigInfoRepository.findAll().iterator();
+		Map<String, Line> ccMap = new HashMap<>();
+		
+		CarConfigInfo cci;
+		while(allIterator.hasNext()){
+			cci = allIterator.next();
+			ccMap.put(cci.getCl().getInsideCode(), cci.getXl());
+		}
+		CommonMapped.vehicLineMap = ccMap;
+	}
+
+	/**
+	 * 
 	 * @Title: initDeviceMapp 
 	 * @Description: TODO(初始化车辆相关对照) 
 	 */
@@ -11,7 +11,7 @@ var fs = require(&#39;fs&#39;)
 	,crypto = require("crypto");
 //不参与的目录
-var excludes = ['scheduleApp']
+var excludes = ['scheduleApp', 'trafficManage']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
@@ -19,7 +19,7 @@
 <!-- MULTI-select 多选下拉框美化 -->
 <link href="/metronic_v4.5.4/plugins/jquery-multi-select/css/multi-select.css" rel="stylesheet" type="text/css" />
 <!-- METRONIC style -->
-<link href="/metronic_v4.5.4/layout4/css/themes/default.min.css" rel="stylesheet" type="text/css" id="style_color" />
+<link href="/metronic_v4.5.4/layout4/css/themes/light.min.css" rel="stylesheet" type="text/css" id="style_color" />
 <link href="/metronic_v4.5.4/css/components.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/css/plugins.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/layout4/css/layout.min.css" rel="stylesheet" type="text/css" />
@@ -160,8 +160,10 @@ var stationRoute;
 var lineInformation;
 var $mainTab = $('.custom-table-body table.mainTable');
-
 var $subTab = $('.custom-table-body table.subTable');
+
+var _data; //data.js引用
+var _alone; //alone.js 引用
 $(function(){
 	//var storage = window.localStorage;
 	var lineCodeMaps;
@@ -173,9 +175,6 @@ $(function(){
 	//班次ID和班次映射
 	var scheduleIdMap;
-	var _data; //data.js引用
-	var _alone; //alone.js 引用
-	
 	//滚动时固定表头
 	$('.custom-table-panel').on('scroll', function(){
 		var top = $(this).scrollTop()
@@ -48,29 +48,28 @@
 			<div class="form-custom-row">
 				<div class="item full" >
 					<span class="item-label" style="width: 80px;">内部编码: </span>
-					<select class="form-control pd90" >
-						<option value="W2B-001">W2B-001</option>
-					</select>
+					<select class="form-control pd90" id="vehicSearchSelect"></select>
 				</div>
 			</div>
-			<div class="form-custom-row">
+			<div class="form-custom-row" id="borrowInfoPanel" style="display: none;">
 				<div class="item full" >
 					<span class="item-label" style="width: 80px;">借用时间: </span>
 					<div style="display: inline-block;">
-						 <input class="form-control" value="17:26"> 
+						 <input type="time" class="form-control" name="borrowStart" value="17:26" style="width: 160px;"> 
 						 &nbsp;&nbsp;至&nbsp;&nbsp; 
-						 <input class="form-control" value="23:59" >
+						 <input type="time" class="form-control" name="borrowEnd" value="23:59" style="width: 160px;">
 					</div>
+					&nbsp;&nbsp;
+					<input type="checkbox" class="icheck" checked="checked" > 本次使用完交还原线路
 				</div>
 			</div>
-			
+			<hr>
 			<div class="form-custom-row">
 				<div class="item full" >
 					<span class="item-label" style="width: 80px;">驾驶员: </span>
-					<select class="form-control pd90">
-						<option value="000001/备1">000001/备1</option>
+					<select class="form-control pd90" name="jGh">
 					</select>
 				</div>
 			</div>
@@ -78,8 +77,7 @@
 			<div class="form-custom-row">
 				<div class="item full" >
 					<span class="item-label" style="width: 80px;">售票员: </span>
-					<select class="form-control pd90">
-						<option value="002301/备1">002301/田华</option>
+					<select class="form-control pd90" name="sGh">
 					</select>
 				</div>
 			</div>
@@ -91,6 +89,7 @@
 				</button>
 				<button type="button" class="btn layui-layer-close">取消</button>
 			</div>
+			<br>
 		</div>
 	</form>
 </div>
@@ -112,9 +111,6 @@
 (function() {
 	var _data, _alone, scheduleLineMap, scheduleIdMap;
-	//停靠表头
-	/* var width = $('.custom-table-body').width();
-	$('.custom-table-header').css('position', 'fixed').css('width', width); */
 	//滚动时固定表头
 	$('.custom-table-panel').on('scroll', function(){
 		var top = $(this).scrollTop()
@@ -186,10 +182,26 @@
 					refreshMainList();
 				});
 			}
-			//人员下拉框
-			//carAndPersInit(lineCode);
+			
+			persionInit(lineCode);
 		}
+		//初始化人员下拉框
+		var placeholder = {id: ' ', text: '请选择...'};
+		var persionInit = function(lineCode){
+			//驾驶员
+			$.get('/realSchedule/driver', {lineCode: lineCode}, function(rs){
+				rs.splice(0, 0, placeholder);
+				initPinYinSelect2(wrap + ' select[name=jGh]', rs);
+				
+			});
+			//售票员
+			$.get('/realSchedule/conductor', {lineCode: lineCode}, function(rs){
+				rs.splice(0, 0, placeholder);
+				initPinYinSelect2(wrap + ' select[name=sGh]', rs);
+			});
+		};
+		
 		/**
 		 *	刷新主任务列表
 		 */
@@ -216,6 +228,104 @@
 				 increaseArea: '20%'
 			 });
 		}
+		
+		//确定
+		$('.confirm', wrap).on('click', function(){
+			var nbbm = $('#vehicSearchSelect').val()
+				,jsy = $('select[name=jGh]', wrap).val()
+				,spy = $('select[name=sGh]', wrap).val(), id;
+			
+			console.log(nbbm, jsy, spy);
+			var idArray = [];
+			$.each($('.adjust_tr_active', wrap), function(){
+				idArray.push($(this).data('id'));
+			});
+			
+			syncSubmit(idArray, {nbbm: nbbm, jsy: jsy, spy: spy}
+				,function(){
+					layer.msg('操作完成！');
+					refreshMainList();
+				});
+		});
+	});
+	
+	function syncSubmit(idArray, data,  cb){
+		if(idArray.length == 0) return;
+		var i = 0, len = idArray.length;
+		(function(){
+			if(i == len){
+				cb && cb();
+				scheduleLineMap = _data.getLineLpMap();
+				return;
+			}
+			var f = arguments.callee;
+			
+			data.id = idArray[i];
+			$.post('/realSchedule/adjust', data, function(rs){
+				//更新前端缓存
+				if(rs.status == 200){
+					_data.updateSchedule(rs.t);
+				}
+				
+				i ++;
+				//做一层防护，防止缺心眼出现无限循环提交
+				if(i == 0)
+					return;
+				f();
+			});
+		})();
+	}
+	
+	//车辆内部编码下拉搜索框
+	$('#vehicSearchSelect').select2({
+		ajax: {
+			url: '/realSchedule/sreachVehic',
+			dataType: 'json',
+			delay: 150,
+			data: function(params){
+				return{nbbm: params.term};
+			},
+		    processResults: function (data) {
+		      return {
+		        results: data
+		      };
+		    },
+			cache: true
+		},
+		templateResult: function(repo){
+			if (repo.loading) return repo.text;
+			var h = '<span>'+repo.text+'</span>';
+			h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+			return h;
+		},
+		escapeMarkup: function (markup) { return markup; },
+		minimumInputLength: 1,
+		templateSelection: function(repo){
+			return repo.text;
+		},
+		language: {
+	       noResults: function(){
+	           return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+	       },
+	       inputTooShort : function(e) {
+				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+		   },
+	       searching : function() {
+				return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+		   }
+		}
+	})
+	.on('select2:select', function(e){
+		var lineCode = e.params.data.lineCode;
+		if(lineCode)
+			if(lineCode != lineSelect.val()){
+				$('#borrowInfoPanel').show();
+				//借用时间为选中班次的第一个发车时间
+				var fcsj = $.trim($('.adjust_tr_active:eq(0) td:eq(0)').text());
+				$('input[name=borrowStart]', wrap).val(fcsj);
+			}
+			else
+				$('#borrowInfoPanel').hide();
 	});
 })();
 </script>
@@ -1844,4 +1844,14 @@ a.no_and_removeLink {
 tr.adjust_tr_active td{
 	border-bottom: 1px solid #3598dc !important;
+	color: #3598dc;
+}
+
+.select2-results__option .select2-desc{
+	font-size: 12px;
+	color: gray;
+}
+
+.select2-results__option--highlighted .select2-desc{
+	color: white;
 }
@@ -45,6 +45,11 @@ var _data = (function(){
 			schedules[sch.id] = sch;
 			lineLpMap[sch.xlBm][sch.lpName].push(sch);
 		},
+		//更新班次信息
+		updateSchedule: function(sch){
+			schedules[sch.id] = sch;
+			lineLpMap[sch.xlBm][sch.lpName].push(sch);
+		},
 		getLines: function(){
 			return JSON.parse(storage.getItem('lineControlItems'));
 		},
@@ -147,15 +147,19 @@ var _menu = (function() {
 			});
 		},
 		//实发调整
-		realOutgoAdjust: function(){
+		realOutgoAdjust: function(schedul){
 			layer.open({
 			  type: 1,
 			  area: ['350px', '455px'],
 			  maxmin: true,
-			  content: template('real_outgo_adjust_body_temp', {}),
+			  content: template('real_outgo_adjust_body_temp', schedul),
 			  shift: 5,
 			  title: '实发调整',
 			  success: function(){
+				  $('.confirm', '#realOutgoAdjust').on('click', function(){
+					  //alert('提交...');
+					  
+				  });
 			  }
 			});
 		},
@@ -187,7 +191,7 @@ var _menu = (function() {
 			$.get('/pages/control/line/child_pages/vehicAndper_adjust.html', function(content){
 				layer.open({
 				  type: 1,
-				  area: ['730px', '655px'],
+				  area: '730px',
 				  maxmin: true,
 				  content: content,
 				  shift: 5,
@@ -367,14 +367,14 @@
   <div class="form-custom-row">
 		<div class="item full">
 			<span class="item-label" style="width: 80px;">车辆: </span>
-			<input disabled class="form-control" value="W2B-095">
+			<input disabled class="form-control" value="{{clZbh}}">
    	 	</div>
    </div>
   <div class="form-custom-row">
 		<div class="item full">
 			<span class="item-label" style="width: 80px;">路牌: </span>
-			<input disabled class="form-control" value="K5">
+			<input disabled class="form-control" value="{{lpName}}">
    	 	</div>
    </div>
@@ -382,7 +382,7 @@
 		<div class="item full">
 			<span class="item-label" style="width: 80px;">计发时刻: </span>
 			<select class="form-control" disabled>
-	          		<option value="">11:58</option>
+	          		<option value="">{{fcsj}}</option>
 	        </select>
    	 	</div>
   </div>
@@ -390,7 +390,7 @@
   <div class="form-custom-row">
 		<div class="item full">
 			<span class="item-label" style="width: 80px;">实发时刻: </span>
-			<input class="form-control" value="11:58">
+			<input class="form-control" value="{{fcsjActual}}" type="time">
    	 	</div>
    </div>