b2894lxlx/yxe-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复设备分类和设备型号问题

Browse Source
This commit is contained in:
gxwebsoft
2023-06-05 17:06:07 +08:00
parent d2a82a97e6
commit 47e758e22f
8 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gxwebsoft/tower/controller/TowerModelController.java
+3 -10
View File
@@ -32,11 +32,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("分页查询设备型号管理表")
@GetMapping("/page")
public ApiResult<PageResult<TowerModel>> page(TowerModelParam param) {
PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc");
return success(towerModelService.page(page, page.getWrapper()));
// 使用关联查询
//return success(towerModelService.pageRel(param));
return success(towerModelService.pageRel(param));
}
@PreAuthorize("hasAuthority('tower:towerModel:list')")
@@ -44,11 +41,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("查询全部设备型号管理表")
@GetMapping()
public ApiResult<List<TowerModel>> list(TowerModelParam param) {
PageParam<TowerModel, TowerModelParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc");
return success(towerModelService.list(page.getOrderWrapper()));
// 使用关联查询
//return success(towerModelService.listRel(param));
return success(towerModelService.listRel(param));
}
@PreAuthorize("hasAuthority('tower:towerModel:list')")
@@ -56,9 +50,8 @@ public class TowerModelController extends BaseController {
@ApiOperation("根据id查询设备型号管理表")
@GetMapping("/{id}")
public ApiResult<TowerModel> get(@PathVariable("id") Integer id) {
return success(towerModelService.getById(id));
// 使用关联查询
//return success(towerModelService.getByIdRel(id));
return success(towerModelService.getByIdRel(id));
}
@PreAuthorize("hasAuthority('tower:towerModel:save')")