sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:支持按景区获取设备下拉

Browse Source
This commit is contained in:
sugus 2025-08-01 14:52:11 +08:00
parent 55e109002c
commit b13064ecea
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aircraft-system/src/main/java/com/aircraft/modules/system/controller/KeyValueEntityController.java
View File

@ -7,10 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@ -55,8 +52,8 @@ public class KeyValueEntityController {
*/ */
@ApiOperation(value = "获取设备下拉列表") @ApiOperation(value = "获取设备下拉列表")
@GetMapping("/obtainDeviceList") @GetMapping("/obtainDeviceList")
public ResponseEntity<List<KeyValueEntity>> obtainDeviceList() { public ResponseEntity<List<KeyValueEntity>> obtainDeviceList(@ApiParam(value = "景区ID") @RequestParam(value = "attractionId",required = false)Long attractionId) {
List<KeyValueEntity> keyValueEntityList = keyValueEntityService.obtainDeviceList(); List<KeyValueEntity> keyValueEntityList = keyValueEntityService.obtainDeviceList(attractionId);
return ResponseEntity.ok(keyValueEntityList); return ResponseEntity.ok(keyValueEntityList);
} }

2
aircraft-system/src/main/java/com/aircraft/modules/system/service/KeyValueEntityService.java
View File

@ -31,7 +31,7 @@ public interface KeyValueEntityService {
* *
* @return List<KeyValueEntity> * @return List<KeyValueEntity>
*/ */
List<KeyValueEntity> obtainDeviceList(); List<KeyValueEntity> obtainDeviceList(Long attractionId);
/** /**
* 获取所有路线 * 获取所有路线

6
aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/KeyValueEntityServiceImpl.java
View File

@ -78,9 +78,11 @@ public class KeyValueEntityServiceImpl implements KeyValueEntityService {
} }
@Override @Override
public List<KeyValueEntity> obtainDeviceList() { public List<KeyValueEntity> obtainDeviceList(Long attractionId) {
List<AircraftDevice> list = deviceService.list(Wrappers.lambdaQuery(AircraftDevice.class) List<AircraftDevice> list = deviceService.list(Wrappers.lambdaQuery(AircraftDevice.class)
.select(AircraftDevice::getId, AircraftDevice::getName).orderByAsc(AircraftDevice::getId)); .select(AircraftDevice::getId, AircraftDevice::getName)
.eq(null != attractionId,AircraftDevice::getScenicId,attractionId)
.orderByAsc(AircraftDevice::getId));
if (CollectionUtil.isEmpty( list)) { if (CollectionUtil.isEmpty( list)) {
return new ArrayList<>(); return new ArrayList<>();
} }