Browse Source

Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tags/v1.3.1
chengwang 1 year ago
parent
commit
6eaa5fd0c1
4 changed files with 9 additions and 6 deletions
  1. +2
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/AirPortController.java
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/AirportService.java
  3. +2
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/AirportServiceImpl.java
  4. +4
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/GetAirportListService.java

+ 2
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/AirPortController.java View File

* 获取巡检机场 * 获取巡检机场
*/ */
@GetMapping("/list") @GetMapping("/list")
public JsonResult getList(List<Long> ids) {
return airportService.getAirportList(ids);
public JsonResult getList() {
return airportService.getAirportList();
} }
/** /**
* 获取巡检线路 * 获取巡检线路

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/AirportService.java View File



public interface AirportService { public interface AirportService {


JsonResult getAirportList(List<Long> ids);
JsonResult getAirportList();


JsonResult getAirLineList(String sn,Long id); JsonResult getAirLineList(String sn,Long id);



+ 2
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/AirportServiceImpl.java View File

private GetAirportVideoService getAirportVideoService; private GetAirportVideoService getAirportVideoService;


@Override @Override
public JsonResult getAirportList(List<Long> ids) {
return getAirportListService.getAirportList(ids);
public JsonResult getAirportList() {
return getAirportListService.getAirportList();
} }


@Override @Override

+ 4
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/GetAirportListService.java View File

import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.util.ArrayList;
import java.util.List; import java.util.List;


@Slf4j @Slf4j
@Autowired @Autowired
private TZHLGetAirportListService tzhlGetAirportListService; 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); JsonResult result = tzhlGetAirportListService.getAirportList(ids);



Loading…
Cancel
Save