Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 4eb56a84 465c8d8e
Showing 5 changed files with 162 additions and 50 deletions
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
+import java.util.Map;
+
 /**
  *
  * @author BSTH
@@ -22,9 +24,9 @@ public class TrafficManageController {
  
  
     @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL() throws Exception {
+    public String setXL(@RequestParam Map<String, Object> param) throws Exception {
         try {
-            return trManageService.setXL();
+            return trManageService.setXL(param);
         } catch (Exception exp) {
             throw new Exception(exp.getCause());
         }
@@ -57,6 +59,15 @@ public class TrafficManageController {
         }
     }
  
+    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
+    public String setLDFile() throws Exception {
+        try {
+            return trManageService.setLDFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
     public String setLCYH() throws Exception {
         try {
 package com.bsth.service;
  
+import java.util.Map;
+
 /**
  *
  * @Interface: LineService(线路service业务层实现接口)
@@ -22,7 +24,7 @@ public interface TrafficManageService {
 	 *
 	 * @return 调用接口返回信息
 	 */
-	String setXL();
+	String setXL(Map<String, Object> param);
  
 	/**
 	 * 上传车辆信息
@@ -65,6 +67,8 @@ public interface TrafficManageService {
  
 	String setLD();
  
+	String setLDFile();
+
 	String setLCYH();
  
 	String setDDRB();
@@ -173,16 +173,22 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
 				int startId = 1;
 				startId = packagStationXml(upStationsList, sBuffer, startId);
-				// 再查下行
-				downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-				packagStationXml(downStationsList, sBuffer, startId);
+				// 环线不查下行
+				if(line.getLinePlayType() != 1){
+					// 再查下行
+					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+					packagStationXml(downStationsList, sBuffer, startId);
+				}
 				sBuffer.append("</LineStationList>");
  
 				// 循环添加站点点位信息
 				sBuffer.append("<LinePointList>");
 				startId = 1;
 				startId = packagStationPointXml(upStationsList, sBuffer, startId);
-				packagStationPointXml(downStationsList, sBuffer, startId);
+				// 环线不查下行
+				if(line.getLinePlayType() != 1){
+					packagStationPointXml(downStationsList, sBuffer, startId);
+				}
 				sBuffer.append("</LinePointList>");
 //			}
 			sBuffer.append("</DataList>");
@@ -303,9 +303,12 @@
 			$("#info tbody tr").each(function(index){
 				param[index] = new Array();
 				$(this).children().each(function(i){
-					param[index][i] = $(this).text().split("\\")[0];
-					if(i==0){
-						param[index][3] = $(this).text().split("\\")[1];
+					if(i<3){
+						param[index][i] = $(this).text().split("\\")[0];
+						if(i==0){
+							param[index][3] = $(this).text().split("\\")[1];
+							
+						}
 					}
 				});
 			});
 /**
  * 
- * @JSName : common.js(运管功能公共js)
- * 
- * @Author : bsth@lq
- * 
- * @Description : TODO(运管功能公共js)
- * 
+ * @JSName : timeTempletUpload.js(运管处js)
+ *
+ * @Author : bsth@zq
+ *
+ * @Description :  TODO(运管功能公共js)
+ *
  * @Data : 2016年6月29日 上午9:21:17
  *
  * @Version 公交调度系统BS版 0.1
- * 
+ *
  */
  
 (function(){
@@ -34,7 +34,7 @@
 	}
 	var lines = new Array();
 	var gsmap = getBusMap();
-	
+
 	$('#line').select2({
 		ajax: {
 			url: '/realSchedule/findLine',
@@ -73,7 +73,7 @@
 		   }
 		}
 	});
-	
+
 	// 绑定查询事件
 	$("#search").click(searchM);
 	// 绑定上传事件
@@ -98,7 +98,7 @@
 			params[$(element).attr("name")] = $(element).val();
 		});
 		var i = layer.load(2);
-		$get('/tic', params, function(data) {
+		$get('/tic_ec', params, function(data) {
 			_dateFormat(data.content);
 			var bodyHtm = template('timeTemplet_list_temp', {
 				list : data.content
@@ -112,7 +112,7 @@
  
 	// 上传方法
 	function uploadM() {
-		
+
 		// 取得输入框的值
 		var trs = $("#right_div tbody tr input");
 		if (trs.length == 0) {
@@ -128,14 +128,14 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setSKB',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				if(data == 'success'){
 					alert("上传成功");
 				}else{
 					alert("上传失败");
 				}
-				
-			}, error : function() { 
+
+			}, error : function() {
 				alert("操作失败");
 			}
  
@@ -180,23 +180,30 @@
 			obj.qyrq = moment(obj.qyrq).format(fs);
 		});
 	}
-	/*
+
 	// 绑定查询事件
 	$("#setXL").click(setXLF);
-	var params = {};
+
 	function setXLF() {
+        var params = {};
+        // 取得输入框的值
+        var inputs = $(".param input,select");debugger;
+        // 遍历数组
+        $.each(inputs, function(i, element) {
+            params[$(element).attr("name")] = $(element).val();
+        });
 		$.ajax({
 			type: 'get',url: '/trmg/setXL',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
 	}
-	
+
 	// 绑定查询事件
 	$("#setCL").click(setCLF);
 	var params = {};
@@ -204,15 +211,15 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setCL',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
 	}
-	
+
 	// 绑定查询事件
 	$("#setSJ").click(setSJF);
 	var params = {};
@@ -220,47 +227,79 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setSJ',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
 	}
-	
+
 	// 绑定查询事件
-	$("#setCS").click(setCSF);
+	$("#setLD").click(setLDF);
 	var params = {};
-	function setCSF() {
+	function setLDF() {
 		$.ajax({
-			type: 'get',url: '/trmg/setCS',
+			type: 'get',url: '/trmg/setLD',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
 	}
-	
+
+    // 绑定查询事件
+    $("#setLDFile").click(setLDFileF);
+    var params = {};
+    function setLDFileF() {
+        $.ajax({
+            type: 'get',url: '/trmg/setLDFile',
+            data: params ,dataType:'text',
+            success:function(data) {
+                alert(data);
+            }, error : function() {
+                alert("操作失败");
+            }
+
+        });
+    }
+
 	// 绑定查询事件
-	$("#setXLPC").click(setXLPCF);
+	$("#setLCYH").click(setLCYHF);
 	var params = {};
-	function setXLPCF() {
+	function setLCYHF() {
 		$.ajax({
-			type: 'get',url: '/trmg/setXLPC',
+			type: 'get',url: '/trmg/setLCYH',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
 	}
-	
+
+	// 绑定查询事件
+	$("#setDDRB").click(setDDRBF);
+	var params = {};
+	function setDDRBF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setDDRB',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
 	// 绑定查询事件
 	$("#setJHBC").click(setJHBCF);
 	var params = {};
@@ -268,13 +307,62 @@
 		$.ajax({
 			type: 'get',url: '/trmg/setJHBC',
 			data: params ,dataType:'text',
-			success:function(data) { 
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#setXLPC").click(setXLPCF);
+	var params = {};
+	function setXLPCF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setXLPC',
+			data: params ,dataType:'text',
+			success:function(data) {
 				alert(data);
-			}, error : function() { 
+			}, error : function() {
 				alert("操作失败");
 			}
  
 		});
-	}*/
+	}
+
+
+	// 绑定查询事件
+	$("#setCS").click(setCSF);
+	var params = {};
+	function setCSF() {
+		$.ajax({
+			type: 'get',url: '/trmg/setCS',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
+
+	// 绑定查询事件
+	$("#downloadAllDataFile").click(getDownLoadAllDataFileF);
+	var params = {};
+	function getDownLoadAllDataFileF() {
+		$.ajax({
+			type: 'get',url: '/trmg/getDownLoadAllDataFile',
+			data: params ,dataType:'text',
+			success:function(data) {
+				alert(data);
+			}, error : function() {
+				alert("操作失败");
+			}
+
+		});
+	}
  
 })();
 \ No newline at end of file