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 e445d7c3 1f3dbbf6
Showing 17 changed files with 484 additions and 85 deletions
pom.xml
src/main/java/com/bsth/controller/traffic/SKBUploadLoggerController.java
src/main/java/com/bsth/entity/traffic/SKBUploadLogger.java
src/main/java/com/bsth/repository/traffic/SKBUploadLoggerRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/traffic/SKBUploadLoggerService.java
src/main/java/com/bsth/service/traffic/impl/SKBUploadLoggerServiceImpl.java
src/main/resources/static/pages/forms/statement/correctStatis.html
src/main/resources/static/pages/forms/statement/historyMessage.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/mforms/operationservices/operationservice.html
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
src/main/resources/static/pages/trafficManage/timeTempletUploadRecord.html
@@ -24,7 +24,12 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -229,6 +234,23 @@
 			<version>1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-adb</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-transport-local</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-transport-http</artifactId>
+			<version>1.7.4</version>
+		</dependency>
+
+
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
 			<optional>true</optional> </dependency> -->
 		<dependency>
+package com.bsth.controller.traffic;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.traffic.SKBUploadLoggerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("skb_log")
+public class SKBUploadLoggerController extends BaseController<SKBUploadLogger,Integer> {
+
+    @Autowired
+    private SKBUploadLoggerService skbUploadLoggerService;
+
+}
+package com.bsth.entity.traffic;
+
+import com.bsth.entity.schedule.TTInfo;
+import com.bsth.entity.sys.SysUser;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : SKBUploadLogger(时刻表上传日志实体类)
+ * 
+ * @Author : bsth@zq
+ * 
+ * @Description :
+ * 
+ * @Data : 2016-04-27
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_t_upload_logger")
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class SKBUploadLogger {
+
+	// ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+
+	/** 时刻表信息 */
+	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+	private TTInfo ttInfo;
+
+	/** 用户 关联 */
+	@ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
+	private SysUser user;
+
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public TTInfo getTtInfo() {
+		return ttInfo;
+	}
+
+	public void setTtInfo(TTInfo ttInfo) {
+		this.ttInfo = ttInfo;
+	}
+
+	public SysUser getUser() {
+		return user;
+	}
+
+	public void setUser(SysUser user) {
+		this.user = user;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+}
+package com.bsth.repository.traffic;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.repository.BaseRepository;
+
+public interface SKBUploadLoggerRepository extends BaseRepository<SKBUploadLogger, Integer> {
+}
@@ -1068,12 +1068,10 @@ public class FormsServiceImpl implements FormsService {
 			}
 		}
 		Map<String, Object> tempMap = new HashMap<String, Object>();
-		int jhcc = 0;
-		int sjcc = 0;
-		int jhbc = 0;
-		int sjbc = 0;
+		int jhcc = 0, sjcc = 0;
+		int jhbc = 0, sjbc = 0;
 		int qz = 0;
-		for(Map<String, Object> m : tempList){
+		for(Map<String, Object> m : resList){
 			jhcc += Integer.valueOf(m.get("jhcc").toString());
 			sjcc += Integer.valueOf(m.get("sjcc").toString());
 			jhbc += Integer.valueOf(m.get("jhbc").toString());
@@ -1081,7 +1079,7 @@ public class FormsServiceImpl implements FormsService {
 			qz += Integer.valueOf(m.get("qz").toString());
 		}
 		tempMap.put("rq", "分类汇总");
-		tempMap.put("line", "共" + tempList.size() + "条线路");
+		tempMap.put("line", "共" + resList.size() + "条线路");
 		tempMap.put("jhcc", jhcc);
 		tempMap.put("sjcc", sjcc);
 		tempMap.put("jhbc", jhbc);
@@ -421,10 +421,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
 						Long time = fcsj1/60;
-						if(!timeMap0.containsKey(time) && !timeMap1.containsKey(time)){
+						if(!timeMap0.containsKey(time)){
 							timeMap0.put(time, new ArrayList<Long>());
-							timeMap1.put(time, new ArrayList<Long>());
-							timeList.add(time);
+							if(!timeList.contains(time))
+								timeList.add(time);
 						}
 						timeMap0.get(time).add(fcsj2 - fcsj1);
 					}
@@ -432,6 +432,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
 						Long time = fcsj1/60;
+						if(!timeMap1.containsKey(time)){
+							timeMap1.put(time, new ArrayList<Long>());
+							if(!timeList.contains(time))
+								timeList.add(time);
+						}
 						if(timeMap1.containsKey(time)){
 							timeMap1.get(time).add(fcsj2 - fcsj1);
 						}
@@ -440,9 +445,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjs.size(); i++){
 						long fcsj1 = fcsjs.get(i - 1);
 						long fcsj2 = fcsjs.get(i);
-						if(!temp0.containsKey(key) && !temp1.containsKey(key)){
+						if(!temp0.containsKey(key)){
 							temp0.put(key, new ArrayList<Long>());
-							temp1.put(key, new ArrayList<Long>());
 							if(!keyList.contains(key))
 								keyList.add(key);
 						}
@@ -451,6 +455,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					for(int i = 1; i < fcsjAs.size(); i++){
 						long fcsj1 = fcsjAs.get(i - 1);
 						long fcsj2 = fcsjAs.get(i);
+						if(!temp1.containsKey(key)){
+							temp1.put(key, new ArrayList<Long>());
+							if(!keyList.contains(key))
+								keyList.add(key);
+						}
+						System.out.println("key:"+key+" fcsj2:"+fcsj2+" fcsj1:"+fcsj2+" temp1:"+temp1.get(key)+" tem0:"+temp0.get(key));
 						temp1.get(key).add(fcsj2 - fcsj1);
 					}
 				}
@@ -461,14 +471,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					Map<String, Object> tempMap = new HashMap<String, Object>();
 					List<Long> fcsjs = new ArrayList<Long>();
 					List<Long> fcsjAs = new ArrayList<Long>();
-					for(Long l : timeMap0.get(time)){
-						if(l < 90)
-							fcsjs.add(l);
-					}
-					for(Long l : timeMap1.get(time)){
-						if(l < 90)
-							fcsjAs.add(l);
-					}
+					if(timeMap0.containsKey(time))
+						for(Long l : timeMap0.get(time)){
+							if(l < 90)
+								fcsjs.add(l);
+						}
+					if(timeMap1.containsKey(time))
+						for(Long l : timeMap1.get(time)){
+							if(l < 90)
+								fcsjAs.add(l);
+						}
 					Collections.sort(fcsjs);
 					Collections.sort(fcsjAs);
 					String[] split = key.split("/");
@@ -495,7 +507,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 								- Double.valueOf(tempMap.get("jhInterval").toString())));
 					}
-					tempList.add(tempMap);
+					if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+						tempList.add(tempMap);
 				}
 			}
 		}
@@ -504,11 +517,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<Long> sortList = new ArrayList<Long>();
 			Map<Long, List<Map<String, Object>>> sortMap = new HashMap<Long, List<Map<String, Object>>>();
 			for(Map<String, Object> m : tempList){
-				Long sort = Long.valueOf(m.get("times").toString().substring(0, 2));
+				String times = m.get("times").toString();
+				Long sort = Long.valueOf(times.substring(0, 2));
 				if(!sortMap.containsKey(sort)){
 					sortMap.put(sort, new ArrayList<Map<String, Object>>());
 					sortList.add(sort);
 				}
+				String[] split = times.split("-");
+				String[] split0 = split[0].split(":");
+				String[] split1 = split[1].split(":");
+				int t0 = Integer.valueOf(split0[0]);
+				int t1 = Integer.valueOf(split1[0]);
+				if(t0 >= 24){
+					t0 = t0 - 24;
+				}
+				if(t1 >= 24){
+					t1 = t1 - 24;
+				}
+				m.put("times", (t0>9?t0:("0"+t0))+":"+split0[1]+"-"+(t1>9?t1:("0"+t1))+":"+split1[1]);
 				sortMap.get(sort).add(m);
 			}
 			Collections.sort(sortList);
@@ -531,14 +557,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						Map<String, Object> tempMap = new HashMap<String, Object>();
 						List<Long> fcsjs = new ArrayList<Long>();
 						List<Long> fcsjAs = new ArrayList<Long>();
-						for(Long l : temp0.get(key)){
-							if(l < 90)
-								fcsjs.add(l);
-						}
-						for(Long l : temp1.get(key)){
-							if(l < 90)
-								fcsjAs.add(l);
-						}
+						if(temp0.containsKey(key))
+							for(Long l : temp0.get(key)){
+								if(l < 90)
+									fcsjs.add(l);
+							}
+						if(temp0.containsKey(key))
+							for(Long l : temp1.get(key)){
+								if(l < 90)
+									fcsjAs.add(l);
+							}
 						Collections.sort(fcsjs);
 						Collections.sort(fcsjAs);
 						long fcsj = 0l;
@@ -563,7 +591,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 							tempMap.put("deviation", df.format(Double.valueOf(tempMap.get("sjInterval").toString())
 									- Double.valueOf(tempMap.get("jhInterval").toString())));
 						}
-						resList.add(tempMap);
+						if(fcsjs.size() != 0 || fcsjAs.size() != 0)
+							resList.add(tempMap);
 					}
 				}
 			}
@@ -601,6 +630,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		Map<String, List<ChildTaskPlan>> cMap = new HashMap<String, List<ChildTaskPlan>>();
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		Set<Long> tsSet = new HashSet<Long>();
+		Set<Long> ttSet = new HashSet<Long>();
 		String company = map.get("company").toString();
 		String subCompany = map.get("subCompany").toString();
@@ -639,7 +669,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			where += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			String sql = "select * from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
+			String sql = "select id, schedule_date_Str, real_exec_date, xl_name, lp_name, bcs, bcsj, jhlc,"
+					+ " fcsj, fcsj_actual, zdsj, zdsj_actual, qdz_name, zdz_name, xl_dir, status, remarks, gs_name, fgs_name, sp_id"
+					+ " from bsth_c_s_sp_info_real where DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"'"
 					+ " and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"'"+where+"";
 			list = jdbcTemplate.query(sql,
@@ -652,11 +684,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
 					schedule.setLpName(rs.getString("lp_name"));
-					schedule.setBcType(rs.getString("bc_type"));
 					schedule.setBcs(rs.getInt("bcs"));
 					schedule.setBcsj(rs.getInt("bcsj"));
 					schedule.setJhlc(rs.getDouble("jhlc"));
-					schedule.setDfsj(rs.getString("dfsj"));
 					schedule.setFcsj(rs.getString("fcsj"));
 					schedule.setFcsjActual(rs.getString("fcsj_actual"));
 					schedule.setZdsj(rs.getString("zdsj"));
@@ -668,12 +698,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setRemarks(rs.getString("remarks"));
 					schedule.setGsName(rs.getString("gs_name"));
 					schedule.setFgsName(rs.getString("fgs_name"));
-					schedule.setDfAuto(rs.getBoolean("df_auto"));
-					schedule.setOnline(rs.getBoolean("online"));
-					schedule.setClZbh(rs.getString("cl_zbh"));
-					schedule.setjGh(rs.getString("j_gh"));
-					schedule.setjName(rs.getString("j_name"));
-					schedule.setStatus(rs.getInt("status"));
 					schedule.setSpId(rs.getLong("sp_id"));
 					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
@@ -726,7 +750,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			{
 				List<Map<String, String>> temp1 = new ArrayList<Map<String, String>>();
 				List<Map<String, String>> temp2 = new ArrayList<Map<String, String>>();
-				sql = "select * from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select id, lp, fcsj, xl_bm, tt_info from bsth_c_s_sp_info where bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
 				if(startDate.equals(endDate)){
 					sql += " and schedule_date = '"+startDate+"'";
@@ -782,7 +806,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sql = "select * from bsth_c_s_child_task order by start_date";
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task order by start_date";
 			cList = jdbcTemplate.query(sql,
 					new RowMapper<ChildTaskPlan>(){
@@ -798,10 +822,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					return cTask;
 				}
 			});
-			
+
 			if(model.length() != 0){
-				sql = "select sp.id from bsth_c_s_sp_info sp left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj "
-						+ "where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select sp.id from "
+						+ "(select id, tt_info, xl_bm, lp, fcsj from bsth_c_s_sp_info where schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'"
+						+ " and tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks') sp"
+						+ " left join bsth_c_s_ttinfo_detail tt on sp.tt_info = tt.ttinfo and sp.xl_bm = tt.xl and sp.lp = tt.lp and sp.fcsj = tt.fcsj";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Map<String, Object>>(){
@@ -809,10 +835,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("id", rs.getString("id"));
-						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
+//						m.put("ists", rs.getString("ists")!=null?rs.getString("ists"):"0");
 						return m;
 					}
 				});
+				
+				for(Map<String, Object> m : ttList){
+					ttSet.add(Long.valueOf(m.get("id").toString()));
+				}
 			}
 		} catch (Exception e) {
@@ -852,15 +882,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(schedule.getXlName()==null || schedule.getXlName().trim().length()==0)
 				continue;
 			if(model.length() != 0){
-				for(Map<String, Object> tt : ttList){
-					long id = Long.valueOf(tt.get("id").toString());
-					if(id == (long)schedule.getSpId()){
-						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
-						if(!keyMap.containsKey(key))
-							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
-						keyMap.get(key).add(schedule);
-					}
+				if(ttSet.contains(schedule.getSpId())){
+					String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+					if(!keyMap.containsKey(key))
+						keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+					keyMap.get(key).add(schedule);
 				}
+//				for(Map<String, Object> tt : ttList){
+//					long id = Long.valueOf(tt.get("id").toString());
+//					if(id == (long)schedule.getSpId()){
+//						String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
+//						if(!keyMap.containsKey(key))
+//							keyMap.put(key, new ArrayList<ScheduleRealInfo>());
+//						keyMap.get(key).add(schedule);
+//					}
+//				}
 			}else{
 				String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/" + schedule.getLpName();
 				if(!keyMap.containsKey(key))
@@ -8,9 +8,13 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.schedule.TTInfo;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.entity.search.CustomerSpecs;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.traffic.SKBUploadLogger;
 import com.bsth.repository.*;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 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.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
@@ -101,6 +105,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
+	// 时刻表上传记录repository
+	@Autowired
+	private SKBUploadLoggerRepository skbUploadLoggerRepository;
+
 	// 运管处接口
 	private InternalPortType portType = null;//new Internal().getInternalHttpSoap11Endpoint();
@@ -763,11 +771,12 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA;
 			StringBuffer sBufferB;
+			// 上传的时刻表集合
+			List<TTInfo> ttinfoList = new ArrayList<>();
 			TTInfo ttInfo;
 			TTInfoDetail ttInfoDetail;
 			Iterator<TTInfoDetail> ttInfoDetailIterator;
 			HashMap<String,Object> param = new HashMap<String, Object>();
-			String lineCode ;
 			sBuffer.append("<SKBs>");
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<String, String>();
@@ -775,6 +784,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				ttInfo = ttInfoRepository.findOne(Long.valueOf(idArray[i]));
 				if(ttInfo == null)
 					continue;
+				ttinfoList.add(ttInfo); // 保存时刻表
 				param.put("ttinfo.id_eq", ttInfo.getId());
 				ttInfoDetailIterator = ttInfoDetailRepository.findAll(new CustomerSpecs<TTInfoDetail>(param),
 						new Sort(Direction.ASC, "xlDir")).iterator();
@@ -802,7 +812,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 							sBufferA.append("<JHYYLC>").append(ttInfoDetail.getJhlc()).append("</JHYYLC>");
 							sBuffer.append(sBufferA).append(sBufferB);
 						}
-						lineCode = ttInfoDetail.getXl().getLineCode();
 						// 如果发车时间格式错误，忽略此条
 						if(changeTimeFormat(ttInfoDetail) == null){
 							continue;
@@ -831,6 +840,15 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
+				SKBUploadLogger skbUploadLogger ;
+				SysUser user = SecurityUtils.getCurrentUser();
+				// 保存时刻表上传记录
+				for(TTInfo ttInfo1 : ttinfoList){
+					skbUploadLogger = new SKBUploadLogger();
+					skbUploadLogger.setTtInfo(ttInfo1);
+					skbUploadLogger.setUser(user);
+					skbUploadLoggerRepository.save(skbUploadLogger);
+				}
 			}
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
+package com.bsth.service.traffic;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.BaseService;
+
+
+/**
+ * 时刻模板上传日志
+ */
+public interface SKBUploadLoggerService extends BaseService<SKBUploadLogger,Integer> {
+
+}
+package com.bsth.service.traffic.impl;
+
+import com.bsth.entity.traffic.SKBUploadLogger;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.traffic.SKBUploadLoggerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
+ *
+ * @Extends : BaseService
+ *
+ * @Description:
+ *
+ * @Author bsth@zq
+ *
+ * @Date 2016年10月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+
+@Service
+public class SKBUploadLoggerServiceImpl extends BaseServiceImpl<SKBUploadLogger,Integer> implements SKBUploadLoggerService{
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+}
@@ -7,7 +7,8 @@
 	  .table-bordered > tbody > tr > td,
 	  .table-bordered > tfoot > tr > th,
 	  .table-bordered > tfoot > tr > td {
-	    border: 1px solid; }
+	    border: 1px solid;
+	    text-align: center; }
 	  .table-bordered > thead > tr > th,
 	  .table-bordered > thead > tr > td {
 	    border-bottom-width: 2px; }
@@ -46,7 +46,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;max-height: 520px;">
+				<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
@@ -80,6 +80,7 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-280);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -57,7 +57,7 @@
 						<span class="item-label" style="width: 80px;">选择线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 10px">
+					<div style="display: inline-block; margin-left: 10px; display: none;">
 						<span class="item-label" style="width: 80px;">时刻类型: </span>
 						<select class="form-control" name="model" id="model" style="width: 165px;">
 							<option value="">请选择...</option>
@@ -93,7 +93,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -135,6 +135,7 @@
 			format : 'HH:mm',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-320);
 		var d = new Date();
 		var year = d.getFullYear();
@@ -239,6 +240,7 @@
 		$("#subCompany").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id:" ", text:"全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -310,6 +312,8 @@
 			}
 			var reason = $("input[name='reason']");
 			var params = {};
+			if(line == " ")
+				line = "";
 // 			line = $("#line").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
@@ -454,7 +458,7 @@
 <thead>
 	<tr>
 		<th class="hidden"></th>
-		<th rowspan="3">日期</th>
+		<th rowspan="3" style=" width:120px;">日期</th>
 		<th rowspan="3">时段</th>
 		<th rowspan="3">公司</th>
 		<th rowspan="3">分公司</th>
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="col-md-9"  id="printArea">
-						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 520px">
+						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 							<table class="table table-bordered table-checkable" id="forms">
 								<tbody class="ludan_1">
@@ -106,6 +106,7 @@
 			locale : 'zh-cn'
 		});
+		$("#xcld_height").height($(window).height()-100);
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -257,7 +258,7 @@
 			if($(this).children().size() < 2){
 				return;
 			}
-			
+			$("#xcld_height").height($(window).height()-100);
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});
@@ -78,7 +78,7 @@
 								<th>线路名称</th>
 								<th>加注量</th>
 								<th>消耗量</th>
-								<th>行驶公里(含空放里程)</th>
+								<th>行驶总公里(含空驶里程)</th>
 								<th>空驶里程</th>
 								<th>实际班次(包含空放班次)</th>
 							</tr>
@@ -92,16 +92,17 @@
 		$("#right_div table tbody").empty();
 		var params = {};
 		// 取得输入框的值
-		var inputs = $(".param input,select");debugger;
+		var inputs = $(".param input,select");
 		// 遍历数组
 		$.each(inputs, function(i, element) {
 			params[$(element).attr("name")] = $(element).val();
 		});
 		var i = layer.load(2);
 		$get('/tic_ec', params, function(data) {
-			_dateFormat(data.content);
+			var content = data.data.content;
+			_dateFormat(content);
 			var bodyHtm = template('timeTemplet_list_temp', {
-				list : data.content
+				list : content
 			});
 			$("#left_div table tbody").empty();
 			$("#left_div table tbody").append(bodyHtm);
@@ -13,6 +13,7 @@
  */
 (function(){
+    var page = 0, initPagination;
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed'))
 		$('.menu-toggler.sidebar-toggler').click();
@@ -69,6 +70,49 @@
 			 $('#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事件
+        $("#line_name").autocompleter({
+            highlightMatches: true,
+            source: lines,
+            template: '{{ label }} <span>({{ hex }})</span>',
+            hint: true,
+            empty: false,
+            limit: 5,
+        });
+    }
+
 	 // 日期控件
 	 $('#dateInput').datetimepicker({
 		 // 日期控件时间格式
@@ -140,7 +184,7 @@
 			});
 		});
 		// 给输入框绑定autocomplete事件
-		$("input[name='xl.name_eq']").autocompleter({
+		$("#line_name").autocompleter({
 			highlightMatches : true,
 			source : lines,
 			template : '{{ label }} <span>({{ hex }})</span>',
@@ -150,5 +194,66 @@
 		});
 		// 设置autocompleter的宽度和输入框一样
 		$(".autocompleter").css("width",
-				$("input[name='xl.name_eq']").css("width"));
+				$("#line_name").css("width"));
+
+    searchM(null, true);
+    // 绑定查询事件
+    $("#search").click(searchM);
+    // 查询方法
+    function searchM(p, pagination) {
+        var params = {};
+        // 取得输入框的值
+        var inputs = $(".breadcrumb input,select");
+        // 遍历数组
+        $.each(inputs, function(i, element) {
+            params[$(element).attr("name")] = $(element).val();
+        });
+        var i = layer.load(2);
+        $get('/skb_log', params, function(data) {
+            var content = data.content;
+            _dateFormat(content);
+            var bodyHtm = template('timeTempletUploadRecord_list_temp', {
+                list : content
+            });
+            $('#datatable_logger tbody').html(bodyHtm);
+            if(pagination && data.content.length > 0){
+                //重新分页
+                initPagination = true;
+                showPagination(data);
+            }
+            layer.close(i);
+        });
+    }
+
+    //转换时间格式
+    function _dateFormat(list) {
+        var fs = 'YYYY-MM-DD HH:mm';
+        $.each(list, function(i, obj) {
+            obj.createDate = moment(obj.createDate).format(fs);
+        });
+    }
+
+    function showPagination(data){
+        //分页
+        $('#pagination').jqPaginator({
+            totalPages: data.totalPages,
+            visiblePages: 6,
+            currentPage: page + 1,
+            first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+            onPageChange: function (num, type) {
+                if(initPagination){
+                    initPagination = false;
+                    return;
+                }
+
+
+                page = num - 1;
+                searchM(null, false);
+            }
+        });
+    }
 })();
 \ No newline at end of file
@@ -10,16 +10,16 @@
 	<div class="col-md-12">
 		<ul class="breadcrumb">
 			<li>筛选数据:</li>
-			<li><select name="company_eq" class="form-control" id="companySelect"></select></li>
-			<li><select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select></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>日期:</li>
-			<li><input type="text" class="inputCommon dateTime" name="date" id="dateInput" placeholder="日期"></li>
+			<li><input type="text" class="inputCommon dateTime" name="createDate_date_eq" id="dateInput" placeholder="日期"></li>
 			<li>线路名称:</li>
 			<li><input type="text" class="form-control form-filter input-sm"
-				name="xl.name_eq" maxlength="40" /></li>
+				name="ttInfo.xl.name_eq" id="line_name" maxlength="40" /></li>
 			<li>上传用户:</li>
 			<li><input type="text" class="inputCommon inputCarPlate"
-				name="xl.user_eq" maxlength="40" /></li>
+				name="user.name_like" maxlength="40" /></li>
 			<li><a class="btn btn-circle blue" id="search">筛选</a></li>
 		</ul>
 	</div>
@@ -27,7 +27,8 @@
 		<div class="_panel">
 			<div class="table-container">
 				<table
-					class="table table-striped table-bordered table-advance pb-table head">
+					class="table table-striped table-bordered table-advance pb-table head"
+					id="datatable_logger">
 					<thead>
 						<tr>
 							<th>序号</th>
@@ -49,35 +50,97 @@
 		</div>
 	</div>
 </div>
-<script id="lineStationRecord_list_temp" type="text/html">
+<script id="timeTempletUploadRecord_list_temp" type="text/html">
 {{each list as obj i}}
 <tr>
 	<td class="seq" style="vertical-align: middle;">
 		{{i+1}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{if obj.ttInfo.xl.company == '55'}}
+		上南公司
+		{{else if obj.ttInfo.xl.company == '22'}}
+		金高公司
+		{{else if obj.ttInfo.xl.company == '05'}}
+		杨高公司
+		{{else if obj.ttInfo.xl.company == '26'}}
+		南汇公司
+		{{else if obj.ttInfo.xl.company == '77'}}
+		闵行公司
+		{{/if}}
 	</td>
-	<td class="ttInfoId">
-		{{obj.company}}
+	<td>
+		{{if obj.ttInfo.xl.company == '55'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		上南二分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		上南三分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		上南六分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		上南一分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '22'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		四分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		二分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		三分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		一分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '05'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		川沙分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		金桥分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		芦潮港分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		杨高分公司
+		{{else if obj.ttInfo.xl.brancheCompany == '6'}}
+		周浦分公司
+		{{/if}}
+
+		{{else if obj.ttInfo.xl.company == '26'}}
+
+		{{if obj.ttInfo.xl.brancheCompany == '1'}}
+		南汇一分
+		{{else if obj.ttInfo.xl.brancheCompany == '2'}}
+		南汇二分
+		{{else if obj.ttInfo.xl.brancheCompany == '3'}}
+		南汇三分
+		{{else if obj.ttInfo.xl.brancheCompany == '4'}}
+		南汇维修公司
+		{{else if obj.ttInfo.xl.brancheCompany == '5'}}
+		南汇公司
+		{{/if}}
+
+		{{/if}}
 	</td>
 	<td>
-		{{obj.name}}
+		{{obj.ttInfo.xl.name}}
 	</td>
 	<td>
-		{{obj.company}}
+		{{obj.ttInfo.name}}
 	</td>
 	<td>
-		
+		{{obj.user.name}}
 	</td>
-	<td >
-		
+	<td>
+		{{obj.createDate}}
 	</td>
 </tr>
 {{/each}}
 {{if list.length == 0}}
 <tr class="muted">
-	<td colspan=5 style="text-align: center;"><h6>没有找到相关数据</h6></td>
+	<td colspan=7 style="text-align: center;"><h6>没有找到相关数据</h6></td>
 </tr>
 {{/if}}
 	</script>