From 1abab3ed63e5648b8d88c412dce70aad0736b98a Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:30 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 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..a1ac1c8 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
@@ -15,6 +15,7 @@
import com.sinata.common.utils.poi.ExcelUtil;
import com.sinata.system.domain.MwApplication;
import com.sinata.system.domain.MwTransitCar;
+import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.SysUserDTO;
import com.sinata.system.domain.dto.SysUserStatusDTO;
import com.sinata.system.domain.query.SysUserQuery;
@@ -48,10 +49,14 @@
public class AppUserController extends BaseController
{
private final MwTransitCarService carService;
+ private final ISysUserService userService;
+ private final SysDepartmentService sysDepartmentService;
@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 +64,50 @@
return R.ok(byId);
}
+ @ApiOperation(value = "获取车辆列表",tags = "运输人员")
+ @PostMapping("/list")
+ public R<List<MwTransitCar>> list() {
+ SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
+ List<MwTransitCar> list = carService.lambdaQuery().eq(MwTransitCar::getDepartmentId,myDepartment.getId()).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();
+ }
+
+
+ }
+
+ @ApiOperation(value = "取消绑定",tags = "运输人员")
+ @PostMapping("/cancel")
+ public R<SysUser> cancel() {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+ sysUser.setCarId(-1L);
+ userService.updateById(sysUser);
+ return R.ok();
+
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1