update...

潘钊
1 parent 71fdaf28
Showing 5 changed files with 239 additions and 25 deletions
src/main/java/com/bsth/server_rs/gps/GpsRestService.java
src/main/java/com/bsth/server_rs/gps/dao/HistoryGpsDao.java
src/main/java/com/bsth/server_rs/gps/entity/DeviceChange.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/resources/ms-jdbc.properties
@@ -3,7 +3,6 @@ package com.bsth.server_rs.gps;
 import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
 import com.bsth.server_rs.gps.dao.HistoryGpsDao;
 import com.bsth.server_rs.gps.entity.GpsEntity;
-import com.bsth.server_rs.gps.entity.HistoryGpsEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
@@ -13,6 +12,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.util.Collection;
+import java.util.Map;
  
 /**
  * Created by panzhao on 2017/3/28.
@@ -39,7 +39,7 @@ public class GpsRestService {
  
     @GET
     @Path("/history/{nbbm}/{st}/{et}")
-    public Collection<HistoryGpsEntity> history(@PathParam("nbbm") String nbbm
+    public Collection<Map<String, Object>> history(@PathParam("nbbm") String nbbm
             , @PathParam("st") String st
             , @PathParam("et") String et) {
         return historyGpsDao.query(nbbm, Long.parseLong(st), Long.parseLong(et));
@@ -3,10 +3,15 @@ package com.bsth.server_rs.gps.dao;
 import com.bsth.redis.util.DateUtils;
 import com.bsth.server_rs.base_info.car.Car;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.gps.entity.DeviceChange;
 import com.bsth.server_rs.gps.entity.HistoryGpsEntity;
 import com.bsth.util.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -19,42 +24,171 @@ import java.util.*;
 @Component
 public class HistoryGpsDao {
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
  
     /**
      * 最大查询间隔
      */
     private static final long GPS_RANGE = 1000 * 60 * 60 * 24;
  
-    public Collection<HistoryGpsEntity> query(String nbbm, Long st, Long et) {
-        //分区字段 day_years
+    private static DateTimeFormatter fmtyyyy = DateTimeFormat.forPattern("yyyy");
+
+    public Collection<Map<String, Object>> query(String nbbm, Long st, Long et) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (et - st > GPS_RANGE)
+            return list;
+
+        // day_of_year 分区字段
         Calendar sCal = Calendar.getInstance();
         sCal.setTime(new Date(st));
+        int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
         Calendar eCal = Calendar.getInstance();
         eCal.setTime(new Date(et));
+        int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR);
  
-        if (null == st)
-            return null;
-        if (null == et)
-            return null;
-        if (et < st)
-            return null;
+        List<DeviceChange> dcs = findDeviceChangeLogs(nbbm, et, st);
  
-        if (et - st > GPS_RANGE)
-            return null;
+        //按年分表
+        String tableName = "bsth_c_gps_info_" + fmtyyyy.print(st);
  
-        Car c = CarBufferData.findOne(nbbm);
-        if (null == c)
-            return null;
+        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();
  
-        List<HistoryGpsEntity> list = query(c.getEquipmentCode(), sCal, eCal);
-        for (HistoryGpsEntity gps : list) {
-            gps.setNbbm(nbbm);
-            gps.setUpDown(getUpOrDown(gps.getServiceState()));
-            gps.setState(getService(gps.getServiceState()));
+            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+" ");
+
+            if(i == len - 1)
+                sql.append(" ORDER BY device_id,ts,stop_no");
+            else
+                sql.append(" UNION ");
         }
+
+        logger.info("轨迹回放 nbbm: " + nbbm + " -st: " + st + " -et: " + et + " -sql: " + sql.toString());
+
+        //查询GPS数据
+        JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
+        List<Map<String, Object>> dataList = jdbcTemplate_ms.queryForList(sql.toString());
+
+        Float lon, lat;
+        int inOutStop;
+        long serviceState;
+
+        Map<String, Object> map;
+        for(Map<String, Object> rs : dataList){
+            serviceState = map_get_long(rs, "SERVICE_STATE");
+            if(getGpsValid(serviceState) == 1)
+                continue;
+
+            map = new HashMap<>();
+
+            lon = map_get_float(rs, "LON");
+            lat = map_get_float(rs, "LAT");
+            //原始坐标
+            map.put("lon", lon);
+            map.put("lat", lat);
+
+            map.put("deviceId", map_get_str(rs, "DEVICE_ID"));
+            map.put("ts", map_get_long(rs, "TS"));
+            map.put("timestamp", map_get_long(rs, "TS"));
+            map.put("stopNo", map_get_str(rs, "STOP_NO"));
+            map.put("direction", map_get_float(rs,"DIRECTION"));
+
+            map.put("lineId", map_get_str(rs, "LINE_ID"));
+            map.put("speed", map_get_float(rs,"SPEED_GPS"));
+
+            inOutStop = Integer.parseInt(rs.get("INOUT_STOP").toString());
+            map.put("inout_stop", inOutStop);
+
+
+            map.put("nbbm", nbbm);
+            map.put("state", getService(serviceState));
+            // 上下行
+            map.put("upDown", getUpOrDown(serviceState));
+            //路段编码
+            map.put("section_code", map_get_str(rs,"SECTION_CODE"));
+            list.add(map);
+        }
+        // 按时间排序
+        Collections.sort(list, new Comparator<Map<String, Object>>() {
+
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                return (int) (Long.parseLong(o1.get("ts").toString()) - Long.parseLong(o2.get("ts").toString()));
+            }
+        });
+
         return list;
     }
  
+
+    private List<DeviceChange> findDeviceChangeLogs(String nbbm, long et, long st){
+        List<DeviceChange> dcs = null;
+        List<DeviceChange> rs = new ArrayList<>();
+        try{
+
+            dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,old_device_no as old_device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where is_cancel=0 and cl_zbh='"+nbbm+"' order by qyrq"
+                    , BeanPropertyRowMapper.newInstance(DeviceChange.class));
+
+
+            //生成一条初始记录
+            if(dcs.size() > 0){
+                DeviceChange first = dcs.get(0);
+
+                DeviceChange initDv = new DeviceChange();
+                initDv.setDevice(first.getOldDevice());
+                if(StringUtils.isNotEmpty(initDv.getDevice())){
+                    initDv.setNbbm(first.getNbbm());
+                    initDv.setSt(0);
+                    initDv.setEt(first.getSt());
+                    dcs.add(0, initDv);
+                }
+            }
+            for(int i = 0,len=dcs.size(); i < len - 1; i++){
+                dcs.get(i).setEt(dcs.get(i + 1).getSt());
+            }
+
+            for(DeviceChange dc : dcs){
+                if(dc.getEt() < st && dc.getEt() != 0)
+                    continue;
+                if(dc.getSt() > et)
+                    continue;
+
+                rs.add(dc);
+            }
+
+            //没有设备变更记录，则参考车辆信息上的设备号
+            if(null == rs || rs.size() == 0){
+                Car car = CarBufferData.findOne(nbbm);
+
+                if(null != car){
+                    DeviceChange dc = new DeviceChange();
+                    dc.setNbbm(nbbm);
+                    dc.setDevice(car.getEquipmentCode());
+                    dc.setSt(st);
+                    dc.setEt(et);
+                    dc.setType(1);
+
+                    rs.add(dc);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return rs;
+    }
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
     private List<HistoryGpsEntity> query(String deviceId, Calendar sCal, Calendar eCal) {
         int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
@@ -120,4 +254,20 @@ public class HistoryGpsDao {
             return -1;
         return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
     }
+
+    private String map_get_str(Map<String, Object> map, String key){
+        return map.containsKey(key)?map.get(key).toString():"";
+    }
+
+    private Long map_get_long(Map<String, Object> map, String key){
+        return map.containsKey(key)?Long.parseLong(map.get(key).toString()):-1;
+    }
+
+    private Float map_get_float(Map<String, Object> map, String key){
+        return map.containsKey(key)?Float.parseFloat(map.get(key).toString()):-1;
+    }
+
+    public static byte getGpsValid(long serviceState) {
+        return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
+    }
 }
+package com.bsth.server_rs.gps.entity;
+
+/**
+ * 车辆设备变更记录
+ * Created by panzhao on 2018/1/16.
+ */
+public class DeviceChange {
+
+    private String nbbm;
+    private String oldDevice;
+    private String device;
+    private long st;
+    private long et;
+
+    //为1 表示没有设备变更记录，直接从车辆信息上关联的设备号
+    private int type=0;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getOldDevice() {
+        return oldDevice;
+    }
+
+    public void setOldDevice(String oldDevice) {
+        this.oldDevice = oldDevice;
+    }
+}
@@ -14,7 +14,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
  
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -145,8 +144,8 @@ public class ScheduleRealService {
      * @return
      */
     @GET
-    @Path("/pz_vip/readByLine/{rq}")
-    public List<ScheduleRealInfo> readByLine(@PathParam("rq") String rq,@RequestParam String lineCode){
+    @Path("/pz_vip/readByRqAndLine/{rq}/{lineCode}")
+    public List<ScheduleRealInfo> readByLine(@PathParam("rq") String rq,@PathParam("lineCode") String lineCode){
         List<ScheduleRealInfo> all = redisService.read(rq, lineCode), rs = new ArrayList<>();
  
         for(ScheduleRealInfo sch : all){
@@ -4,6 +4,6 @@
 #ms.mysql.password= panzhao
  
 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
 \ No newline at end of file
+ms.mysql.password= root2jsp
 \ No newline at end of file