Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents f3579e30 0a168ad6
Showing 22 changed files with 196 additions and 243 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/resources/logback.xml
src/main/resources/static/pages/forms/statement/account.html
src/main/resources/static/pages/forms/statement/commandState.html
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/forms/statement/daily.html
src/main/resources/static/pages/forms/statement/firstAndLastBus.html
src/main/resources/static/pages/forms/statement/historyMessage.html
src/main/resources/static/pages/forms/statement/peopleCarPlan.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
src/main/resources/static/pages/mforms/singledatas/singledata.html
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
src/main/resources/static/pages/mforms/vehicleloadings/vehicleloading.html
@@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
 /**
  * 相关数据异常检测
@@ -35,16 +35,19 @@ public class anomalyCheckController {
     public void schRepeat(@RequestParam String nbbm){
         logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
         List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+        logger.info("检测前，车辆班次数量：" + list.size());
-        Set<ScheduleRealInfo> set = new HashSet<>();
+        Map<Long, ScheduleRealInfo> map = new HashMap<>();
         for(ScheduleRealInfo sch : list){
-            if(!set.add(sch)){
-                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            if(map.containsKey(sch.getId())){
+                logger.info("检测到重复ID： " + sch.getId());
             }
+            map.put(sch.getId(), sch);
         }
-        if(set.size() > 0){
-            dayOfSchedule.replaceByNbbm(nbbm, set);
+        logger.info("检测后，车辆班次数量：" + list.size());
+        if(map.values().size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, map.values());
         }
     }
 }
@@ -10,6 +10,7 @@ import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.util.ConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -69,6 +70,11 @@ public class GpsDataLoaderThread extends Thread {
         try {
             httpClient = HttpClients.createDefault();
             HttpGet get = new HttpGet(url);
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(2000).build();
+            get.setConfig(requestConfig);
             response = httpClient.execute(get);
@@ -107,6 +113,7 @@ public class GpsDataLoaderThread extends Thread {
                         gps.setNbbm(nbbm);
                     //有更新的点位
                     updateList.add(gps);
+                    logger.info("全量点："+ list.size() +"，更新点" + updateList.size());
                 }
                 //分析数据
                 gpsRealAnalyse.analyse(updateList);
@@ -480,7 +480,7 @@ public class DayOfSchedule implements CommandLineRunner {
     public List<ScheduleRealInfo> findByLineCode(String lineCode) {
         List<ScheduleRealInfo> rs = new ArrayList<>();
-        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
+        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch);
@@ -489,6 +489,22 @@ public class DayOfSchedule implements CommandLineRunner {
     }
     /**
+     * @Title: findByLineCode
+     * @Description: TODO(lineList 获取班次)
+     */
+    public Map<String, Collection<ScheduleRealInfo>> findByLineCodes(List<String> lineList) {
+        ArrayListMultimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
+
+        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
+        for (ScheduleRealInfo sch : schs) {
+            if(lineList.contains(sch.getXlBm())){
+                mMap.put(sch.getXlBm(), sch);
+            }
+        }
+        return mMap.asMap();
+    }
+
+    /**
      * @Title: findCarByLineCode
      * @Description: TODO(线路下运营的车辆)
      */
@@ -870,16 +886,14 @@ public class DayOfSchedule implements CommandLineRunner {
      */
     public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
         List<ScheduleRealInfo> ups = new ArrayList<>();
-        /*String oldClzbh = sch.getClZbh();
-        if (oldClzbh.equals(newClZbh))
-            return ups;*/
-
         //变更相关映射信息
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
         sch.setClZbh(newClZbh);
-        nbbmScheduleMap.put(newClZbh, sch);
+        if(!nbbmScheduleMap.containsEntry(newClZbh, sch)){
+            nbbmScheduleMap.put(newClZbh, sch);
+        }
         //重新计算班次应到时间
         //ups.addAll(updateQdzTimePlan(oldClzbh));
@@ -996,11 +1010,9 @@ public class DayOfSchedule implements CommandLineRunner {
      * @param nbbm
      * @param sets
      */
-    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+    public void replaceByNbbm(String nbbm, Collection<ScheduleRealInfo> sets){
         nbbmScheduleMap.removeAll(nbbm);
         nbbmScheduleMap.putAll(nbbm, sets);
-        //重新计算班次应到时间
-        updateQdzTimePlan(nbbm);
     }
     /**
@@ -766,7 +766,7 @@ public class FormsServiceImpl implements FormsService {
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
@@ -775,21 +775,24 @@ public class FormsServiceImpl implements FormsService {
 				Turnoutrate tu = new Turnoutrate();
 				NumberFormat numberFormat = NumberFormat.getInstance();
 				numberFormat.setMaximumFractionDigits(2);
-				String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
-						/ (float) Integer.parseInt(arg0.getString("jcl")) * 100);
-				String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
-						/ (float) Integer.parseInt(arg0.getString("jbc")) * 100);
+				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
+				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
+				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
+				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
+				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
+				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
-				tu.setXl(arg0.getString("xlgs"));
-				tu.setXlmc(arg0.getString("sxl"));
-				tu.setCchjh(arg0.getString("jcl").toString());
-				tu.setCchsj(arg0.getString("scl").toString());
-				tu.setCchqz(arg0.getString("sxl").toString());
+//				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
+				tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
+				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
+				tu.setCchjh("" + jcl);
+				tu.setCchsj("" + scl);
+				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
 				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh(arg0.getString("jbc").toString());
-				tu.setBcsj(arg0.getString("sbc").toString());
+				tu.setBcjh("" + jbc);
+				tu.setBcsj("" + sbc);
 				tu.setBbzxl(result2 + "%");// 班次执行率
 				tu.setSm(arg0.getString("gs_name").toString());
 				tu.setGsgs(arg0.getString("gslsbm").toString());
@@ -799,7 +802,6 @@ public class FormsServiceImpl implements FormsService {
 		});
-		
 		return list;
 	}
@@ -836,7 +838,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm) b on "
+				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
@@ -845,24 +847,27 @@ public class FormsServiceImpl implements FormsService {
 				Executionrate tu = new Executionrate();
 				NumberFormat numberFormat = NumberFormat.getInstance();
 				numberFormat.setMaximumFractionDigits(2);
-				String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
-						/ (float) Integer.parseInt(arg0.getString("jcl")) * 100);
-				String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
-						/ (float) Integer.parseInt(arg0.getString("jbc")) * 100);
+				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
+				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
+				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
+				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
+				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
+				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
-				tu.setXl(arg0.getString("xlgs"));//这个是根据公司判断线路有几条
+//				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");//这个是根据公司判断线路有几条
+				tu.setXl(arg0.getString("jxl")!=null&&arg0.getString("jxl").trim().length()!=0?arg0.getString("jxl"):"0");
 				//tu.setXl(arg0.getString("sxl"));
-				tu.setXlmc(arg0.getString("sxl"));
-				tu.setCchjh(arg0.getString("jcl").toString());
-				tu.setCchsj(arg0.getString("scl").toString());
-				tu.setCchqz(arg0.getString("sxl").toString());
+				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
+				tu.setCchjh("" + jcl);
+				tu.setCchsj("" + scl);
+				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
 				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh(arg0.getString("jbc").toString());
-				tu.setBcsj(arg0.getString("sbc").toString());
+				tu.setBcjh("" + jbc);
+				tu.setBcsj("" + sbc);
 				tu.setBbzxl(result2 + "%");// 班次执行率
-				tu.setSm(arg0.getString("xl_name").toString());
+				tu.setSm(arg0.getString("xl_name"));
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
@@ -912,7 +917,7 @@ public class FormsServiceImpl implements FormsService {
 				+ "' AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
 				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		
+		System.out.println(sql);
 		List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
 			@Override
@@ -920,28 +925,30 @@ public class FormsServiceImpl implements FormsService {
 				Allline tu = new Allline();
 				NumberFormat numberFormat = NumberFormat.getInstance();
 				numberFormat.setMaximumFractionDigits(2);
-				String result1 = numberFormat.format((float) Integer.parseInt(arg0.getString("scl"))
-						/ (float) Integer.parseInt(arg0.getString("jcl")) * 100);
-				String result2 = numberFormat.format((float) Integer.parseInt(arg0.getString("sbc"))
-						/ (float) Integer.parseInt(arg0.getString("jbc")) * 100);
+				int scl = arg0.getString("scl")!=null&&arg0.getString("scl").trim().length()!=0?Integer.parseInt(arg0.getString("scl")):0;
+				int jcl = arg0.getString("jcl")!=null&&arg0.getString("jcl").trim().length()!=0?Integer.parseInt(arg0.getString("jcl")):0;
+				int sbc = arg0.getString("sbc")!=null&&arg0.getString("sbc").trim().length()!=0?Integer.parseInt(arg0.getString("sbc")):0;
+				int jbc = arg0.getString("jbc")!=null&&arg0.getString("jbc").trim().length()!=0?Integer.parseInt(arg0.getString("jbc")):0;
+				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
+				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 				tu.setXl(arg0.getString("xl_name"));
-				tu.setXlmc(arg0.getString("sxl"));
-				tu.setCchjh(arg0.getString("jcl").toString());
-				tu.setCchsj(arg0.getString("scl").toString());
-				tu.setCchqz(arg0.getString("sxl").toString());
+				tu.setXlmc(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
+				tu.setCchjh("" + jcl);
+				tu.setCchsj("" + scl);
+				tu.setCchqz(arg0.getString("sxl")!=null&&arg0.getString("sxl").trim().length()!=0?arg0.getString("sxl"):"0");
 				tu.setChl(result1 + "%");// 出车率
-				tu.setBcjh(arg0.getString("jbc").toString());
-				tu.setBcsj(arg0.getString("sbc").toString());
+				tu.setBcjh("" + jbc);
+				tu.setBcsj("" + sbc);
 				tu.setBbzxl(result2 + "%");// 班次执行率
-			    tu.setSm(arg0.getString("xl_name").toString());
+			    tu.setSm(arg0.getString("xl_name"));
 				tu.setGsgs(arg0.getString("gslsbm").toString());
 				tu.setFgsgs(arg0.getString("fgsbm").toString());
 				return tu;
-			}			
+			}
 		});
 		return list;
@@ -49,10 +49,8 @@ import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -144,12 +142,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Collection<ScheduleRealInfo>> findByLines(String lines) {
         List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
-        Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
+        /*Multimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
         for (String lineCode : lineList) {
             mMap.putAll(lineCode, dayOfSchedule.findByLineCode(lineCode));
-        }
-        return mMap.asMap();
+        }*/
+        return dayOfSchedule.findByLineCodes(lineList);
     }
     private final static long DAY_TIME = 1000 * 60 * 60 * 24L;
@@ -141,7 +141,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		/*String company = "";
+		String company = "";
 		String subCompany ="";
 		if(map.get("company")!=null){
 			 company = map.get("company").toString();
@@ -149,7 +149,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		if(map.get("subCompany")!=null){
 			subCompany=map.get("subCompany").toString();
-		}*/
+		}
 		String line = map.get("line").toString();
 		String date = map.get("date").toString();
 		String type = map.get("type").toString();
@@ -164,9 +164,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(line.length() != 0){
 				sql += " and xl_bm = '"+line+"'";
 			}
-			/*if(company.length() != 0){
+			if(company.length() != 0){
 				sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
-			}*/
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<SchedulePlanInfo>(){
@@ -155,6 +155,28 @@
 		<appender-ref ref="DATATOOLS" />
 	</logger>
+
+	<!-- gps -->
+	<appender name="GPS_COUNT"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/gps/count.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/gps_count/gateway-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.gpsdata.thread.GpsDataLoaderThread"
+			level="INFO" additivity="false">
+		<appender-ref ref="GPS_COUNT" />
+	</logger>
     <!--<logger name="org.hibernate.SQL" level="TRACE">-->
         <!--<appender-ref ref="STDOUT" />-->
     <!--</logger>-->
@@ -139,6 +139,10 @@
 		var date = $("#date").val();
 		var code = $("#code").val();
 		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -141,52 +141,10 @@
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
-// 		$.get('/basic/lineCode2Name',function(result){
-// 			var data=[];
-			
-// 			data.push({id: " ", text: "全部线路"});
-// 			for(var code in result){
-// 				data.push({id: code, text: result[code]});
-// 			}
-			
-// 			console.log(data);
-// 			initPinYinSelect2('#line',data,'');
-// 		})
-		
-// 		var obj = [];
-// 		$.get('/user/companyData', function(result){
-// 			obj = result;
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-// 			}
-// 			if(obj.length == 1){
-// 				$('#company1').hide();
-// 				if(obj[0].children.length == 1)
-// 					$('#subCompany1').hide();
-// 			}
-// 			$('#company').html(options);
-// 			updateCompany();
-// 		});
-// 		$("#company").on("change",updateCompany);
-// 		function updateCompany(){
-// 			var company = $('#company').val();
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				if(obj[i].companyCode == company){
-// 					var children = obj[i].children;
-// 					for(var j = 0; j < children.length; j++){
-// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-// 					}
-// 				}
-// 			}
-// 			$('#subCompany').html(options);
-// 		}
 		var fage=false;
 		var xlList;
 		var obj = [];
-		
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -296,6 +254,10 @@
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		function jsDoQuery(pagination){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			line = $("#line").val();
 			if(line == " ")
@@ -205,6 +205,14 @@
 	    var lpName = $("#lpName").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择范围！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择范围！");
+				return;
+			}
 		    line = $("#line").val();
 		    startDate = $("#startDate").val();
 		    endDate = $("#endDate").val();
@@ -182,7 +182,10 @@
 	var gsdmDaily;
 	var fgsdmDaily;
 	$("#query").on("click",function(){
-		
+		if($("#date").val() == null || $("#date").val().trim().length == 0){
+			layer.msg("请选择时间");
+			return;
+		}
 		line = $("#line").val();
 		var lineName=$("#select2-line-container").html();
 		date = $("#date").val();
@@ -118,51 +118,10 @@
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
-// 		$.get('/basic/lineCode2Name',function(result){
-// 			var data=[];
-			
-// 			data.push({id: " ", text: "全部线路"});
-// 			for(var code in result){
-// 				data.push({id: code, text: result[code]});
-// 			}
-// 			console.log(data);
-// 			initPinYinSelect2('#line',data,'');
-// 		});
-		
-// 		var obj = [];
-// 		$.get('/user/companyData', function(result){
-// 			obj = result;
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-// 			}
-// 			if(obj.length == 1){
-// 				$('#company1').hide();
-// 				if(obj[0].children.length == 1)
-// 					$('#subCompany1').hide();
-// 			}
-// 			$('#company').html(options);
-// 			updateCompany();
-// 		});
-// 		$("#company").on("change",updateCompany);
-// 		function updateCompany(){
-// 			var company = $('#company').val();
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				if(obj[i].companyCode == company){
-// 					var children = obj[i].children;
-// 					for(var j = 0; j < children.length; j++){
-// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-// 					}
-// 				}
-// 			}
-// 			$('#subCompany').html(options);
-// 		}
 		var fage=false;
 		var xlList;
 		var obj = [];
-		 
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -233,6 +192,10 @@
 		var line = $("#line").val();
 		var date = $("#date").val();
 		function jsDoQuery(pagination){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			var params = {};
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
@@ -134,6 +134,10 @@
 		var date = $("#date").val();
 		var code = $("#code").val();
 		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间");
+				return;
+			}
 			line = $("#line").val();
 			date = $("#date").val();
 			code = $("#code").val();
@@ -105,7 +105,6 @@
 		var xlList;
 		var obj = [];
-		 
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -125,53 +125,10 @@
 		$("#startDate").val(year + "-" + month + "-" + day);
 		$("#endDate").val(year + "-" + month + "-" + day);
-// 		$.get('/basic/lineCode2Name',function(result){
-// 			var data=[];
-			
-// 			data.push({id:" ", text: "全部线路"});
-// 			for(var code in result){
-// 				data.push({id: code, text: result[code]});
-// 			}
-// 			initPinYinSelect2('#line',data,'');
-
-// 			line = "";
-// 			updateModel();
-// 		});
-		
-// 		var obj = [];
-// 		$.get('/user/companyData', function(result){
-// 			obj = result;
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-// 			}
-// 			if(obj.length == 1){
-// 				$('#company1').hide();
-// 				if(obj[0].children.length == 1)
-// 					$('#subCompany1').hide();
-// 			}
-// 			$('#company').html(options);
-// 			updateCompany();
-// 		});
-// 		$("#company").on("change",updateCompany);
-// 		function updateCompany(){
-// 			var company = $('#company').val();
-// 			var options = '';
-// 			for(var i = 0; i < obj.length; i++){
-// 				if(obj[i].companyCode == company){
-// 					var children = obj[i].children;
-// 					for(var j = 0; j < children.length; j++){
-// 						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
-// 					}
-// 				}
-// 			}
-// 			$('#subCompany').html(options);
-// 		}
 		var fage=false;
 		var xlList;
 		var obj = [];
-		 
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -247,6 +204,14 @@
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
 		function jsDoQuery(pagination){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
 			var params = {};
 // 			line = $("#line").val();
 			startDate = $("#startDate").val();
@@ -41,7 +41,7 @@
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
+					<div style="display: inline-block; margin-left: 29px;" id="fgsdmDiv">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 					</div>
@@ -169,18 +169,7 @@
 		$("#date").val(year + "-" + month + "-" + day);
 		$("#date2").val(year + "-" + month + "-" + day);
-		/* $.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			data.push({id: "", text:"请选择"});
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#line',data,'');
-			
-		}) */
-
 		var fage=false;
 		var obj = [];
 		var xlList;
@@ -222,7 +211,7 @@
 		$("#fgsdm").on("change",initXl);
 		function initXl(){
 			var data=[];
-			data.push({id: " ", text: "请选择"});
+			data.push({id: " ", text: "全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -251,6 +240,14 @@
 		var gsdm="";
 		var fgsdm="";
 		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#date2").val() == null || $("#date2").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -36,23 +36,23 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmManth" style="width: 140px;"></select>
 					</div>  
-					<div style="display: inline-block;">
-                        <span class="item-label" style="width: 80px;">线路: </span>
+					<div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 150px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
                     </div>
                     <div style="margin-top: 10px">
                     </div>
-                    <div style="display: inline-block;margin-left: 15px;">
+                    <div style="display: inline-block;margin-left: 5px;">
                         <span class="item-label" style="width: 80px;">开始时间: </span>
-                        <input class="form-control" type="text" id="startDate" style="width: 120px;"/>
+                        <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
                     </div>
-                    <div style="display: inline-block;margin-left: 15px;">
+                    <div style="display: inline-block;margin-left: 10px;">
                         <span class="item-label" style="width: 80px;">结束时间: </span>
-                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                        <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
                     </div>
-                    <div style="display: inline-block;margin-left: 15px">
-                        <span class="item-label" style="width: 150px;">统计： </span>
+                    <div style="display: inline-block;margin-left: 10px">
+                        <span class="item-label" style="width: 80px;">统计： </span>
                         <select class="form-control" style="width: 136px;" id='empnames'>
                         	<option value="驾驶员">驾驶员</option>
                         	<option value="售票员">售票员</option>
@@ -166,6 +166,14 @@
 			fage=true;
 		}
 		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
+			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择时间范围！");
+				return;
+			}
 			$("#empname").html($("#empnames").val())
 			var params={};
 			params.empnames=$("#empnames").val();
@@ -101,7 +101,6 @@
 		var xlList;
 		var obj = [];
-		 
 		$.get('/report/lineList',function(result){
 			xlList=result;
 			$.get('/user/companyData', function(result){
@@ -138,16 +137,6 @@
 			initXl();
 		}
-		/* $.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#line',data,'');
-			
-		}) */
-		
 		$("#fgsdmSing").on("change",initXl);
 		function initXl(){
 			var data=[];
@@ -173,8 +162,12 @@
 			fage=true;
 		}
-       
+		
 		$("#query").on("click",function(){
+			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 		    var line = $("#line").val();
 		    var startDate = $("#startDate").val();
 		    var lpName = $("#lpName").val(); 
@@ -202,9 +202,9 @@
 	   	  gsdmTurn=$("#gsdmTurn").val();
 	   	  fgsdmTurn=$("#fgsdmTurn").val();
 			 if(startDate1!=''&&endDate1!=''){
-// 				 $post('/mcy_forms/turnoutrate',
-// 						 { gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
-							 var result=[];
+				$post('/mcy_forms/turnoutrate',
+					{ gsdmTurn:gsdmTurn,fgsdmTurn:fgsdmTurn, line:line,startDate:$("#startDate").val(),endDate:$("#endDate").val(),type:'query'},function(result){
+// 						var result=[];
 					 // 把数据填充到模版中
 						var tbodyHtml = template('turnoutrate',{list:result});
 						// 把渲染好的模版html文本追加到表格中
@@ -256,10 +256,10 @@
 			                obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
 			            });  
-// 					})	
+					});
 			 }else{
-				 alert("请选择时间范围!");
+				 layer.msg("请选择时间范围!");
 			 } 
 	});
@@ -130,16 +130,6 @@
 			initXl();
 		}
-		/* $.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#line',data,'');
-			
-		}) */
-		
 		$("#fgsdmVehic").on("change",initXl);
 		function initXl(){
 			var data=[];
@@ -170,6 +160,10 @@
 	    var gsdmVehic ;
 		var fgsdmVehic ;
 		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			line = $("#line").val();
 			date = $("#date").val();
 // 		    gsdmVehic = $("#gsdmVehic").val();
@@ -167,7 +167,11 @@
 		var date = '';
 		var line = $("#line").val();
-		$("#query").on("click",function(){
+		$("#query").on("click",function(){
+			if($("#date").val() == null || $("#date").val().trim().length == 0){
+				layer.msg("请选择时间！");
+				return;
+			}
 			line = $("#line").val();
 			date = $("#date").val();
 			var code = $("#code").val();
@@ -171,8 +171,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-26',
-        text: '<h5>临加班次新增一项场到场</h5><h5>搜索框可按路牌搜索，lp 打头，st 和 et打头可搜索时间范围</h5>'
+        date: '2017-04-28 下午',
+        text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
     };
     var storage = window.localStorage