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

增加补传推送第三方功能

Browse Source
This commit is contained in:
weidong 2023-12-11 16:06:58 +08:00
parent 23df99fd07
commit 85c3778385
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,6 @@ public class ForwardGnssTask {
// 转发新发展数据 // 转发新发展数据
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String sendTime = nowTime.format(formatter);
String sendAfterTime = nowTime.minusMinutes(30).format(formatter); String sendAfterTime = nowTime.minusMinutes(30).format(formatter);
QueryWrapper<GnssDevice> queryWrapper = new QueryWrapper<>(); QueryWrapper<GnssDevice> queryWrapper = new QueryWrapper<>();
@ -113,12 +112,12 @@ public class ForwardGnssTask {
// 按项目打包推送 // 按项目打包推送
for (Map.Entry<String, List<GnssCalcData>> entry: projects.entrySet()){ for (Map.Entry<String, List<GnssCalcData>> entry: projects.entrySet()){
SendToXFZ(entry.getKey(), entry.getValue(), sendTime); SendToXFZ(entry.getKey(), entry.getValue());
} }
} }
void SendToXFZ(String projectId, List<GnssCalcData> records, String sendTime){ void SendToXFZ(String projectId, List<GnssCalcData> records){
if(records.size() == 0) return; if(records.size() == 0) return;
XFZTcpMessage xfzTcpMessage = new XFZTcpMessage(); XFZTcpMessage xfzTcpMessage = new XFZTcpMessage();
@ -129,9 +128,10 @@ public class ForwardGnssTask {
xfzTcpMessage.setData(dataList); xfzTcpMessage.setData(dataList);
for(GnssCalcData locationRecord: records) { for(GnssCalcData locationRecord: records) {
if(!locationRecord.getEnabled()) continue;
XFZTcpMessage.Data data = new XFZTcpMessage.Data(); XFZTcpMessage.Data data = new XFZTcpMessage.Data();
dataList.add(data); dataList.add(data);
data.setDataTime(sendTime); data.setDataTime(locationRecord.getCreatetime().format(dateFormatter));
data.setDevNum(locationRecord.getDeviceid()); data.setDevNum(locationRecord.getDeviceid());
data.setDevtype("GNSS"); data.setDevtype("GNSS");
// 单位由mm转化为m // 单位由mm转化为m
@ -154,11 +154,15 @@ public class ForwardGnssTask {
if(calcData.getEnabled() && if(calcData.getEnabled() &&
calcData.getCreatetime().isAfter(lastTime.plusMinutes(28))){ calcData.getCreatetime().isAfter(lastTime.plusMinutes(28))){
// 推送 // 推送
SendOneToXFZ(projectId, calcData,lastTime.format(dateFormatter));
lastTime = calcData.getCreatetime(); lastTime = calcData.getCreatetime();
} }
else{
calcData.setEnabled(false);//借用来表示不推送，不会保存到数据库
}
} }
SendToXFZ(projectId, records);
} }
void SendOneToXFZ(String projectId, GnssCalcData calcData, String sendTime){ void SendOneToXFZ(String projectId, GnssCalcData calcData, String sendTime){