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

潘钊
2 parents b5445190 1fa133bd
Showing 12 changed files with 117 additions and 125 deletions
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/section/js/section-list-table.js
src/main/resources/static/pages/base/station/js/station-list-table.js
src/main/resources/static/pages/punctual/onTime.html
src/main/resources/static/pages/trafficManage/js/lineStationUpload.js
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
src/main/resources/static/pages/trafficManage/js/shLineCodeList.js
src/main/resources/static/pages/trafficManage/js/timeTempletUpload.js
src/main/resources/static/pages/trafficManage/js/timeTempletUploadRecord.js
@@ -48,7 +48,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.company like ?1 and l.brancheCompany like ?2 and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
-	@Query("SELECT L FROM Line L where L.destroy=0")
+	@Query("SELECT L FROM Line L where L.destroy=0 and L.remove !=1")
 	List<Line> findAllService();
@@ -2826,14 +2826,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id, cl_zbh, fcsj, fcsj_actual, j_gh, j_name, lp_name, qdz_name, " +
 				"schedule_date_str, xl_name, zdsj, zdsj_actual, fgs_name, gs_name, xl_dir, xl_bm " +
-				"from bsth_c_s_sp_info_real where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'";
+				"from bsth_c_s_sp_info_real " +
+				"where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"' " +
+				"and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
-		if(line.length() != 0)
-			sql += " and xl_bm = '"+line+"'";
 		if(company.length() != 0)
 			sql += " and gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"'";
-			
-		sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and cc_service = 0";
+		if(line.length() != 0)
+			sql += " and xl_bm = '"+line+"'";
 		System.out.println(sql);
 		List<ScheduleRealInfo> list = jdbcTemplate.query(sql,
@@ -96,7 +96,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
 			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
-			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates);
+			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates,date);
 			for(int i=0;i<lists.size();i++){
 				ArrivalInfo t1=lists.get(i);
@@ -123,7 +123,7 @@ public class ReportServiceImpl implements ReportService{
 	}
-	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates){
+	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates,String date){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates);
@@ -133,8 +133,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
@@ -194,7 +194,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date2=simpleDateFormat.parse(ddsj+":00").getTime();
 			Date dates1=simpleDateFormat.parse(fcsj+":00");
 			Date dates2=simpleDateFormat.parse(ddsj+":00");
-			List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx);
+			List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx,fcsj);
 			for(int i=0;i<lists.size();i++){
 				ArrivalInfo t1=lists.get(i);
@@ -224,7 +224,7 @@ public class ReportServiceImpl implements ReportService{
 	}
-	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx){
+	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx,String fcsj){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates1);
@@ -235,8 +235,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year>=? "
+		String year=fcsj.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year>=? "
 				+ " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
@@ -2025,7 +2025,7 @@ public class ReportServiceImpl implements ReportService{
 	public List<Map<String, Object>> lineList() {
 		// TODO Auto-generated method stub
 		List<Map<String, Object>>  list=new ArrayList<Map<String,Object>>();
-		Iterator<Line> iterator = lineRepository.findAll().iterator();
+		Iterator<Line> iterator = lineRepository.findAllService().iterator();
 		Line line;
 		while (iterator.hasNext()) {
 			line = iterator.next();
@@ -2179,8 +2179,8 @@ public class ReportServiceImpl implements ReportService{
 			Connection conn = null;
 			PreparedStatement ps = null;
 			ResultSet rs = null;
-
-			String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+			String year=date.substring(0,4);
+			String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year=? "
 					+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
 			try{
 				conn = DBUtils_MS.getConnection();
@@ -2229,8 +2229,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year=? "
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year=? "
 				+ " AND ts >= ? AND ts <=? AND up_down=? order by device_id,ts";
 		try{
 			conn = DBUtils_MS.getConnection();
@@ -3529,7 +3529,7 @@ public class ReportServiceImpl implements ReportService{
 			Long date1 = simpleDateFormat.parse(date+" 00:00:01").getTime();
 			Long date2=simpleDateFormat.parse(date+" 23:59:59").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
-			List<ArrivalInfo> lists=load_online(line,date1,date2,dates);
+			List<ArrivalInfo> lists=load_online(line,date1,date2,dates,date);
 			for (int i = 0; i < list.size(); i++) {
 				String nbbm=list.get(i);
 				String sbbb=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
@@ -3582,7 +3582,7 @@ public class ReportServiceImpl implements ReportService{
 		return map;
 	}
-	public List<ArrivalInfo> load_online(String line,Long date1,Long date2,Date dates){
+	public List<ArrivalInfo> load_online(String line,Long date1,Long date2,Date dates,String date){
 		List<ArrivalInfo> list = null;
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates);
@@ -3592,8 +3592,8 @@ public class ReportServiceImpl implements ReportService{
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
-
-		String sql = "select * from bsth_c_arrival_info where  line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+		String year=date.substring(0,4);
+		String sql = "select * from bsth_c_arrival_info_"+year+" where  line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
@@ -101,7 +101,7 @@
 				var len_ = array.length,paramsD = new Array();
 				if(len_>0) {
 					$.each(array, function(i, g){
-						if(g.name!='' || g.name != null) {
+						if(g.remove != 1 && (g.name!='' || g.name != null)) {
 							paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
 						}
 					});
@@ -147,7 +147,7 @@
 				var len_ = array.length,paramsD = new Array();
 				if(len_>0) {
 					$.each(array, function(i, g){
-						if(g.name!='' || g.name != null) {
+                        if(g.remove != 1 && (g.name!='' || g.name != null)) {
 							paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
 						}
 					});
@@ -173,7 +173,7 @@
 				var len_ = array.length,paramsD = new Array();
 				if(len_>0) {
 					$.each(array, function(i, g){
-						if(g.name!='' || g.name != null) {
+                        if(g.remove != 1 && (g.name!='' || g.name != null)) {
 							paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
 						}
 					});
@@ -152,7 +152,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 3*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -13,45 +13,49 @@
  */
 (function(){
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
-    $('#line').select2({
-        ajax: {
-            url: '/realSchedule/findLine',
-            type: 'post',
-            dataType: 'json',
-            delay: 150,
-            data: function(params){
-                return{line: params.term};
-            },
-            processResults: function (data) {
-                return {
-                    results: data
-                };
-            },
-            cache: true
-        },
-        templateResult: function(repo){
-            if (repo.loading) return repo.text;
-            var h = '<span>'+repo.text+'</span>';
-            return h;
-        },
-        escapeMarkup: function (markup) { return markup; },
-        minimumInputLength: 1,
-        templateSelection: function(repo){
-            return repo.text;
-        },
-        language: {
-            noResults: function(){
-                return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-            },
-            inputTooShort : function(e) {
-                return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-            },
-            searching : function() {
-                return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
+    function initLineSelect2(compD) {
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
             }
-        }
-    });
+            params["remove_ne"] = 1;
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.id ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
 	// 绑定查询事件
 	$("#search").click(searchM);
@@ -49,6 +49,7 @@
                 }
                 params.cgsbm_in  = compA.toString();
             }
+            params["remove_ne"] = 1;
             // 填充线路拉框选择值
             $get('/line/all', params, function(array){
                 var len_ = array.length,paramsD = new Array();
@@ -34,8 +34,9 @@
 	}
 	var lines = new Array();
 	var gsmap = getBusMap();
+    var pars = {"remove_ne":1};
 	// 取得所有线路
-	$get('/line/all', null, function(allLine) {
+	$get('/line/all', pars, function(allLine) {
 		// 遍历数组
 		$.each(allLine, function(i, e) {
 			var companyCode = e.company;
@@ -13,66 +13,51 @@
  */
 (function(){
-	/**
-	 *  取得编码-公司map
-	 *  gsmap["5"] = 南汇公司
-	 *  gsmap["5_3"] = 芦潮港分公司
-	 */
-	function getBusMap(){
-		// 取得公司信息，替换公司编码
-		var gsmap = {};
-		$get('/business/all', null, function(array){
-			$.each(array, function(i, gs){
-				var k = gs.upCode + '_' + gs.businessCode;
-				if(gs.upCode === '88'){
-					k = gs.businessCode;
-				}
-				gsmap[k] = gs.businessName;
-			});
-		});
-		return gsmap;
-	}
-	var lines = new Array();
-	var gsmap = getBusMap();
-
-	$('#line').select2({
-		ajax: {
-			url: '/realSchedule/findLine',
-			type: 'post',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{line: params.term};
-			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-		   }
-		}
-	});
+	
+    function getComp(cb) {
+        $.get('/user/companyData',null,function(rs) {
+            return cb && cb(rs);
+        });
+    }
+
+    initLineSelect2();
+
+    function initLineSelect2(compD) {
+        getComp(function(rs) {
+            var params = {};
+            if(rs.length>0) {
+                var compA = new Array();
+                for(var c = 0 ; c<rs.length;c++) {
+                    var comC = rs[c].companyCode;
+                    var child = rs[c].children;
+                    if(child.length>0) {
+                        for(var d = 0 ;d< child.length;d++) {
+                            compA.push(comC + '_' + child[d].code);
+                        }
+                    }else {
+                        compA.push(comC);
+                    }
+                }
+                params.cgsbm_in  = compA.toString();
+            }
+            params["remove_ne"] = 1;
+            // 填充线路拉框选择值
+            $get('/line/all', params, function(array){
+                var len_ = array.length,paramsD = new Array();
+                if(len_>0) {
+                    $.each(array, function(i, g){
+                        if(g.name!='' || g.name != null) {
+                            paramsD.push({'id':g.id ,'text':g.name});
+                        }
+                    });
+                    initPinYinSelect2($('#line'),paramsD,function(selector) {
+                        selector.select2("val", storage.xlName_AgursData);
+                    });
+                }
+            });
+        });
+    }
+
 	// 绑定查询事件
 	$("#search").click(searchM);
@@ -88,6 +88,7 @@
         }
         var lines = new Array();
         var gsmap = getBusMap();
+        params["remove_ne"] = 1;
         // 取得所有线路
         $get('/line/all', params, function(allLine) {
             // 遍历数组