Compare commits

..

No commits in common. "3c6c69d31c708fc6001e737580720f06dc534401" and "ef367f4d2c30272389d80190f1e2aed56d11673e" have entirely different histories.

1 changed files with 5 additions and 3 deletions

View File

@ -3,7 +3,6 @@ package com.bonus.material.device.controller;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import com.bonus.common.biz.config.ListPagingUtil; import com.bonus.common.biz.config.ListPagingUtil;
import com.bonus.common.biz.domain.BmCompanyInfo; import com.bonus.common.biz.domain.BmCompanyInfo;
import com.bonus.common.core.constant.Constants;
import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.core.utils.ServletUtils;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
@ -24,6 +23,8 @@ import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import static com.bonus.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE;
/** /**
* 设备信息Controller * 设备信息Controller
@ -32,6 +33,7 @@ import java.util.List;
*/ */
@RestController @RestController
@RequestMapping("/dev") @RequestMapping("/dev")
@Validated
@Api(value = "设备信息",tags = "设备管理") @Api(value = "设备信息",tags = "设备管理")
public class DevInfoController extends BaseController { public class DevInfoController extends BaseController {
@ -68,8 +70,8 @@ public class DevInfoController extends BaseController {
*/ */
//@RequiresPermissions("equip:info:list") //@RequiresPermissions("equip:info:list")
@ApiOperation(value = "查询装备列表--分页") @ApiOperation(value = "查询装备列表--分页")
@GetMapping("/devList") @PostMapping("/devList")
public TableDataInfo devList(DevInfoVo devInfo) { public TableDataInfo devList(@RequestBody DevInfoVo devInfo) {
startPage(); startPage();
List<DevInfoVo> list = devInfoService.selectDevInfoLists(devInfo); List<DevInfoVo> list = devInfoService.selectDevInfoLists(devInfo);
return getDataTable(list); return getDataTable(list);