From 1f19fc38b37ed1aa96802702ca406ab740a8aa6c Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 19 十月 2023 15:35:49 +0800 Subject: [PATCH] RTU列表 --- ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java | 8 ++++++++ ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 8 ++++++++ ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java | 1 + 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java index 4bd8949..322a260 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java +++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java @@ -45,6 +45,14 @@ return Results.succeed(list); } + @GetMapping("/carAddOne") + @ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈嗗姞鏈溅杈嗕俊鎭�") + public Results carAddOne(String CarId){ + List<CarVo> list = ardSyCarLockService.carAddOne(CarId); + analysis(list); + return Results.succeed(list); + } + @PostMapping("/add") @ApiOperation("娣诲姞rtu") public Results add(String carId){ diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java index 95c73e5..1bb5e26 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java +++ b/ard-work/src/main/java/com/ruoyi/sy/service/ArdSyCarLockService.java @@ -14,6 +14,7 @@ * 鎵�鏈夋湭鎸傞攣鐨勮溅杈� */ List<CarVo> car(); + List<CarVo> carAddOne(String carId); int addRtu(String carId); diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java index 81876d7..9af588b 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarLockServiceImpl.java @@ -44,6 +44,14 @@ } @Override + public List<CarVo> carAddOne(String carId) { + QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("reserved_1").or().eq("reserved_1","").or().eq("car_id",carId); + List<ArdSyCar> ardSyCars= ardSyCarMapper.selectList(queryWrapper); + return carAnalysis(ardSyCars); + } + + @Override public int addRtu(String carId) { ArdSyCarRtu ardSyCarRtu = new ArdSyCarRtu(); ardSyCarRtu.setId(String.valueOf(UUID.randomUUID())); -- Gitblit v1.9.3