@@ -4,7 +4,7 @@ import org.springframework.context.annotation.Bean; | |||
import org.springframework.context.annotation.Configuration; | |||
import org.springframework.web.socket.server.standard.ServerEndpointExporter; | |||
@Configuration | |||
//@Configuration | |||
public class WebSocketConfig { | |||
/** |
@@ -28,8 +28,8 @@ public class AirPortController { | |||
* 获取巡检机场 | |||
*/ | |||
@GetMapping("/list") | |||
public JsonResult getList(List<Long> ids) { | |||
return airportService.getAirportList(ids); | |||
public JsonResult getList() { | |||
return airportService.getAirportList(); | |||
} | |||
/** | |||
* 获取巡检线路 |
@@ -8,7 +8,7 @@ import java.util.List; | |||
public interface AirportService { | |||
JsonResult getAirportList(List<Long> ids); | |||
JsonResult getAirportList(); | |||
JsonResult getAirLineList(String sn,Long id); | |||
@@ -31,8 +31,8 @@ public class AirportServiceImpl implements AirportService { | |||
private GetAirportVideoService getAirportVideoService; | |||
@Override | |||
public JsonResult getAirportList(List<Long> ids) { | |||
return getAirportListService.getAirportList(ids); | |||
public JsonResult getAirportList() { | |||
return getAirportListService.getAirportList(); | |||
} | |||
@Override |
@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.stereotype.Service; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
@Slf4j | |||
@@ -15,7 +16,9 @@ public class GetAirportListService { | |||
@Autowired | |||
private TZHLGetAirportListService tzhlGetAirportListService; | |||
public JsonResult getAirportList(List<Long> ids) { | |||
public JsonResult getAirportList() { | |||
List<Long> ids = new ArrayList<>(); | |||
ids.add(null); | |||
//读取全量机场列表数据 | |||
JsonResult result = tzhlGetAirportListService.getAirportList(ids); | |||