|
|
@ -150,11 +150,6 @@ public class TerminalExtController extends BaseController {
|
|
|
|
List<Integer> terminalIds = new ArrayList<>();
|
|
|
|
List<Integer> terminalIds = new ArrayList<>();
|
|
|
|
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
|
|
|
for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
|
|
|
|
terminalIds.add(terminal.getId());
|
|
|
|
terminalIds.add(terminal.getId());
|
|
|
|
if (dataFlag.contains("G")) {
|
|
|
|
|
|
|
|
TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId())
|
|
|
|
|
|
|
|
.getData();
|
|
|
|
|
|
|
|
terminal.setLastGps(last);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dataFlag.contains("P")) {
|
|
|
|
if (dataFlag.contains("P")) {
|
|
|
|
PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
|
|
|
|
PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
|
|
|
|
terminal.setPhotoInfo(photoInfo);
|
|
|
|
terminal.setPhotoInfo(photoInfo);
|
|
|
|