diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java index 75ed1eaf..6c4ea066 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java @@ -259,14 +259,15 @@ public class Forwarder { } void insertData(String deviceId, Integer tenantId){ - //查询最后一条记录 + //查询26小时前的最后一条记录 + LocalDateTime selectTime = LocalDateTime.now().minusHours(26); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("deviceid",deviceId); queryWrapper.isNotNull("b562e"); queryWrapper.isNotNull("rpose"); - queryWrapper.isNotNull("pps"); - queryWrapper.ge("pps",0); - queryWrapper.orderByDesc("createtime"); + queryWrapper.eq("enabled",true); + queryWrapper.ge("createtime",selectTime.format(formatter)); + queryWrapper.orderByAsc("createtime"); queryWrapper.last("limit 1"); GnssCalcData gnssCalcData = gnssDataMapper.selectOne(queryWrapper); if(gnssCalcData != null){ @@ -282,9 +283,9 @@ public class Forwarder { locationRecord.setB562n(gnssCalcData.getB562n()+Math.random()*5-2.5); locationRecord.setB562d(gnssCalcData.getB562d()+Math.random()*10-5); - locationRecord.setRpose(gnssCalcData.getRpose()+Math.random()*2-1); - locationRecord.setRposn(gnssCalcData.getRposn()+Math.random()*2-1); - locationRecord.setRposd(gnssCalcData.getRposd()+Math.random()*2-1); + locationRecord.setRpose(gnssCalcData.getRpose()+Math.random()*0.2-0.1); //-0.15~0.15 + locationRecord.setRposn(gnssCalcData.getRposn()+Math.random()*0.2-0.1);//-0.15~0.15 + locationRecord.setRposd(gnssCalcData.getRposd()+Math.random()*0.4-0.2);//-0.3~0.3 locationRecord.setPps(-1);//标记为虚拟数据 gnssDataMapper.insert(locationRecord); }