Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

bug fixed: 获取推送记录的问题

Browse Source
This commit is contained in:
weidong 2023-12-10 11:24:23 +08:00
parent 7856919104
commit 88b540b536
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/fwd/ForwardGnssTask.java
View File

@ -45,9 +45,18 @@ public class ForwardGnssTask {
*/ */
@Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次 @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
private void forwardGnss() { private void forwardGnss() {
// 1.按项目检索最近半小时的解算结果记录，推送Enable为true的记录
// 2.如果某终端最近半小时没有数据，则记录本次时间为待补传时间
forwardGnssToXFZ(1); forwardGnssToXFZ(1);
} }
@Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
private void forwardHistoryGnss() {
// 1.从转发记录表里检索待补传记录时间表，含设备Id，时间段
// 2.检索这个这个时间段的解算结果，如果有数据则单个终端转发，标志记录为已补传
//forwardGnssToXFZ(1);
}
private void forwardGnssToXFZ(int tenantId) { private void forwardGnssToXFZ(int tenantId) {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
ConcurrentHashMap<String, List<GnssCalcData>> projects = new ConcurrentHashMap<>(); ConcurrentHashMap<String, List<GnssCalcData>> projects = new ConcurrentHashMap<>();
@ -69,6 +78,7 @@ public class ForwardGnssTask {
QueryWrapper<GnssCalcData> gnssQueryWrapper = new QueryWrapper<>(); QueryWrapper<GnssCalcData> gnssQueryWrapper = new QueryWrapper<>();
gnssQueryWrapper.eq("deviceid",device.getDeviceid()); gnssQueryWrapper.eq("deviceid",device.getDeviceid());
gnssQueryWrapper.orderByDesc("createtime"); gnssQueryWrapper.orderByDesc("createtime");
gnssQueryWrapper.last("limit 1");
GnssCalcData record = gnssDataMapper.selectOne(gnssQueryWrapper); GnssCalcData record = gnssDataMapper.selectOne(gnssQueryWrapper);
if(record != null && record.getEnabled()){ if(record != null && record.getEnabled()){
if(nowTime.isBefore(record.getCreatetime().plusMinutes(40))) { if(nowTime.isBefore(record.getCreatetime().plusMinutes(40))) {