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

1、不同第三方错开时间发送，避免数据库集中查询

Browse Source
This commit is contained in:
weidong 2024-01-30 22:50:11 +08:00
parent 76d1ef3b2c
commit 1bb6946bf8
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package com.imdroid.beidou_fwd.task; package com.imdroid.beidou_fwd.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.imdroid.common.util.ThreadManager;
import com.imdroid.secapi.dto.*; import com.imdroid.secapi.dto.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +17,8 @@ public class Forwarder {
String description; String description;
Integer tenantId; Integer tenantId;
boolean useFwdId; boolean useFwdId;
int totalSendNum = 0;
boolean fwdFailed = false;
static boolean isFwdTableInit = false; static boolean isFwdTableInit = false;
@Autowired @Autowired
@ -111,8 +113,9 @@ public class Forwarder {
} }
// 按项目打包推送 // 按项目打包推送
int totalSendNum = 0; totalSendNum = 0;
boolean fwdFailed = false; fwdFailed = false;
List<FwdRecord> fwdRecordList = new ArrayList<>();
for (Map.Entry<String, List<GnssCalcData>> entry: projects.entrySet()){ for (Map.Entry<String, List<GnssCalcData>> entry: projects.entrySet()){
String projectId = entry.getKey(); String projectId = entry.getKey();
List<GnssCalcData> records = entry.getValue(); List<GnssCalcData> records = entry.getValue();
@ -137,12 +140,18 @@ public class Forwarder {
fwdRecord.setState(FwdRecord.STATE_FWD_FAILED); fwdRecord.setState(FwdRecord.STATE_FWD_FAILED);
fwdFailed = true; fwdFailed = true;
} }
fwdRecordsMapper.insert(fwdRecord); fwdRecordList.add(fwdRecord);
} }
// 更新推送信息 // 更新推送信息
ThreadManager.getFixedThreadPool().submit(() -> {
for(FwdRecord record:fwdRecordList){
fwdRecordsMapper.insert(record);
}
if(totalSendNum>0) updateFwd(totalSendNum, true); if(totalSendNum>0) updateFwd(totalSendNum, true);
else if(fwdFailed) updateFwd(totalSendNum, false); else if(fwdFailed) updateFwd(totalSendNum, false);
});
} }
@ -153,8 +162,9 @@ public class Forwarder {
queryWrapper.eq("state",FwdRecord.STATE_UPLOAD_DONE); queryWrapper.eq("state",FwdRecord.STATE_UPLOAD_DONE);
List<FwdRecord> fwdRecordsList = fwdRecordsMapper.selectList(queryWrapper); List<FwdRecord> fwdRecordsList = fwdRecordsMapper.selectList(queryWrapper);
// 2.检索这个这个时间段的解算结果，如果有数据则单个终端转发，标志记录为已补传 // 2.检索这个这个时间段的解算结果，如果有数据则单个终端转发，标志记录为已补传
int totalSendNum = 0; totalSendNum = 0;
boolean fwdFailed = false; fwdFailed = false;
List<FwdRecord> fwdRecordList = new ArrayList<>();
for(FwdRecord fwdRecord:fwdRecordsList){ for(FwdRecord fwdRecord:fwdRecordsList){
// 查找device // 查找device
QueryWrapper<GnssDevice> deviceQueryWrapper = new QueryWrapper<>(); QueryWrapper<GnssDevice> deviceQueryWrapper = new QueryWrapper<>();
@ -183,12 +193,17 @@ public class Forwarder {
fwdRecord.setState(FwdRecord.STATE_FWD_FAILED); fwdRecord.setState(FwdRecord.STATE_FWD_FAILED);
fwdFailed = true; fwdFailed = true;
} }
fwdRecordsMapper.updateById(fwdRecord); fwdRecordList.add(fwdRecord);
} }
// 更新推送信息 // 更新推送信息
ThreadManager.getFixedThreadPool().submit(() -> {
for(FwdRecord record:fwdRecordList){
fwdRecordsMapper.updateById(record);
}
if(totalSendNum>0) updateFwd(totalSendNum, true); if(totalSendNum>0) updateFwd(totalSendNum, true);
else if(fwdFailed) updateFwd(totalSendNum, false); else if(fwdFailed) updateFwd(totalSendNum, false);
});
} }
int sendBatch(GnssDevice device, String projectId, List<GnssCalcData> records){ int sendBatch(GnssDevice device, String projectId, List<GnssCalcData> records){

1
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXXfzForwarder.java
View File

@ -67,7 +67,6 @@ public class GXXfzForwarder extends Forwarder{
*/ */
@Scheduled(cron = "0 0,30 * * * ?") // 每30分钟执行一次 @Scheduled(cron = "0 0,30 * * * ?") // 每30分钟执行一次
private void forwardGnss() { private void forwardGnss() {
logger.info("forwardGnss");
forwardCurrentGnss(FORWARDER_NAME); forwardCurrentGnss(FORWARDER_NAME);
} }