diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java index b8de4d2..c63061e 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java @@ -150,11 +150,6 @@ public class TerminalExtController extends BaseController { List terminalIds = new ArrayList<>(); for (View_Dy_Line_Tower_Terminals terminal : result.getList()) { terminalIds.add(terminal.getId()); - if (dataFlag.contains("G")) { - TerminalGpsModel last = gpsService.getTermLastGPSPosition(terminal.getId()) - .getData(); - terminal.setLastGps(last); - } if (dataFlag.contains("P")) { PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end); terminal.setPhotoInfo(photoInfo); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java index 431004b..36bf5fb 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java @@ -131,7 +131,6 @@ public class View_Dy_Line_Tower_Terminals implements Serializable { private Weathers lastWeathers; private LeadPulls lastLeadPulls; - private TerminalGpsModel lastGps; private PhotoDayModel photoInfo; private TerminalStatus workingStatus; private TerminalPositions positions;