Commit 79de0fd0bced5839399af7aca061300e238adc97
1 parent
1766e333
fix: 获取用户列表
Showing
2 changed files
with
20 additions
and
1 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
| @@ -121,6 +121,17 @@ public class DriverController extends BaseController { | @@ -121,6 +121,17 @@ public class DriverController extends BaseController { | ||
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | /** | 123 | /** |
| 124 | + * 获取用户信息列表 | ||
| 125 | + * @param driver | ||
| 126 | + * @return | ||
| 127 | + */ | ||
| 128 | + @GetMapping("/getDrivers") | ||
| 129 | + @ApiOperation(value = "查询驾驶员信息列表", notes = "查询驾驶员信息列表") | ||
| 130 | + public AjaxResult getDrivers(Driver driver) { | ||
| 131 | + return AjaxResult.success(driverService.selectDriverList(driver)); | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + /** | ||
| 124 | * 校验工号 | 135 | * 校验工号 |
| 125 | * | 136 | * |
| 126 | * @param driver | 137 | * @param driver |
ruoyi-admin/src/main/java/com/ruoyi/test/GetAdminTOken.java renamed to ruoyi-admin/src/main/java/com/ruoyi/test/GetAdminToken.java
| @@ -13,10 +13,13 @@ import org.springframework.web.bind.annotation.GetMapping; | @@ -13,10 +13,13 @@ import org.springframework.web.bind.annotation.GetMapping; | ||
| 13 | import org.springframework.web.bind.annotation.RequestMapping; | 13 | import org.springframework.web.bind.annotation.RequestMapping; |
| 14 | import org.springframework.web.bind.annotation.RestController; | 14 | import org.springframework.web.bind.annotation.RestController; |
| 15 | 15 | ||
| 16 | +import java.util.Arrays; | ||
| 17 | +import java.util.List; | ||
| 18 | + | ||
| 16 | @RestController | 19 | @RestController |
| 17 | @RequestMapping("/ceshi") | 20 | @RequestMapping("/ceshi") |
| 18 | @Api(tags = "测试接口") | 21 | @Api(tags = "测试接口") |
| 19 | -public class GetAdminTOken { | 22 | +public class GetAdminToken { |
| 20 | 23 | ||
| 21 | @Autowired | 24 | @Autowired |
| 22 | private ISysUserService userService; | 25 | private ISysUserService userService; |
| @@ -39,4 +42,9 @@ public class GetAdminTOken { | @@ -39,4 +42,9 @@ public class GetAdminTOken { | ||
| 39 | userService.updateUser(user); | 42 | userService.updateUser(user); |
| 40 | return user.getRemark(); | 43 | return user.getRemark(); |
| 41 | } | 44 | } |
| 45 | + | ||
| 46 | + public static void main(String[] args) { | ||
| 47 | + | ||
| 48 | + } | ||
| 49 | + | ||
| 42 | } | 50 | } |