feat:支持按景区获取设备下拉
This commit is contained in:
parent
55e109002c
commit
b13064ecea
@ -7,10 +7,7 @@ import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
@ -55,8 +52,8 @@ public class KeyValueEntityController {
|
||||
*/
|
||||
@ApiOperation(value = "获取设备下拉列表")
|
||||
@GetMapping("/obtainDeviceList")
|
||||
public ResponseEntity<List<KeyValueEntity>> obtainDeviceList() {
|
||||
List<KeyValueEntity> keyValueEntityList = keyValueEntityService.obtainDeviceList();
|
||||
public ResponseEntity<List<KeyValueEntity>> obtainDeviceList(@ApiParam(value = "景区ID") @RequestParam(value = "attractionId",required = false)Long attractionId) {
|
||||
List<KeyValueEntity> keyValueEntityList = keyValueEntityService.obtainDeviceList(attractionId);
|
||||
return ResponseEntity.ok(keyValueEntityList);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ public interface KeyValueEntityService {
|
||||
*
|
||||
* @return List<KeyValueEntity>
|
||||
*/
|
||||
List<KeyValueEntity> obtainDeviceList();
|
||||
List<KeyValueEntity> obtainDeviceList(Long attractionId);
|
||||
|
||||
/**
|
||||
* 获取所有路线
|
||||
|
@ -78,9 +78,11 @@ public class KeyValueEntityServiceImpl implements KeyValueEntityService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KeyValueEntity> obtainDeviceList() {
|
||||
public List<KeyValueEntity> obtainDeviceList(Long attractionId) {
|
||||
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)) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user