CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jh

Browse Source
This commit is contained in:
闫阳
2022-08-05 16:46:33 +08:00
parent 959b1a0b77
commit 73efee55e7
48 changed files with 295 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java
View File

@@ -2,7 +2,6 @@ package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.admin.params.IdParam;
import com.cnbm.basic.vo.MachineVo;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
@@ -58,6 +57,7 @@ public class MachineController {
return new Result<PageData<MachineDTO>>().ok(page);
}
/*
@GetMapping("page2")
@ApiOperation("分页2")
@ApiImplicitParams({
@@ -68,11 +68,12 @@ public class MachineController {
@ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class)
})
//@PreAuthorize("@ex.hasAuthority('code:machine:page')")
public Result<PageData<MachineVo>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MachineVo> page = machineService.page1(params);
public Result<PageData<MachineDTO>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MachineDTO> page = machineService.page1(params);
return new Result<PageData<MachineVo>>().ok(page);
return new Result<PageData<MachineDTO>>().ok(page);
}
*/
@GetMapping("{id}")
@ApiOperation("信息")
@@ -129,7 +130,7 @@ public class MachineController {
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<MachineDTO> list = machineService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
ExcelUtils.exportExcelToTarget(response, "Machine", list, MachineExcel.class);
}
@PostMapping("status")