update...

潘钊
1 parent 3ef63285
Showing 4 changed files with 31 additions and 7 deletions
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/gps/entity/DeviceChange.java
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/left.html
@@ -148,8 +148,6 @@ public class GpsRealData {
                     gps.setRemark("执行 " + sch.getXlName() + " " + sch.getDfsj() + " 班次");
                     gps.setPlanCode(sch.getXlBm());
                 }
-                else
-                    gps.setRemark(null);
             }else
                 gps.setRemark(null);
@@ -323,13 +323,13 @@ public class GpsServiceImpl implements GpsService {
         return map.containsKey(key)?Float.parseFloat(map.get(key).toString()):-1;
     }
-    private List<DeviceChange> findDeviceChangeLogs(String nbbm, long t, long st){
+    private List<DeviceChange> findDeviceChangeLogs(String nbbm, long et, long st){
         List<DeviceChange> dcs = null;
         List<DeviceChange> rs = new ArrayList<>();
         try{
             //JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
-            dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where cl_zbh='"+nbbm+"' and UNIX_TIMESTAMP(qyrq)<" + (t / 1000)
+            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 cl_zbh='"+nbbm+"'"
                     , BeanPropertyRowMapper.newInstance(DeviceChange.class));
@@ -340,13 +340,30 @@ public class GpsServiceImpl implements GpsService {
                 }
             });
+            //生成一条初始记录
+            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)
-                    rs.add(dc);
+                if(dc.getEt() < st && dc.getEt() != 0)
+                    continue;
+                if(dc.getSt() > et)
+                    continue;
+
+                rs.add(dc);
             }
         }catch (Exception e){
             logger.error("", e);
@@ -7,6 +7,7 @@ package com.bsth.service.gps.entity;
 public class DeviceChange {
     private String nbbm;
+    private String oldDevice;
     private String device;
     private long st;
     private long et;
@@ -53,4 +54,12 @@ public class DeviceChange {
     public void setType(int type) {
         this.type = type;
     }
+
+    public String getOldDevice() {
+        return oldDevice;
+    }
+
+    public void setOldDevice(String oldDevice) {
+        this.oldDevice = oldDevice;
+    }
 }
@@ -231,7 +231,7 @@
                         var deviceStr='', fs='YYYY-MM-DD HH:mm';
                         for(var i=0,dc;dc=rs.dcs[i++];){
                             deviceStr+=dc.device + ',';
-                            dc.stStr = moment(dc.st).format(fs);
+                            dc.stStr = dc.st>0?moment(dc.st).format(fs):'';
                             dc.etStr = dc.et>0?moment(dc.et).format(fs):'';
                         }
                         deviceStr=deviceStr.substr(0, deviceStr.length-1);