增加运管处上传日志的保存和查看功能（时刻表上传、线路上传、路单上传）

周勤
1 parent 34d5e365
Showing 5 changed files with 304 additions and 120 deletions
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/java/com/bsth/entity/traffic/SKBUploadLogger.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
src/main/resources/static/pages/trafficManage/timeTempletUploadRecord.html
@@ -9,6 +9,7 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -37,7 +38,13 @@ public class PredicatesBuilder {
 		if(Date.class.isAssignableFrom(leftType) &&
 				String.class.isAssignableFrom(rightType)){
 			DateTime dateTime = new DateTime(object);
-			return cb.equal(expression, dateTime.toDate());
+			Date startTime = dateTime.toDate();//设置起始时间
+			Calendar c = Calendar.getInstance();
+			c.setTime(startTime);
+			c.add(Calendar.DAY_OF_MONTH, 1);
+			// 设置结束时间，起始时间为结束时间加1天
+			Date endTime = c.getTime();
+			return cb.between((Path<Date>) expression,startTime,endTime);
 		}
 		else {
 			return cb.equal(expression, object);
 package com.bsth.entity.traffic;
-import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.Line;
 import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -33,7 +33,7 @@ public class SKBUploadLogger {
 	/** 时刻表信息 */
 	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
-	private TTInfo ttInfo;
+	private Line line;
 	/** 用户 关联 */
 	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
@@ -43,6 +43,23 @@ public class SKBUploadLogger {
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
+	// 上传的参数
+	@Column( name = "upload_xml" , columnDefinition="TEXT")
+	private String uploadXml;
+
+	// 上传的参数2
+	@Column( name = "upload_xml_sub" , columnDefinition="TEXT")
+	private String uploadXmlSub;
+
+	// 日志类型 1：时刻表；2：上传线路；3：上传路单
+	private String type;
+
+	// 模板名称
+	private String name;
+
+	// 上传状态：是否成功 1:成功;0:失败
+	private String state;
+
 	public Integer getId() {
 		return id;
 	}
@@ -51,14 +68,6 @@ public class SKBUploadLogger {
 		this.id = id;
 	}
-	public TTInfo getTtInfo() {
-		return ttInfo;
-	}
-
-	public void setTtInfo(TTInfo ttInfo) {
-		this.ttInfo = ttInfo;
-	}
-
 	public SysUser getUser() {
 		return user;
 	}
@@ -71,7 +80,29 @@ public class SKBUploadLogger {
 		return createDate;
 	}
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
+	public void setCreateDate(Date createDate) { this.createDate = createDate; }
+
+	public String getUploadXml() { return uploadXml; }
+
+	public void setUploadXml(String uploadXml) { this.uploadXml = uploadXml; }
+
+	public String getState() { return state; }
+
+	public void setState(String state) { this.state = state; }
+
+	public Line getLine() {	return line;}
+
+	public void setLine(Line line) { this.line = line; }
+
+	public String getType() { return type; }
+
+	public void setType(String type) {	this.type = type; }
+
+	public String getName() { return name;	}
+
+	public void setName(String name) {	this.name = name; }
+
+	public String getUploadXmlSub() {return uploadXmlSub;}
+
+	public void setUploadXmlSub(String uploadXmlSub) {this.uploadXmlSub = uploadXmlSub;	}
 }
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import java.io.*;
@@ -65,6 +66,10 @@ import java.util.regex.Pattern;
 public class TrafficManageServiceImpl  implements TrafficManageService{
 	Logger logger = LoggerFactory.getLogger(this.getClass());
+	// 运管处上传日志类型
+	public static final String UPLOAD_TYPE_SKB = "1";
+	public static final String UPLOAD_TYPE_XL = "2";
+	public static final String UPLOAD_TYPE_LD = "3";
 	// 线路repository
 	@Autowired
@@ -170,7 +175,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setXL(String ids) {
 		String result = "failure";
-		StringBuffer sBuffer = new StringBuffer();
+		String xml ;
 		String[] idArray = ids.split(",");
 		try {
 			for (String id : idArray) {
@@ -185,12 +190,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				if(line == null){
 					continue;
 				}
-				List<StationRoute> upStationsList ;// 上行站点路由集
-				List<StationRoute> downStationsList;// 下行站点路由集
-				List<Object[]> downPointList;// 下行站点集
-				List<Object[]> upPointList;// 上行站点集
-				sBuffer.append("<XLs>");
-				sBuffer.append("<XL>");
 				if(BasicData.lineId2ShangHaiCodeMap.get(line.getId()) == null){
 					return result;
 				}
@@ -200,56 +199,25 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				if(lineInformation == null){
 					continue;
 				}
-				sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
-				sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
-				sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
-				sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
-				sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
-				sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
-				sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
-				sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
-
-				// 循环添加站点信息
-				sBuffer.append("<StationList>");
-
-				// 先查上行
-				upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
-				Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
-				int startId = 1;
-				startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
-				// 环线不查下行
-				if(line.getLinePlayType() != 1){
-					// 再查下行
-					downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
-					packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
-				}
-				sBuffer.append("</StationList>");
-
-				// 循环添加站点点位信息
-				sBuffer.append("<LinePointList>");
-				upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
-				startId = 1;
-				startId = packagStationPointXml(upPointList, sBuffer, startId);
-				// 环线不查下行
-				if(line.getLinePlayType() != 1){
-					downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
-					packagStationPointXml(downPointList, sBuffer, startId);
-				}
-				sBuffer.append("</LinePointList>");
-				sBuffer.append("</XL>");
-				sBuffer.append("</XLs>");
-				// 临时添加，后面删除
-				if(sBuffer.indexOf("<ZDXH>0</ZDXH>") != -1){
+				// 取得封装好的xml
+				xml = getSetXlXml(line,lineInformation);
+				// 站点序号不能为0，如果为0，则返回错误
+				if(xml.indexOf("<ZDXH>0</ZDXH>") != -1){
 					return "0";
 				}
+				String state;// 是否上传成功
 				// 调用上传方法
-				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,sBuffer.toString()).isSuccess()){
+				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,xml).isSuccess()){
 					result = "success";
+					state = "1";
 				}else{
 					result = "failure";
+					state = "0";
 				}
-				logger.info("setXL:"+sBuffer.toString());
+				logger.info("setXL:"+xml);
 				logger.info("setXL:"+result);
+				// 保存运管处上传记录
+				saveYgcUploadLog(line,xml,TrafficManageServiceImpl.UPLOAD_TYPE_XL,state);
 			}
 		} catch (Exception e) {
 			logger.error("setXL:",e);
@@ -422,10 +390,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		HashMap logXlbmMap = new HashMap();
 		Results results = null;
 		String str = "",xlbm;
+		// 保存线路（运管处日志用）
+		Map<String , Line> logLineMap = null;
 		try {
 			int counter = 0; // 计数器
 			int per = 10; // 每几条线路上传一次路单
-
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
 			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap();
@@ -444,6 +413,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					if(counter % per == 0){
 						sf = new StringBuffer();
 						sf.append("<DLDS>");
+						logLineMap = new HashMap<>();
 					}
 					counter ++;
 					xlbm = BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm")+"");
@@ -451,6 +421,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					if(logXlbmMap.get(xlbm) == null){
 						logXlbmMap.put(xlbm,xlbm);
 					}
+					logLineMap.put(line.getLineCode(),line);
 					sf.append("<DLD>");
 					sf.append("<RQ>"+date+"</RQ>");
 					sf.append("<XLBM>"+xlbm+"</XLBM>");
@@ -513,7 +484,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					str = sf.toString().replace("'","");// 去掉'号
 					results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
 					// 记录日志
-					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
+					result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
 				}
 			}
 			// 每per条线路上传后剩下的数据再上传
@@ -521,9 +492,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sf.append("</DLDS>");
 				str = sf.toString().replace("'","");// 去掉'号
 				results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(str));
+				// 记录日志
+				result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str,logLineMap);
 			}
-			// 记录日志
-			result = logRecord(results,logXlbmMap,logXlbmSuccessMap,logXlbmFailureMap,logSuccess,logFailure,str);
 		} catch (Exception e) {
 			logger.error("setLD:",e);
 			logFailure.append(e).append("<br/>");
@@ -558,21 +529,26 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param str
 	 */
 	private String logRecord(Results results,HashMap logXlbmMap,HashMap logXlbmSuccessMap,HashMap logXlbmFailureMap,StringBuffer logSuccess,
-						   StringBuffer logFailure,String str){
+						   StringBuffer logFailure,String str,Map<String ,Line> logLineMap){
 		String result = "failure";
+		String state;
 		// 记录日志
 		if(results != null){
 			if(results.isSuccess()){// 上传成功
 				// 把上线成功的线路编码放入 logXlbmSuccessMap，并记录logSuccess
 				countSuccess += fillMailXlbmMap(logXlbmMap,logXlbmSuccessMap,logSuccess);
 				result = "success";
+				state = "1";
 			}else{// 上传失败
 				// 把上线失败的线路编码放入 logXlbmFailureMap，并记录logFailure
 				countFailure += fillMailXlbmMap(logXlbmMap,logXlbmFailureMap,logFailure);
 				result = "failure";
+				state = "0";
 			}
 			logger.info("setLD:"+str);
 			logger.info("setLD:"+result);
+			// 保存运管处上传记录
+			saveYgcUploadLog(logLineMap,str,TrafficManageServiceImpl.UPLOAD_TYPE_LD,state);
 			results = null;
 			logXlbmMap = new HashMap();
 		}
@@ -946,7 +922,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Override
 	public String setSKB(String ids) {
 		String result = "上传失败，";
-		StringBuffer sBuffer = new StringBuffer();
+		StringBuffer sBuffer = new StringBuffer("<SKBs>");
 		DecimalFormat df = new DecimalFormat("######0.000");
 		Map<String,String> lsStationCode2NameMap = null;
 		Map<String, Integer> lsStationName2YgcNumber = null;
@@ -962,7 +938,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			LineInformation lineInformation;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param ;
-			sBuffer.append("<SKBs>");
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
 			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
@@ -1113,29 +1088,103 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
-			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "上传成功";
-				SKBUploadLogger skbUploadLogger ;
-				SysUser user = SecurityUtils.getCurrentUser();
-				// 保存时刻表上传记录
-				for(TTInfo ttInfo1 : ttinfoList){
-					skbUploadLogger = new SKBUploadLogger();
-					skbUploadLogger.setTtInfo(ttInfo1);
-					skbUploadLogger.setUser(user);
-					skbUploadLoggerRepository.save(skbUploadLogger);
-				}
-			}
+            String state;// 是否上传成功
+            if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
+                result = "上传成功";
+                state = "1";
+            }else{// 上传失败
+                result = "上传失败";
+                state = "0";
+            }
+            // 保存运管处上传记录
+            saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
 			e.printStackTrace();
 		}finally{
-			logger.info("setSKB:"+sBuffer.toString());
-			logger.info("setSKB:"+result);
+            logger.info("setSKB:"+sBuffer.toString());
+            logger.info("setSKB:"+result);
 		}
 		return result;
 	}
 	/**
+	 * 保存上传运管处的日志
+	 * @param obj 参数
+	 * @param type 日志类型
+	 * @param xml 上传参数
+	 */
+	private void saveYgcUploadLog(Object obj,String xml,String type,String state){
+		SKBUploadLogger skbUploadLogger  = new SKBUploadLogger();
+		SysUser user;
+		// 如果不是人为上传，SysUser则为空，设置上传人员为管理员
+		if(SecurityContextHolder.getContext() == null || SecurityContextHolder.getContext().getAuthentication() == null){
+			user = new SysUser();
+			user.setId(1);
+		}else{// 获取上传人员
+			user = SecurityUtils.getCurrentUser();
+		}
+		// 最大的字符长度
+		int maxLength = 60000;
+		int cutLength = 50000;// 需要截取的字符长度
+		String xml_sub = null;
+		skbUploadLogger.setType(type);// 设置类型
+		// 判断xml是否超长，如果超长，则截取
+		if(xml != null && xml.length() > maxLength){
+			int xmlLength = xml.length();
+			int cutCount = xmlLength / cutLength + (xmlLength % cutLength > 0 ? 1 : 0);
+			if(cutCount > 2){
+				xml = "由于上传参数内容超长，请查看服务器的系统日志";
+			}else if(cutCount == 2){
+				xml_sub =xml.substring(cutLength);
+				xml = xml.substring(0,cutLength);
+			}else{
+				// 不做处理
+			}
+		}
+		skbUploadLogger.setUploadXml(xml);// 上传的参数
+		skbUploadLogger.setUploadXmlSub(xml_sub);
+		skbUploadLogger.setState(state);// 状态：是否成功
+		skbUploadLogger.setUser(user);
+		// 时刻表
+		if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_SKB)){
+			List<TTInfo> ttInfoList = (List<TTInfo>)obj;
+			String name = "";
+			Line line = null;
+			for(TTInfo ttInfo : ttInfoList){
+				name += ttInfo.getName() + " ";
+				line = ttInfo.getXl();
+			}
+			skbUploadLogger.setLine(line);
+			skbUploadLogger.setUser(user);
+			skbUploadLogger.setName(name);
+			skbUploadLoggerRepository.save(skbUploadLogger);
+		}else{
+			if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){
+				Line line = (Line) obj;
+				String name = line.getName() + "线路停靠站上传";
+				skbUploadLogger.setLine(line);
+				skbUploadLogger.setName(name);
+				skbUploadLoggerRepository.save(skbUploadLogger);
+			}else if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_LD)){
+				Map<String ,Line>  logLineMap = (Map<String ,Line> )obj;
+				for (String key : logLineMap.keySet()) {
+					Line line = logLineMap.get(key);
+					String name = line.getName() + "路单上传";
+					skbUploadLogger  = new SKBUploadLogger();
+					skbUploadLogger.setType(type);// 设置类型
+					skbUploadLogger.setUploadXml(xml);// 上传的参数
+					skbUploadLogger.setUploadXmlSub(xml_sub);
+					skbUploadLogger.setState(state);// 状态：是否成功
+					skbUploadLogger.setUser(user);
+					skbUploadLogger.setLine(line);
+					skbUploadLogger.setName(name);
+					skbUploadLoggerRepository.save(skbUploadLogger);
+				}
+			}
+		}
+	}
+	/**
 	 * 上传线路人员车辆配置信息
 	 */
 	@Override
@@ -1640,4 +1689,50 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		}
 		return tempStationName2YgcNumber;
 	}
+
+	private String getSetXlXml(Line line,LineInformation lineInformation){
+		StringBuffer sBuffer = new StringBuffer();
+		List<StationRoute> upStationsList ;// 上行站点路由集
+		List<StationRoute> downStationsList;// 下行站点路由集
+		List<Object[]> downPointList;// 下行站点集
+		List<Object[]> upPointList;// 上行站点集
+		sBuffer.append("<XLs>");
+		sBuffer.append("<XL>");
+		sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(line.getId())).append("</XLBM>");
+		sBuffer.append("<XLMC>").append(line.getName()).append("</XLMC>");
+		sBuffer.append("<QDZ>").append(line.getStartStationName()).append("</QDZ>");
+		sBuffer.append("<ZDZ>").append(line.getEndStationName()).append("</ZDZ>");
+		sBuffer.append("<QZLC>").append(lineInformation.getUpMileage()).append("</QZLC>");
+		sBuffer.append("<ZQLC>").append(lineInformation.getDownMileage()).append("</ZQLC>");
+		sBuffer.append("<XLGH>").append(line.getLinePlayType()).append("</XLGH>");
+		sBuffer.append("<UPDATE_DATE>").append(sdfnyr.format(new Date())).append("</UPDATE_DATE>");
+		// 循环添加站点信息
+		sBuffer.append("<StationList>");
+		// 先查上行
+		upStationsList = stationRouteRepository.findByLine(line.getLineCode(), 0);
+		Map<String, Integer> stationNumMap = getStationName2YgcNumberMap(line.getLineCode());
+		int startId = 1;
+		startId = packagStationXml(upStationsList, sBuffer, startId,stationNumMap);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			// 再查下行
+			downStationsList = stationRouteRepository.findByLine(line.getLineCode(), 1);
+			packagStationXml(downStationsList, sBuffer, startId,stationNumMap);
+		}
+		sBuffer.append("</StationList>");
+		// 循环添加站点点位信息
+		sBuffer.append("<LinePointList>");
+		upPointList = sectionRepository.getSectionDirByLineId(line.getId(),0);
+		startId = 1;
+		startId = packagStationPointXml(upPointList, sBuffer, startId);
+		// 环线不查下行
+		if(line.getLinePlayType() != 1){
+			downPointList = sectionRepository.getSectionDirByLineId(line.getId(),1);
+			packagStationPointXml(downPointList, sBuffer, startId);
+		}
+		sBuffer.append("</LinePointList>");
+		sBuffer.append("</XL>");
+		sBuffer.append("</XLs>");
+		return sBuffer.toString();
+	}
 }
@@ -34,7 +34,7 @@
 		 $('#companySelect').html(options).on('change', setbrancheCompanySelectOptions);
 	 });
-	
+
 	// 填充分公司下拉框选择值
 	 function setbrancheCompanySelectOptions(){
@@ -197,6 +197,12 @@
 		$(".autocompleter").css("width",
 				$("#line_name").css("width"));
+    // 设置上传类型
+	var uploadStateOptions = '<option value="1">时刻表上传</option>'
+		+'<option value="2">线路停靠站上传</option>'
+		+'<option value="3">路单上传</option>';
+    $('#uploadType').html(uploadStateOptions).on('change', searchM);
+
     searchM(null, true);
     // 绑定查询事件
     $("#search").click(searchM);
@@ -268,4 +274,12 @@
             }
         });
     }
-})();
 \ No newline at end of file
+
+    template.helper("cutXml", function(xml) {
+        return xml ? xml.substring(0,20) + "..." : "";
+    });
+})();
+function showXml(el){
+    window.sessionStorage.setItem('upload_ygc_xml',JSON.stringify($(el).val()));
+    $.get('show_xml.html', function(m){$(pjaxContainer).append(m);});
+}
 \ No newline at end of file
@@ -10,16 +10,19 @@
 	<div class="col-md-12">
 		<ul class="breadcrumb">
 			<li>筛选数据:</li>
-			<li><select name="ttInfo.xl.company_eq" class="form-control" id="companySelect"></select></li>
-			<li><select name="ttInfo.xl.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
+			<li><select name="line.company_eq" class="form-control" id="companySelect"></select></li>
+			<li><select name="line.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></li>
 			<li>日期:</li>
-			<li><input type="text" class="inputCommon dateTime" name="createDate_date_eq" id="dateInput" placeholder="日期"></li>
+			<li><input type="text" class="inputCommon dateTime" name="createDate_eq" id="dateInput" placeholder="日期">
+			</li>
 			<li>线路名称:</li>
 			<li><input type="text" class="form-control form-filter input-sm"
-				name="ttInfo.xl.name_eq" id="line_name" maxlength="40" /></li>
+				name="line.name_eq" id="line_name" maxlength="40" /></li>
 			<li>上传用户:</li>
 			<li><input type="text" class="inputCommon inputCarPlate"
 				name="user.name_like" maxlength="40" /></li>
+			<li>上传类型:</li>
+			<li><select name="type_eq" class="form-control" id="uploadType"></select></li>
 			<li><a class="btn btn-circle blue" id="search">筛选</a></li>
 		</ul>
 	</div>
@@ -37,6 +40,9 @@
 							<th>线路</th>
 							<th>模板名称</th>
 							<th>上传人员</th>
+							<th>上传参数</th>
+							<th>上传类型</th>
+							<th>是否成功</th>
 							<th>上传时间</th>
 						</tr>
 					</thead>
@@ -57,90 +63,121 @@
 		{{i+1}}
 	</td>
 	<td>
-		{{if obj.ttInfo.xl.company == '55'}}
+		{{if obj.line.company == '55'}}
 		上南公司
-		{{else if obj.ttInfo.xl.company == '22'}}
+		{{else if obj.line.company == '22'}}
 		金高公司
-		{{else if obj.ttInfo.xl.company == '05'}}
+		{{else if obj.line.company == '05'}}
 		杨高公司
-		{{else if obj.ttInfo.xl.company == '26'}}
+		{{else if obj.line.company == '26'}}
 		南汇公司
-		{{else if obj.ttInfo.xl.company == '77'}}
+		{{else if obj.line.company == '77'}}
 		闵行公司
 		{{/if}}
 	</td>
 	<td>
-		{{if obj.ttInfo.xl.company == '55'}}
+		{{if obj.line.company == '55'}}
-		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		{{if obj.line.brancheCompany == '1'}}
 		上南二分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		{{else if obj.line.brancheCompany == '2'}}
 		上南三分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		{{else if obj.line.brancheCompany == '3'}}
 		上南六分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		{{else if obj.line.brancheCompany == '4'}}
 		上南一分公司
 		{{/if}}
-		{{else if obj.ttInfo.xl.company == '22'}}
+		{{else if obj.line.company == '22'}}
-		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		{{if obj.line.brancheCompany == '1'}}
 		四分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		{{else if obj.line.brancheCompany == '2'}}
 		二分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		{{else if obj.line.brancheCompany == '3'}}
 		三分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		{{else if obj.line.brancheCompany == '5'}}
 		一分公司
 		{{/if}}
-		{{else if obj.ttInfo.xl.company == '05'}}
+		{{else if obj.line.company == '05'}}
-		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		{{if obj.line.brancheCompany == '1'}}
 		川沙分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		{{else if obj.line.brancheCompany == '2'}}
 		金桥分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		{{else if obj.line.brancheCompany == '3'}}
 		芦潮港分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		{{else if obj.line.brancheCompany == '5'}}
 		杨高分公司
-		{{else if obj.ttInfo.xl.brancheCompany == '6'}}
+		{{else if obj.line.brancheCompany == '6'}}
 		周浦分公司
 		{{/if}}
-		{{else if obj.ttInfo.xl.company == '26'}}
+		{{else if obj.line.company == '26'}}
-		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		{{if obj.line.brancheCompany == '1'}}
 		南汇一分
-		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		{{else if obj.line.brancheCompany == '2'}}
 		南汇二分
-		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		{{else if obj.line.brancheCompany == '3'}}
 		南汇三分
-		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		{{else if obj.line.brancheCompany == '4'}}
 		南汇维修公司
-		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		{{else if obj.line.brancheCompany == '5'}}
 		南汇公司
 		{{/if}}
 		{{/if}}
 	</td>
 	<td>
-		{{obj.ttInfo.xl.name}}
+		{{obj.line.name}}
 	</td>
 	<td>
-		{{obj.ttInfo.name}}
+		{{obj.name}}
 	</td>
 	<td>
 		{{obj.user.name}}
 	</td>
 	<td>
+		{{cutXml(obj.uploadXml)}}
+		{{if obj.uploadXml != null && obj.uploadXml != ''}}
+			{{if obj.state == '1'}}
+				<button type="button" class="btn btn-primary" value="{{obj.uploadXml}}{{obj.uploadXmlSub}}" onclick="showXml(this)">
+					查看
+				</button>
+			{{else if obj.state == '0'}}
+				<button type="button" class="btn btn-danger" value="{{obj.uploadXml}}{{obj.uploadXmlSub}}" onclick="showXml(this)">
+					查看
+				</button>
+			{{/if}}
+		{{/if}}
+
+	</td>
+	<td>
+		{{if obj.type == '1'}}
+		时刻表上传
+		{{else if obj.type == '2'}}
+		线路停靠站上传
+		{{else if obj.type == '3'}}
+		路单上传
+		{{/if}}
+	</td>
+	<td>
+		{{if obj.state == '1'}}
+		成功
+		{{else if obj.state == '0'}}
+		失败
+		{{/if}}
+	</td>
+	<td>
 		{{obj.createDate}}
 	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
 <tr class="muted">
-	<td colspan=7 style="text-align: center;"><h6>没有找到相关数据</h6></td>
+	<td colspan=10 style="text-align: center;"><h6>没有找到相关数据</h6></td>
 </tr>
 {{/if}}
 	</script>