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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents ba0cb3df 5309c5c5
Showing 16 changed files with 151 additions and 106 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/line/list.html
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/real_control_v2/js/forms/wrap.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
@@ -553,7 +553,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		long t = System.currentTimeMillis();
 		if(c != 1)
-		 	t -= (ONE_DAY + (1000 * 60 * 60 * 2));
+			t -= (ONE_DAY + (1000 * 60 * 60 * 6));
 		for(int i = 0; i < 3; i ++){
 			rs.add(fmtyyyyMMdd.print(t));
 			t -= ONE_DAY;
@@ -46,6 +46,13 @@ public class GatewayHttpUtils {
             response = httpClient.execute(post);
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                post.abort();
+                logger.error("http client status code: " + statusCode);
+                return code;
+            }
+
             JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
             if (null != json && json.getInteger("errCode") == 0)
                 code = 0;
@@ -116,9 +116,9 @@ public class OutStationProcess {
             LateAdjustHandle.remove(sch);
             //发车的时候，同步一下状态
-            if (!gps.isService() && !dayOfSchedule.emptyService(sch))
+            /*if (!gps.isService() && !dayOfSchedule.emptyService(sch))
                 gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
-
+*/
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
@@ -5,7 +5,6 @@ import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -20,7 +19,7 @@ import java.util.Set;
  * Created by panzhao on 2017/4/6.
  */
 @Component
-public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware {
+public class SafeDrivCenter implements ApplicationContextAware {
     private static Set<SafeDriv> data;
@@ -65,12 +64,6 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     }
     @Override
-    public void run(String... strings) throws Exception {
-        //定时加载安全驾驶数据
-        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 80, 7, TimeUnit.SECONDS);
-    }
-
-    @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         sendUtils = applicationContext.getBean(SendUtils.class);
     }
@@ -2,6 +2,7 @@ package com.bsth.data.safe_driv;
 import com.alibaba.fastjson.JSON;
 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;
@@ -21,24 +22,43 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
-
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    static String url;
+    static CloseableHttpClient httpClient = null;
+    static HttpGet get;
+    static RequestConfig requestConfig;
+    static CloseableHttpResponse response;
+    static HttpEntity entity;
+    static BufferedReader br;
+
+    static {
+        url = "http://180.166.5.82:9007/bsth-safedriving/Crlcxb/realtimeInterface.do";
+        httpClient = HttpClients.createDefault();
+        get = new HttpGet(url);
+        requestConfig = RequestConfig.custom()
+                .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
+                .setSocketTimeout(2500).build();
+        get.setConfig(requestConfig);
+    }
+
     @Override
     public void run() {
-        List<SafeDriv> list = null;
-        CloseableHttpClient httpClient = null;
-        CloseableHttpResponse response = null;
+        List<SafeDriv> list;
         try {
-            httpClient = HttpClients.createDefault();
-            HttpGet get = new HttpGet(url);
             response = httpClient.execute(get);
-            HttpEntity entity = response.getEntity();
+            int statusCode = response.getStatusLine().getStatusCode();
+            if(statusCode != 200){
+                get.abort();
+                logger.error("http client status code: " + statusCode);
+                return;
+            }
+
+            entity = response.getEntity();
             if (null != entity) {
-                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                br = new BufferedReader(new InputStreamReader(entity.getContent()));
                 StringBuffer stringBuffer = new StringBuffer();
                 String str = "";
                 while ((str = br.readLine()) != null)
@@ -46,47 +66,14 @@ public class SafeDrivDataLoadThread extends Thread{
                 list = JSON.parseArray(stringBuffer.toString(), SafeDriv.class);
-                /**
-                 * 模拟数据
-
-                SafeDriv sd1 = new SafeDriv();
-                sd1.setYczltype("1");
-                sd1.setClzbh("W2B-001");
-                sd1.setStartime("2017-04-07 08:00:00.0");
-
-                SafeDriv sd2 = new SafeDriv();
-                sd2.setYczltype("2");
-                sd2.setClzbh("W2B-002");
-                sd2.setStartime("2017-04-07 08:02:00.0");
-
-                SafeDriv sd3 = new SafeDriv();
-                sd3.setYczltype("3");
-                sd3.setClzbh("W2B-003");
-                sd3.setStartime("2017-04-07 08:03:00.0");
-
-                SafeDriv sd4 = new SafeDriv();
-                sd4.setYczltype("4");
-                sd4.setClzbh("W2B-004");
-                sd4.setStartime("2017-04-07 08:04:00.0");
-
-                SafeDriv sd5 = new SafeDriv();
-                sd5.setYczltype("5");
-                sd5.setClzbh("W2B-005");
-                sd5.setStartime("2017-04-07 08:05:00.0");
-                list.add(sd1);
-                list.add(sd2);
-                list.add(sd3);
-                list.add(sd4);
-                list.add(sd5);
-                 */
                 for(SafeDriv sd : list){
                     SafeDrivCenter.put(sd);
                 }
             }
-            httpClient.close();
-            response.close();
+            if (null != response)
+                response.close();
         } catch (Exception e) {
             logger.error("安全驾驶接口报错了" , e.getMessage());
         }
@@ -188,25 +188,9 @@ public class GpsServiceImpl implements GpsService {
         String nbbm = nbbmArray[0];
         List<DeviceChange> dcs = findDeviceChangeLogs(nbbm, et, st);
-        //没有设备变更记录，则参考车辆信息上的设备号
-        if(null == dcs || dcs.size() == 0){
-            DeviceChange dc = new DeviceChange();
-            dc.setNbbm(nbbm);
-            dc.setDevice(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
-            dc.setSt(st);
-            dc.setEt(et);
-            dc.setType(1);
-
-            dcs.add(dc);
-        }
-
-        //bsth_c_gps_info
-        String tableName = "bsth_c_gps_info";
-        String sYear = fmtyyyy.print(st),
-            currYear = fmtyyyy.print(System.currentTimeMillis());
-        if(!sYear.equals(currYear))
-            tableName += "_" + sYear;
+        //按年分表
+        String tableName = "bsth_c_gps_info_" + fmtyyyy.print(st);
         StringBuilder sql = new StringBuilder("");
         long t1,t2;
@@ -221,7 +205,7 @@ public class GpsServiceImpl implements GpsService {
                 t2 = dc.getEt();
             sql.append("select DEVICE_ID,LON,LAT,TS,INOUT_STOP,SERVICE_STATE ,STOP_NO,DIRECTION,LINE_ID,SPEED_GPS,SECTION_CODE from "+tableName+" where days_year in ("+sDayOfYear+","+eDayOfYear+") " +
-                    " and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < "+t2+" ");
+                    " and device_id='"+dc.getDevice()+"' and ts >= "+t1+" and ts <= "+t2+" ");
             if(i == len - 1)
                 sql.append(" ORDER BY device_id,ts,stop_no");
@@ -365,6 +349,18 @@ public class GpsServiceImpl implements GpsService {
                 rs.add(dc);
             }
+
+            //没有设备变更记录，则参考车辆信息上的设备号
+            if(null == rs || rs.size() == 0){
+                DeviceChange dc = new DeviceChange();
+                dc.setNbbm(nbbm);
+                dc.setDevice(BasicData.deviceId2NbbmMap.inverse().get(nbbm));
+                dc.setSt(st);
+                dc.setEt(et);
+                dc.setType(1);
+
+                rs.add(dc);
+            }
         }catch (Exception e){
             logger.error("", e);
         }
@@ -386,6 +382,9 @@ public class GpsServiceImpl implements GpsService {
         eCal.setTime(new Date(et * 1000));
         int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR);
+        //按年分表
+        String tableName = "bsth_c_arrival_info_" + fmtyyyy.print(st);
+
         StringBuilder sql = new StringBuilder("");
         long t1,t2;
         DeviceChange dc;
@@ -398,8 +397,8 @@ public class GpsServiceImpl implements GpsService {
             if(dc.getEt() < et)
                 t2 = dc.getEt();
-            sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM bsth_c_arrival_info " +
-                    " where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2);
+            sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM " + tableName +
+                    "  where weeks_year in ("+sWeekOfYear+", "+eWeekOfYear+") and device_id='"+dc.getDevice()+"' and ts > "+t1+" and ts < " + t2);
             if(i == len - 1)
                 sql.append(" ORDER BY device_id,ts,stop_no ");
@@ -407,6 +406,7 @@ public class GpsServiceImpl implements GpsService {
                 sql.append(" UNION ");
         }
+        logger.info("arrivl sql : " + sql.toString());
         JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<ArrivalEntity> list = jdbcTemplate_ms.query(sql.toString(), BeanPropertyRowMapper.newInstance(ArrivalEntity.class));
@@ -887,27 +887,84 @@ public class GpsServiceImpl implements GpsService {
     @Override
     public List<GpsSpeed_DTO> speeds(String nbbm, long st, long et) {
-        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle, line, up_down, lon, lat, speed,timestamp from bsth_c_speeding where vehicle=? and timestamp>? and timestamp<?";
+        st = st * 1000;
+        et = et * 1000;
+        //按周分区
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(st));
+        int sWeekYear = sCal.get(Calendar.WEEK_OF_YEAR);
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(et));
+        int eWeekYear = eCal.get(Calendar.WEEK_OF_YEAR);
+
+        //按年分表
+        String tableName = "bsth_c_speeding_" + fmtyyyy.print(st);
-        return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st * 1000, et * 1000));
+        List<DeviceChange> dcs = findDeviceChangeLogs(nbbm, et, st);
+        StringBuilder sql = new StringBuilder("");
+        long t1,t2;
+        DeviceChange dc;
+        for(int i = 0,len=dcs.size(); i < len; i++){
+            t1 = st;
+            t2 = et;
+            dc = dcs.get(i);
+            if(dc.getSt() > st)
+                t1 = dc.getSt();
+            if(dc.getEt() < et && dc.getEt()!=0)
+                t2 = dc.getEt();
+
+            sql.append(" select vehicle, line, up_down, lon, lat, speed,timestamp from "+tableName+" where " +
+                    " weeks_year in ("+sWeekYear+", "+eWeekYear+") and vehicle='"+dc.getDevice()+"' and timestamp>="+t1+" and timestamp<= " + t2);
+
+            if(i == len - 1)
+                sql.append(" ORDER BY vehicle,timestamp");
+            else
+                sql.append(" UNION ");
+        }
+
+        logger.info("speed sql : " + sql.toString());
+        return GpsSpeed_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql.toString()));
     }
     @Override
     public List<GpsOutbound_DTO> outbounds(String nbbm, long st, long et) {
-        /**
-         * 如果 st 和 et 跨了周分区，也只查询st 分区的数据。
-         */
         st = st * 1000;
         et = et * 1000;
         //按周分区
-        Calendar weekCal = Calendar.getInstance();
-        weekCal.setTimeInMillis(st);
-        int weekYear = weekCal.get(Calendar.WEEK_OF_YEAR);
-        //设备号
-        String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-        String sql = "select vehicle,line,up_down,lon,lat,timestamp from bsth_c_outbound where weeks_year=" + weekYear + " and vehicle=? and timestamp>? and timestamp<?";
-        return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql, deviceId, st, et));
+        Calendar sCal = Calendar.getInstance();
+        sCal.setTime(new Date(st));
+        int sWeekYear = sCal.get(Calendar.WEEK_OF_YEAR);
+        Calendar eCal = Calendar.getInstance();
+        eCal.setTime(new Date(et));
+        int eWeekYear = eCal.get(Calendar.WEEK_OF_YEAR);
+
+        //按年分表
+        String tableName = "bsth_c_outbound_" + fmtyyyy.print(st);
+
+        List<DeviceChange> dcs = findDeviceChangeLogs(nbbm, et, st);
+        StringBuilder sql = new StringBuilder("");
+        long t1,t2;
+        DeviceChange dc;
+        for(int i = 0,len=dcs.size(); i < len; i++){
+            t1 = st;
+            t2 = et;
+            dc = dcs.get(i);
+            if(dc.getSt() > st)
+                t1 = dc.getSt();
+            if(dc.getEt() < et && dc.getEt()!=0)
+                t2 = dc.getEt();
+
+            sql.append("select vehicle,line,up_down,lon,lat,timestamp from "+tableName+" where " +
+                    " weeks_year in ("+sWeekYear+", "+eWeekYear+") and vehicle='"+dc.getDevice()+"' and timestamp>="+t1+" and timestamp<=" + t2);
+
+            if(i == len - 1)
+                sql.append(" ORDER BY vehicle,timestamp");
+            else
+                sql.append(" UNION ");
+        }
+
+        logger.info("outbounds sql : " + sql.toString());
+        return GpsOutbound_DTO.create(new JdbcTemplate(DBUtils_MS.getDataSource()).queryForList(sql.toString()));
     }
     @Override
@@ -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,
@@ -168,8 +168,7 @@ public class SendUtils{
 		ObjectMapper mapper = new ObjectMapper();
 		try {
-			socketHandler.sendMessage(mapper.writeValueAsString(map));
-
+			socketHandler.sendMessageToLine(sd.getXlbm(), mapper.writeValueAsString(map));
 		} catch (JsonProcessingException e) {
 			logger.error("", e);
 		}
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://10.10.200.226:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp@JSP
+ms.mysql.password= root2jsp
@@ -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)});
 						}
 					});
@@ -305,7 +305,7 @@
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
 				{{if obj.destroy==1}}
-				<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
+				<!--<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>-->
 				{{/if}}
 			</td>
 		</tr>
@@ -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();
@@ -192,6 +192,8 @@
             });
             cb && cb($(selector));
+
+            $('#line', '.form-page-content').trigger('change');
         });
         return $(selector);
@@ -20,10 +20,10 @@ var gb_safe_driv = (function () {
     var max = 5;
     var pop = function (sd) {
-        //只有admin用户能收到
+        /*//只有admin用户能收到
         var user = gb_northToolbar.user();
         if (!user || user.userName.indexOf('admin') == -1)
-            return;
+            return;*/
         //时间格式化
         var stm = moment(sd.ts);
@@ -60,7 +60,7 @@ var gb_safe_driv = (function () {
                             '</div>';
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title') + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
+        var title = $(this).data('title');// + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([