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

1、修改补传历史数据查询语句的bug

Browse Source
This commit is contained in:
weidong 2025-07-29 23:09:34 +08:00
parent 0f6af2c170
commit f756e347aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
View File

@ -112,7 +112,7 @@ public class Forwarder {
List<GnssDeviceJoin> gnssDeviceList; List<GnssDeviceJoin> gnssDeviceList;
MPJQueryWrapper jquery = null; MPJQueryWrapper jquery = null;
if(resendRecord!=null && resendRecord.getDeviceid()!=null){ if(resendRecord!=null && !StringUtils.hasText(resendRecord.getDeviceid())){
jquery = new MPJQueryWrapper<GnssDevice> () jquery = new MPJQueryWrapper<GnssDevice> ()
.selectAll(GnssDevice.class) .selectAll(GnssDevice.class)
.select("d.latitude as latitude") .select("d.latitude as latitude")
@ -121,7 +121,7 @@ public class Forwarder {
.and(warpper->warpper.eq("fwd_group_id", fwdGroupId) .and(warpper->warpper.eq("fwd_group_id", fwdGroupId)
.or() .or()
.eq("fwd_group_id2", fwdGroupId)). .eq("fwd_group_id2", fwdGroupId)).
eq("deviceid", resendRecord.getDeviceid()); eq("t.deviceid", resendRecord.getDeviceid());
} }
else if(resendRecord!=null && resendRecord.getProjectid()!=null){ else if(resendRecord!=null && resendRecord.getProjectid()!=null){
jquery = new MPJQueryWrapper<GnssDevice> () jquery = new MPJQueryWrapper<GnssDevice> ()