From b13064ecea5f3a5abba22b2180ba8daf31422a75 Mon Sep 17 00:00:00 2001 From: sugus <1020570875@qq.com> Date: Fri, 1 Aug 2025 14:52:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=94=AF=E6=8C=81=E6=8C=89=E6=99=AF?= =?UTF-8?q?=E5=8C=BA=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/KeyValueEntityController.java | 9 +++------ .../modules/system/service/KeyValueEntityService.java | 2 +- .../system/service/impl/KeyValueEntityServiceImpl.java | 6 ++++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/KeyValueEntityController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/KeyValueEntityController.java index a9ccd3c..481fff9 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/KeyValueEntityController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/KeyValueEntityController.java @@ -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> obtainDeviceList() { - List keyValueEntityList = keyValueEntityService.obtainDeviceList(); + public ResponseEntity> obtainDeviceList(@ApiParam(value = "景区ID") @RequestParam(value = "attractionId",required = false)Long attractionId) { + List keyValueEntityList = keyValueEntityService.obtainDeviceList(attractionId); return ResponseEntity.ok(keyValueEntityList); } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/KeyValueEntityService.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/KeyValueEntityService.java index e57435b..d65d1ae 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/KeyValueEntityService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/KeyValueEntityService.java @@ -31,7 +31,7 @@ public interface KeyValueEntityService { * * @return List */ - List obtainDeviceList(); + List obtainDeviceList(Long attractionId); /** * 获取所有路线 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/KeyValueEntityServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/KeyValueEntityServiceImpl.java index 7dce1d6..7b27158 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/KeyValueEntityServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/KeyValueEntityServiceImpl.java @@ -78,9 +78,11 @@ public class KeyValueEntityServiceImpl implements KeyValueEntityService { } @Override - public List obtainDeviceList() { + public List obtainDeviceList(Long attractionId) { List 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<>(); }