From d88cb5d22966936d95f7ddb15345b45729317a50 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 10:08:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
index 7a4479f..67ff1d8 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
@@ -1,17 +1,16 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.service.TAppUserCarService;
import com.ruoyi.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -34,9 +33,31 @@
* @return
*/
@PostMapping(value = "/t-app-user-car/getCarByIds")
- public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Integer> carIds){
+ public R<List<TAppUserCar>> getCarByIds(@RequestBody List<Long> carIds){
return R.ok(appUserCarService.list(Wrappers.lambdaQuery(TAppUserCar.class).in(TAppUserCar::getId,carIds)));
}
+ @PostMapping(value = "/t-app-user-car/getCarById/{id}")
+ public R<TAppUserCar> getCarById(@PathVariable("id")String id){
+ return R.ok(appUserCarService.lambdaQuery().eq(TAppUserCar::getId,id).one());
+ }
+
+ /**
+ * 根据车牌号查询数据
+ * @param licensePlate
+ * @return
+ */
+ @PostMapping(value = "/t-app-user-car/getAppUserCarByLicensePlate")
+ public R<TAppUserCar> getAppUserCarByLicensePlate(@RequestParam("licensePlate") String licensePlate){
+ TAppUserCar one = appUserCarService.getOne(new LambdaQueryWrapper<TAppUserCar>().eq(TAppUserCar::getLicensePlate, licensePlate).eq(TAppUserCar::getDelFlag, 0));
+ return R.ok(one);
+ }
+ @PostMapping(value = "/t-app-user-car/getAppUserCarByLicensePlates")
+ public R<List<Long>> getAppUserCarByLicensePlates(@RequestParam("licensePlate") String licensePlate){
+ List<Long> collect = appUserCarService.list(new LambdaQueryWrapper<TAppUserCar>().like(TAppUserCar::getLicensePlate, licensePlate)
+ .eq(TAppUserCar::getDelFlag, 0)).stream()
+ .map(TAppUserCar::getId).collect(Collectors.toList());
+ return R.ok(collect);
+ }
}
--
Gitblit v1.7.1