From 51f460f3b1a8b9fa365e4195c41bb9c5e16fcb7c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:24 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
index 351327c..ddcc1eb 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java
@@ -48,10 +48,13 @@
public class AppUserController extends BaseController
{
private final MwTransitCarService carService;
+ private final ISysUserService userService;
@ApiOperation(value = "获取绑定车辆",tags = "运输人员")
@PostMapping("/car")
public R<MwTransitCar> car() {
- SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser sysUser = userService.getById(user.getUserId());
+
if (sysUser.getCarId()==null){
return R.fail("当前暂无绑定车辆，请绑定后操作");
}
@@ -59,5 +62,39 @@
return R.ok(byId);
}
+ @ApiOperation(value = "获取车辆列表",tags = "运输人员")
+ @PostMapping("/list")
+ public R<List<MwTransitCar>> list() {
+ List<MwTransitCar> list = carService.list();
+ return R.ok(list);
+ }
+
+ @ApiOperation(value = "更换绑定车辆",tags = "运输人员")
+ @PostMapping("/change")
+ public R<List<MwTransitCar>> change(@RequestParam Long carId) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+
+ SysUser byId = userService.getById(sysUser.getUserId());
+ byId.setCarId(carId);
+ userService.updateById(byId);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "绑定前校验",tags = "运输人员")
+ @PostMapping("/check")
+ public R<SysUser> check(@RequestParam Long carId) {
+ SysUser one = userService.lambdaQuery().eq(SysUser::getCarId, carId).one();
+ if (one!=null){
+ return R.fail(one);
+ }else {
+ return R.ok();
+ }
+
+
+ }
+
+
+
+
}
--
Gitblit v1.7.1