修复实时数据同步
parent
6c737846af
commit
e738a5f530
|
|
@ -48,6 +48,7 @@ import ru.olegcherednik.jackson_utils.JacksonUtils;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
|
@ -285,8 +286,8 @@ public class DataTask {
|
||||||
(existing, replacement) -> existing // 如果有冲突,保留现有的
|
(existing, replacement) -> existing // 如果有冲突,保留现有的
|
||||||
)).values().stream().collect(Collectors.toList());
|
)).values().stream().collect(Collectors.toList());
|
||||||
stPptnRService.saveBatch(rlist);
|
stPptnRService.saveBatch(rlist);
|
||||||
// 使用最后一条更新到实时数据表
|
// 获取时间最大的一条更新到实时数据表
|
||||||
StPptnR stPptnR1 = rlist.get(rlist.size() - 1);
|
StPptnR stPptnR1 = rlist.stream().max(Comparator.comparing(StPptnR::getTm)).get();
|
||||||
StPptnRReal stPptnRReal = new StPptnRReal();
|
StPptnRReal stPptnRReal = new StPptnRReal();
|
||||||
stPptnRReal.setStcd(stPptnR1.getStcd());
|
stPptnRReal.setStcd(stPptnR1.getStcd());
|
||||||
stPptnRReal.setTm(stPptnR1.getTm());
|
stPptnRReal.setTm(stPptnR1.getTm());
|
||||||
|
|
@ -525,8 +526,8 @@ public class DataTask {
|
||||||
(existing, replacement) -> existing // 如果有冲突,保留现有的
|
(existing, replacement) -> existing // 如果有冲突,保留现有的
|
||||||
)).values().stream().collect(Collectors.toList());
|
)).values().stream().collect(Collectors.toList());
|
||||||
stRsvrRService.saveBatch(rlist);
|
stRsvrRService.saveBatch(rlist);
|
||||||
// 使用最后一条更新到实时数据表
|
// 获取时间最大的一条更新到实时数据表
|
||||||
StRsvrR STRsvrR1 = rlist.get(rlist.size() - 1);
|
StRsvrR STRsvrR1 = rlist.stream().max(Comparator.comparing(StRsvrR::getTm)).get();
|
||||||
StRsvrRReal stRsvrRReal = new StRsvrRReal();
|
StRsvrRReal stRsvrRReal = new StRsvrRReal();
|
||||||
stRsvrRReal.setStcd(STRsvrR1.getStcd());
|
stRsvrRReal.setStcd(STRsvrR1.getStcd());
|
||||||
stRsvrRReal.setTm(STRsvrR1.getTm());
|
stRsvrRReal.setTm(STRsvrR1.getTm());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue