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 c6c0822a 82eb58f8
Showing 8 changed files with 165 additions and 225 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/java/com/bsth/service/traffic/YgcBasicDataService.java
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
src/main/resources/static/pages/trafficManage/js/lineStationUpload.js
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
src/main/resources/static/pages/trafficManage/lineStationUpload.html
@@ -8,8 +8,6 @@ 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
@@ -24,9 +22,9 @@ public class TrafficManageController {
     @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL(@RequestParam Map<String, Object> param) throws Exception {
+    public String setXL(@RequestParam("ids") String ids) throws Exception {
         try {
-            return trManageService.setXL(param);
+            return trManageService.setXL(ids);
         } catch (Exception exp) {
             throw new Exception(exp.getCause());
         }
@@ -24,7 +24,7 @@ public interface TrafficManageService {
 	 *
 	 * @return 调用接口返回信息
 	 */
-	String setXL(Map<String, Object> param);
+	String setXL(String ids);
 	/**
 	 * 上传车辆信息
@@ -16,6 +16,7 @@ import com.bsth.repository.schedule.*;
 import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.geotool.services.InternalPortType;
@@ -99,7 +100,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	// 线路站点repository
 	@Autowired
-	private StationRepository stationRepository;
+	private YgcBasicDataService ygcBasicDataService;
 	// 运管处接口
@@ -122,11 +123,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	DecimalFormat format = new DecimalFormat("0.00");
 	// 用户名
-	private final String userNameXl = "pudong";
-	// 密码
-	private final String passwordXl = "pudong123";
-
-	// 用户名
 	private final String userNameOther = "user";
 	// 密码
 	private final String passwordOther = "user";
@@ -134,34 +130,25 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * 上传线路信息
 	 */
 	@Override
-	public String setXL(Map<String, Object> param) {
+	public String setXL(String ids) {
 		String result = "failure";
 		StringBuffer sBuffer = new StringBuffer();
+		String[] idArray = ids.split(",");
 		try {
-			Map<String,Object> map = new HashMap<String,Object>();
-			map.put("lineCode_eq", param.get("xl.lineCode_like")+"");
-			Iterator<Line> lineIterator;
-			Line line = null;
-			if(param.get("xl.lineCode_like").equals("")){
-				lineIterator = lineRepository.findAll().iterator();
-			}else {
+			for (String id : idArray) {
+				Map<String,Object> map = new HashMap<>();
+				map.put("lineCode_eq", id);
+				Line line ;
 				line = lineRepository.findOne(new CustomerSpecs<Line>(map));
-			}
-			List<StationRoute> upStationsList = null;// 上行站点路由集
-			List<StationRoute> downStationsList = null;// 下行站点路由集
-			List<LineInformation> lineInformationsList = null;
-			LineInformation lineInformation = null;
-			sBuffer.append("<Data>");
-			sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
-			sBuffer.append("<DataList>");
-//			while(lineIterator.hasNext()){
-//				line = lineIterator.next();
-//				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-//						|| line.getInUse() == 0){
-//					continue;
-//				}
-			if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null
-						|| line.getInUse() == 0){
+				if(line == null){
+					continue;
+				}
+				List<StationRoute> upStationsList ;// 上行站点路由集
+				List<StationRoute> downStationsList = null;// 下行站点路由集
+				sBuffer.append("<Data>");
+				sBuffer.append("<RequestOrg>上海巴士拓华科技发展有限公司</RequestOrg>");
+				sBuffer.append("<DataList>");
+				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
 				sBuffer.append("<LINE_ID>").append(line.getId()).append("</LINE_ID>");
@@ -190,32 +177,24 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					packagStationPointXml(downStationsList, sBuffer, startId);
 				}
 				sBuffer.append("</LinePointList>");
-//			}
-			sBuffer.append("</DataList>");
-			sBuffer.append("</Data>");
-			System.out.println(sBuffer.toString());
-			if(sBuffer.indexOf("<XL>") != -1){
-				portType = new Internal().getInternalHttpSoap11Endpoint();
-				String portResult = portType.setXL(userNameXl, passwordXl, sBuffer.toString());
-				String portArray[] = portResult.split("\n");
-				if(portArray.length >= 4){
-					// 返回数据的编码
-					String returnCode = portArray[1].substring(portArray[1].indexOf(">")+1,portArray[1].indexOf("</"));
-					// 返回的信息
-					String returnDescription = portArray[2].substring(portArray[2].indexOf(">")+1,portArray[2].indexOf("</"));
-					if(returnCode.equals("1")){
-						result = "success";
-					}else{
-						result = returnDescription;
-					}
+				sBuffer.append("</DataList>");
+				sBuffer.append("</Data>");
+				// 调用上传方法
+				result = ygcBasicDataService.invokeMethod("UpdateBusLineStation",sBuffer.toString());
+				String str = "ReturnCode";
+				// 解析返回值
+				result = result.substring(result.indexOf(str)+str.length()+1,result.lastIndexOf(str)-2);
+				if(result.equals("1")){
+					result = "success";
+				}else{
+					result = "failure";
 				}
+				logger.info("setXL:"+sBuffer.toString());
+				logger.info("setXL:"+result);
 			}
 		} catch (Exception e) {
 			logger.error("setXL:",e);
 			e.printStackTrace();
-		}finally{
-			logger.info("setXL:"+sBuffer.toString());
-			logger.info("setXL:"+result);
 		}
 		return result;
 	}
@@ -9,5 +9,13 @@ public interface YgcBasicDataService {
      * 更新运管处基础数据
      */
     void updateYgcBasicData();
+
+    /**
+     * 调用方法
+     * @param methodName 方法名
+     * @param param 参数
+     * @return
+     */
+    String invokeMethod(String methodName,String param);
 }
@@ -7,6 +7,7 @@ import org.apache.axiom.om.*;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.rpc.client.RPCServiceClient;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,6 +19,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.*;
@@ -42,14 +44,17 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
     JdbcTemplate jdbcTemplate;
     private static String IP = "218.242.195.76:9091";
-    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String downTargetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String upTargetEndpoint = "http://" + IP +"/ygc.TransManager.BasicUpload?wsdl";
     private static String namespace = "http://service.shygc.com";
     private static String userName = "admin";
     private static String passWord = "000000";
-    private static EndpointReference targetEPR;
+    private static EndpointReference downTargetEPR;
+    private static EndpointReference upTargetEPR;
     {
         try {
-            targetEPR = new EndpointReference(targetEndpoint);
+            downTargetEPR = new EndpointReference(downTargetEndpoint);
+            upTargetEPR = new EndpointReference(upTargetEndpoint);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -102,7 +107,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
             ServiceClient sender = new ServiceClient();
             Options options = sender.getOptions();
             options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
-            options.setTo(targetEPR);
+            options.setTo(downTargetEPR);
             sender.setOptions(options);
             System.out.println("The data in method download: " + data);
             data.build();
@@ -280,4 +285,37 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
         flag = true;
         return flag;
     }
+
+    /**
+     * 调用方法
+     * @param methodName 方法名
+     * @param param 参数
+     * @return
+     */
+    public String invokeMethod(String methodName,String param){
+        String result = null;
+        try {
+            // 获得客户端
+            RPCServiceClient serviceClient = new RPCServiceClient();
+            // 可以在该对象中设置服务端的验证信息
+            Options options = serviceClient.getOptions();
+            options.setTo(upTargetEPR);
+            // 在创建QName对象时，QName类的构造方法的第一个参数表示WSDL文件的命名空间名，也就是<wsdl:definitions>元素的targetNamespace属性值
+            QName opAddEntry = new QName(namespace,methodName);
+            // 参数，如果有多个，继续往后面增加即可，不用指定参数的名称
+            Object[] opAddEntryArgs = new Object[] {param };
+            // 返回参数类型，这个和axis1有点区别
+            // invokeBlocking方法有三个参数，其中第一个参数的类型是QName对象，表示要调用的方法名；
+            // 第二个参数表示要调用的WebService方法的参数值，参数类型为Object[]；
+            // 第三个参数表示WebService方法的返回值类型的Class对象，参数类型为Class[]。
+            // 当方法没有参数时，invokeBlocking方法的第二个参数值不能是null，而要使用new Object[]{}
+            // 如果被调用的WebService方法没有返回值，应使用RPCServiceClient类的invokeRobust方法，
+            // 该方法只有两个参数，它们的含义与invokeBlocking方法的前两个参数的含义相同
+            Class[] classes = new Class[] { String.class };
+            result = serviceClient.invokeBlocking(opAddEntry,opAddEntryArgs, classes)[0].toString();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return result;
+    }
 }
@@ -13,124 +13,46 @@
  */
 (function(){
-	/**
-	 *  取得编码-公司map
-	 *  gsmap["5"] = 南汇公司
-	 *  gsmap["5_3"] = 芦潮港分公司
-	 */
-	function getBusMap(){
-		// 取得公司信息，替换公司编码
-		var gsmap = {};
-		$get('/business/all', null, function(array){
-			$.each(array, function(i, gs){
-				var k = gs.upCode + '_' + gs.businessCode;
-				if(gs.upCode === '88'){
-					k = gs.businessCode;
-				}
-				gsmap[k] = gs.businessName;
-			});
-		});
-		return gsmap;
-	}
-	// 填充公司下拉框选择值
-	$get('/business/all', {upCode_eq: '88'}, function(array){
-		 
-		 // 公司下拉options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 遍历array
-		 $.each(array, function(i,d){
-			 
-			 options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-			 
-		 });
-		 
-		 // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
-		 
-	 });
-	
-	// 填充分公司下拉框选择值
-	 function setbrancheCompanySelectOptions(){
-		 
-		 // 获取公司下拉框选择值
-		 var businessCode = $('#companySelect').val();
-		 
-		 // 分公司下拉框options属性值
-		 var options = '<option value="">请选择...</option>';
-		 
-		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
-		 if(businessCode == null || businessCode ==''){
-			 
-			 // 填充分公司下拉框options
-			 $('#brancheCompanySelect').html(options);
-			 
-		  } else {
-			  
-			  // 查询出所属公司下的分公司名称和相应分公司代码
-			  $get('/business/all', {upCode_eq: businessCode}, function(array){
-				  
-				  // 遍历array
-				  $.each(array, function(i,d){
-					  
-					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
-					  
-					  // 填充分公司下拉框options
-					  $('#brancheCompanySelect').html(options);
-					  
-				  });
-			  });
-			  
-			  // 填充公司下拉框options,并添加公司下拉框值改变事件setbrancheCompanySelectOptions
-			 $('#brancheCompanySelect').html(options).on('change', setLineAutocompleteOptions);
-		  }
-	 }
-	
-	function setLineAutocompleteOptions(){
-		// 搜索参数集合
-		var params = {};
-		// 搜索字段名称
-		var name;
-		var items = $("ul.breadcrumb select");
-		// 遍历items集合
-		for(var j = 0, item; item = items[j++];){
-			// 获取字段名称
-			name = $(item).attr('name');
-			if(name){
-				// 赋取相对应的值
-				params[name] = $(item).val();
-			}
-		}
-		var lines = new Array();
-		var gsmap = getBusMap();
-		// 取得所有线路
-		$get('/line/all', params, function(allLine) {
-			// 遍历数组
-			$.each(allLine, function(i, e) {
-				var companyCode = e.company;
-				e.company = gsmap[e.company];
-				e.brancheCompany = gsmap[companyCode+"_"+e.brancheCompany];
-				var line = '{"hex":"'+e.company+'","label":"'+e.name+'"}';
-				var obj = jQuery.parseJSON(line);
-				lines[i]= obj;
-			});
-			
-			
-		});
-		// 给输入框绑定autocomplete事件
-		$("input[name='name_eq']").autocompleter({
-	        highlightMatches: true,
-	        source: lines,
-	        template: '{{ label }} <span>({{ hex }})</span>',
-	        hint: true,
-	        empty: false,
-	        limit: 5,
-	    });
-	}
-	
-	
-	// 设置autocompleter的宽度和输入框一样
-	$(".autocompleter").css("width",$("input[name='name_eq']").css("width"))
+
+    $('#line').select2({
+        ajax: {
+            url: '/realSchedule/findLine',
+            type: 'post',
+            dataType: 'json',
+            delay: 150,
+            data: function(params){
+                return{line: 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>';
+            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>';
+            }
+        }
+    });
+
 	// 绑定查询事件
 	$("#search").click(searchM);
 	// 绑定上传事件
@@ -149,7 +71,7 @@
 		$("#right_div table tbody").empty();
 		var params = {};
 		// 取得输入框的值
-		var inputs = $("ul.breadcrumb input");
+        var inputs = $(".param input,select");
 		// 遍历数组
 		$.each(inputs, function(i, element) {
 			params[$(element).attr("name")] = $(element).val();
@@ -168,17 +90,36 @@
 	// 上传方法
 	function uploadM() {
-		var params = {};
-		// 取得输入框的值
-		var trs = $("#right_div tbody tr");
-		if (trs.length == 0) {
-			alert("请选择模板");
-			return;
-		}
-		// 遍历数组
-		$.each(trs, function(i, element) {
-			alert($(".ttInfoId", element).html());
-		});
+        // 取得输入框的值
+        var trs = $("#right_div tbody tr input");
+        if (trs.length == 0) {
+            alert("请选择线路");
+            return;
+        }else if(trs.length > 1){
+            alert("一次只能上传一条线路");
+            return;
+        }
+        var ids ="0,";
+        // 遍历数组
+        $.each(trs, function(i, element) {
+            ids +=$(element).val()+",";
+        });
+        var params = {"ids":ids};
+        $.ajax({
+            type: 'get',url: '/trmg/setXL',
+            data: params ,dataType:'text',
+            success:function(data) {
+                if(data == 'success'){
+                    alert("上传成功");
+                }else{
+                    alert("上传失败");
+                }
+
+            }, error : function() {
+                alert("操作失败");
+            }
+
+        });
 	}
 	// 表格行的单击事件
@@ -183,29 +183,6 @@
 	}
 	// 绑定查询事件
-	$("#setXL").click(setXLF);
-
-	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) {
-				alert(data);
-			}, error : function() {
-				alert("操作失败");
-			}
-
-		});
-	}
-
-	// 绑定查询事件
 	$("#setCL").click(setCLF);
 	var params = {};
 	function setCLF() {
 <link href="css/trafficManage.css" rel="stylesheet" type="text/css" />
-<link href="css/autocompleter.css" rel="stylesheet" type="text/css" />
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运维管理</span> <i class="fa fa-circle"></i></li>
@@ -7,17 +6,16 @@
 </ul>
 <div class="tab_line">
 	<div class="col-md-12">
-		<ul class="breadcrumb">
-			<li>公司:</li>
-			<li><select name="company_eq" class="form-control" id="companySelect"></select></li>
-			<li>分公司：</li>
-			<li><select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
-			<li>线路名称:</li>
-			<li><input type="text" class="form-control form-filter input-sm"
-				name="name_eq" placeholder="请输入线路名称" maxlength="40" /></li>
-			<li><a class="btn btn-circle blue" id="search">查询</a></li>
-			<li><a class="btn btn-circle red" id="upload">上传</a></li>
-		</ul>
+		<form class="form-inline" action="">
+			<div style="display: inline-block;" class="param">
+				<span class="item-label" style="width: 80px;">线路名称: </span>
+				<select class="form-control" name="lineCode_like" id="line" style="width: 180px;"></select>
+			</div>
+			<div class="form-group" style="display: inline-block;margin-left: 15px;">
+				<input class="btn btn-default" type="button" id="search" value="查询"/>
+				<input class="btn btn-default" type="button" id="upload" value="上传"/>
+			</div>
+		</form>
 	</div>
 	<!-- Begin: left-div -->
 	<div class="col-md-5 panel-wrap" style="height: 60%;">
@@ -63,6 +61,7 @@
 	</td>
 	<td>
 		{{obj.lineCode}}
+		<input type="hidden" value="{{obj.lineCode}}"/>
 	</td>
 	<td class="ttInfoId">
 		{{obj.name}}