From ba88da69825027a94ea6dbd35cee489652e90173 Mon Sep 17 00:00:00 2001 From: yanyang Date: Wed, 3 Aug 2022 16:53:24 +0800 Subject: [PATCH] mapper --- .../basic/controller/FactoryController.java | 23 ++++++---- .../basic/controller/MachineController.java | 37 +++++++++++---- .../controller/MeasureToolController.java | 22 +++++---- .../basic/controller/PlatformController.java | 20 ++++---- .../basic/controller/ProductController.java | 17 ++++--- .../ProductFactoryRelationController.java | 11 +++-- .../controller/ProductFeaturesController.java | 11 +++-- .../ProductFeaturesHisController.java | 11 +++-- .../controller/ProductTypeController.java | 22 +++++---- ...uctWorkingprocedureRelationController.java | 15 +++--- .../basic/controller/ShiftController.java | 11 +++-- .../cnbm/basic/controller/TeamController.java | 11 +++-- .../cnbm/basic/controller/UnitController.java | 20 ++++---- .../WorkingProcedureController.java | 24 ++++++---- .../WorkingProcedureTypeController.java | 20 ++++---- .../java/com/cnbm/basic/dto/PlatformDTO.java | 2 +- .../cnbm/basic/dto/WorkingProcedureDTO.java | 2 +- .../java/com/cnbm/basic/entity/Platform.java | 2 +- .../com/cnbm/basic/excel/PlatformExcel.java | 2 +- .../com/cnbm/basic/mapper/MachineMapper.java | 10 +++- .../com/cnbm/basic/mapper/ProductMapper.java | 2 +- .../cnbm/basic/service/IFactoryService.java | 2 +- .../cnbm/basic/service/IMachineService.java | 5 +- .../basic/service/IMeasureToolService.java | 2 +- .../cnbm/basic/service/IPlatformService.java | 2 +- .../basic/service/IProductTypeService.java | 2 +- .../com/cnbm/basic/service/IUnitService.java | 2 +- .../service/IWorkingProcedureService.java | 2 +- .../service/IWorkingProcedureTypeService.java | 2 +- .../service/impl/FactoryServiceImpl.java | 4 +- .../service/impl/MachineServiceImpl.java | 46 ++++++++++++++----- .../service/impl/MeasureToolServiceImpl.java | 4 +- .../service/impl/PlatformServiceImpl.java | 4 +- .../service/impl/ProductServiceImpl.java | 16 +++++-- .../service/impl/ProductTypeServiceImpl.java | 9 +--- .../basic/service/impl/UnitServiceImpl.java | 4 +- .../impl/WorkingProcedureServiceImpl.java | 22 ++++++--- .../impl/WorkingProcedureTypeServiceImpl.java | 4 +- .../java/com/cnbm/basic/vo/MachineVo.java | 45 ++++++++++++++++++ ym-baisc/src/main/resources/MachineMapper.xml | 16 +++++++ 40 files changed, 324 insertions(+), 164 deletions(-) create mode 100644 ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java index e9267a5..15e73ba 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,11 @@ public class FactoryController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "type", value = "工厂类型", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:factory:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +71,7 @@ public class FactoryController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:factory:save')") public Result save(@RequestBody FactoryDTO dto){ //效验数据 @@ -79,7 +84,7 @@ public class FactoryController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:factory:update')") public Result update(@RequestBody FactoryDTO dto){ //效验数据 @@ -92,7 +97,7 @@ public class FactoryController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:factory:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +110,7 @@ public class FactoryController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:factory:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = factoryService.list(params); @@ -113,11 +118,11 @@ public class FactoryController { ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - factoryService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + factoryService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java index 2853b53..dcb83b8 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java @@ -1,6 +1,8 @@ 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; @@ -46,7 +48,8 @@ public class MachineController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:machine:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -55,6 +58,22 @@ public class MachineController { return new Result>().ok(page); } + @GetMapping("page2") + @ApiOperation("分页2") + @ApiImplicitParams({ + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) + }) + //@PreAuthorize("@ex.hasAuthority('code:machine:page')") + public Result> page2(@ApiIgnore @RequestParam Map params){ + PageData page = machineService.page1(params); + + return new Result>().ok(page); + } + @GetMapping("{id}") @ApiOperation("信息") //@PreAuthorize("@ex.hasAuthority('code:machine:info')") @@ -66,7 +85,7 @@ public class MachineController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:machine:save')") public Result save(@RequestBody MachineDTO dto){ //效验数据 @@ -79,7 +98,7 @@ public class MachineController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:machine:update')") public Result update(@RequestBody MachineDTO dto){ //效验数据 @@ -92,7 +111,7 @@ public class MachineController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:machine:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +124,7 @@ public class MachineController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:machine:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = machineService.list(params); @@ -113,11 +132,11 @@ public class MachineController { ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - machineService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + machineService.changeStatus(id.getId()); return new Result().ok(true); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java index a65ef23..ac5b455 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,10 @@ public class MeasureToolController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:measureTool:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +70,7 @@ public class MeasureToolController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:measureTool:save')") public Result save(@RequestBody MeasureToolDTO dto){ //效验数据 @@ -79,7 +83,7 @@ public class MeasureToolController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:measureTool:update')") public Result update(@RequestBody MeasureToolDTO dto){ //效验数据 @@ -92,7 +96,7 @@ public class MeasureToolController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:measureTool:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +109,7 @@ public class MeasureToolController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:measureTool:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = measureToolService.list(params); @@ -113,11 +117,11 @@ public class MeasureToolController { ExcelUtils.exportExcelToTarget(response, null, list, MeasureToolExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - measureToolService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + measureToolService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java index 4a2b7de..5d42aa2 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,8 @@ public class PlatformController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:platform:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +68,7 @@ public class PlatformController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:platform:save')") public Result save(@RequestBody PlatformDTO dto){ //效验数据 @@ -79,7 +81,7 @@ public class PlatformController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:platform:update')") public Result update(@RequestBody PlatformDTO dto){ //效验数据 @@ -92,7 +94,7 @@ public class PlatformController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:platform:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +107,7 @@ public class PlatformController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:platform:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = platformService.list(params); @@ -113,11 +115,11 @@ public class PlatformController { ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - platformService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + platformService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java index 17b6d79..1fa1532 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java @@ -47,7 +47,12 @@ public class ProductController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "product_type_id", value = "产品类型id", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "inspection_stage", value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验", paramType = "query", dataTypeClass = String.class) }) //@PreAuthorize("@ex.hasAuthority('code:product:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -67,7 +72,7 @@ public class ProductController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:product:save')") public Result save(@RequestBody ProductDTO dto){ //效验数据 @@ -80,7 +85,7 @@ public class ProductController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:product:update')") public Result update(@RequestBody ProductDTO dto){ //效验数据 @@ -93,7 +98,7 @@ public class ProductController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:product:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -106,7 +111,7 @@ public class ProductController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:product:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productService.list(params); @@ -116,7 +121,7 @@ public class ProductController { @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") + //@LogOperation("改变状态") public Result changeStatus(@RequestBody IdParam id){ productService.changeStatus(id.getId()); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java index 9f33d34..e79f869 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFactoryRelationController.java @@ -46,7 +46,8 @@ public class ProductFactoryRelationController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +67,7 @@ public class ProductFactoryRelationController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:save')") public Result save(@RequestBody ProductFactoryRelationDTO dto){ //效验数据 @@ -79,7 +80,7 @@ public class ProductFactoryRelationController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:update')") public Result update(@RequestBody ProductFactoryRelationDTO dto){ //效验数据 @@ -92,7 +93,7 @@ public class ProductFactoryRelationController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +106,7 @@ public class ProductFactoryRelationController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productFactoryRelationService.list(params); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java index 195468c..0015a34 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesController.java @@ -46,7 +46,8 @@ public class ProductFeaturesController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:productFeatures:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +67,7 @@ public class ProductFeaturesController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:productFeatures:save')") public Result save(@RequestBody ProductFeaturesDTO dto){ //效验数据 @@ -79,7 +80,7 @@ public class ProductFeaturesController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:productFeatures:update')") public Result update(@RequestBody ProductFeaturesDTO dto){ //效验数据 @@ -92,7 +93,7 @@ public class ProductFeaturesController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:productFeatures:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +106,7 @@ public class ProductFeaturesController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:productFeatures:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productFeaturesService.list(params); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java index 3575fa2..d955524 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductFeaturesHisController.java @@ -46,7 +46,8 @@ public class ProductFeaturesHisController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +67,7 @@ public class ProductFeaturesHisController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')") public Result save(@RequestBody ProductFeaturesHisDTO dto){ //效验数据 @@ -79,7 +80,7 @@ public class ProductFeaturesHisController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')") public Result update(@RequestBody ProductFeaturesHisDTO dto){ //效验数据 @@ -92,7 +93,7 @@ public class ProductFeaturesHisController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +106,7 @@ public class ProductFeaturesHisController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productFeaturesHisService.list(params); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java index b014140..9b3fa67 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -47,7 +48,10 @@ public class ProductTypeController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) // @PreAuthorize("@ex.hasAuthority('code:productType:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -67,7 +71,7 @@ public class ProductTypeController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") // @PreAuthorize("@ex.hasAuthority('code:productType:save')") public Result save(@RequestBody ProductTypeDTO dto){ //效验数据 @@ -80,7 +84,7 @@ public class ProductTypeController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") // @PreAuthorize("@ex.hasAuthority('code:productType:update')") public Result update(@RequestBody ProductTypeDTO dto){ //效验数据 @@ -93,7 +97,7 @@ public class ProductTypeController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") // @PreAuthorize("@ex.hasAuthority('code:productType:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -106,7 +110,7 @@ public class ProductTypeController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") // @PreAuthorize("@ex.hasAuthority('code:productType:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productTypeService.list(params); @@ -114,11 +118,11 @@ public class ProductTypeController { ExcelUtils.exportExcelToTarget(response, null, list, ProductTypeExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - productTypeService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + productTypeService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java index d629308..b4abb1b 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java @@ -47,7 +47,8 @@ public class ProductWorkingprocedureRelationController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -67,7 +68,7 @@ public class ProductWorkingprocedureRelationController { @PostMapping("save") @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')") public Result save(@RequestBody ProductWorkingprocedureRelationDTO dto){ //效验数据 @@ -80,7 +81,7 @@ public class ProductWorkingprocedureRelationController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')") public Result update(@RequestBody ProductWorkingprocedureRelationDTO dto){ //效验数据 @@ -93,7 +94,7 @@ public class ProductWorkingprocedureRelationController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -106,7 +107,7 @@ public class ProductWorkingprocedureRelationController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = productWorkingprocedureRelationService.list(params); @@ -116,7 +117,7 @@ public class ProductWorkingprocedureRelationController { @GetMapping("{productId}") @ApiOperation("查询所有工序 依据产品id") - @LogOperation("查询所有工序 依据产品id") + //@LogOperation("查询所有工序 依据产品id") public Result> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){ List list = productWorkingprocedureRelationService.getWorkingprocedureByProductId(productId); return new Result>().ok(list); @@ -124,7 +125,7 @@ public class ProductWorkingprocedureRelationController { @PostMapping("batchInsertWorkingprocedure") @ApiOperation("添加工序流程") - @LogOperation("添加工序流程") + //@LogOperation("添加工序流程") //@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:batchInsertWorkingprocedure')") public Result batchInsertWorkingprocedure(@RequestBody ProductWorkingprocedureRelationDTO[] lists){ diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java index 56b2dca..cd52506 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ShiftController.java @@ -46,7 +46,8 @@ public class ShiftController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:shift:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +67,7 @@ public class ShiftController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:shift:save')") public Result save(@RequestBody ShiftDTO dto){ //效验数据 @@ -79,7 +80,7 @@ public class ShiftController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:shift:update')") public Result update(@RequestBody ShiftDTO dto){ //效验数据 @@ -92,7 +93,7 @@ public class ShiftController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:shift:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +106,7 @@ public class ShiftController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:shift:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = shiftService.list(params); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java index 4795316..f8edad8 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/TeamController.java @@ -46,7 +46,8 @@ public class TeamController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "id", value = "id", paramType = "query", dataTypeClass = Long.class) }) //@PreAuthorize("@ex.hasAuthority('code:team:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +67,7 @@ public class TeamController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:team:save')") public Result save(@RequestBody TeamDTO dto){ //效验数据 @@ -79,7 +80,7 @@ public class TeamController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:team:update')") public Result update(@RequestBody TeamDTO dto){ //效验数据 @@ -92,7 +93,7 @@ public class TeamController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:team:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +106,7 @@ public class TeamController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:team:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = teamService.list(params); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java index 798631d..25c759d 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,8 @@ public class UnitController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:unit:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +68,7 @@ public class UnitController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:unit:save')") public Result save(@RequestBody UnitDTO dto){ //效验数据 @@ -79,7 +81,7 @@ public class UnitController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:unit:update')") public Result update(@RequestBody UnitDTO dto){ //效验数据 @@ -92,7 +94,7 @@ public class UnitController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:unit:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +107,7 @@ public class UnitController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:unit:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = unitService.list(params); @@ -113,11 +115,11 @@ public class UnitController { ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - unitService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + unitService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java index 2d31fab..58dbb84 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,10 @@ public class WorkingProcedureController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "code", value = "编码", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +70,7 @@ public class WorkingProcedureController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')") public Result save(@RequestBody WorkingProcedureDTO dto){ //效验数据 @@ -79,7 +83,7 @@ public class WorkingProcedureController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')") public Result update(@RequestBody WorkingProcedureDTO dto){ //效验数据 @@ -92,7 +96,7 @@ public class WorkingProcedureController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +109,7 @@ public class WorkingProcedureController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:workingProcedure:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = workingProcedureService.list(params); @@ -113,18 +117,18 @@ public class WorkingProcedureController { ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - workingProcedureService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + workingProcedureService.changeStatus(id.getId()); return new Result(); } @GetMapping("getWorkingprocedureByProductId") @ApiOperation("查询所有工序 依据产品id") - @LogOperation("查询所有工序 依据产品id") + //@LogOperation("查询所有工序 依据产品id") public Result> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){ List list = workingProcedureService.getWorkingProcedureByProductId(productId); return new Result>().ok(list); diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java index 3398c8c..89a57df 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java @@ -1,6 +1,7 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; +import com.cnbm.admin.params.IdParam; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -46,7 +47,8 @@ public class WorkingProcedureTypeController { @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) , - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), + @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:page')") public Result> page(@ApiIgnore @RequestParam Map params){ @@ -66,7 +68,7 @@ public class WorkingProcedureTypeController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") + //@LogOperation("保存") //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')") public Result save(@RequestBody WorkingProcedureTypeDTO dto){ //效验数据 @@ -79,7 +81,7 @@ public class WorkingProcedureTypeController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") + //@LogOperation("修改") //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')") public Result update(@RequestBody WorkingProcedureTypeDTO dto){ //效验数据 @@ -92,7 +94,7 @@ public class WorkingProcedureTypeController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") + //@LogOperation("删除") //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')") public Result delete(@RequestBody Long[] ids){ //效验数据 @@ -105,7 +107,7 @@ public class WorkingProcedureTypeController { @GetMapping("export") @ApiOperation("导出") - @LogOperation("导出") + //@LogOperation("导出") //@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = workingProcedureTypeService.list(params); @@ -113,11 +115,11 @@ public class WorkingProcedureTypeController { ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class); } - @GetMapping("status") + @PostMapping("status") @ApiOperation("改变状态") - @LogOperation("改变状态") - public Result changeStatus(@PathVariable("id") Long id){ - workingProcedureTypeService.changeStatus(id); + //@LogOperation("改变状态") + public Result changeStatus(@RequestBody IdParam id){ + workingProcedureTypeService.changeStatus(id.getId()); return new Result(); } diff --git a/ym-baisc/src/main/java/com/cnbm/basic/dto/PlatformDTO.java b/ym-baisc/src/main/java/com/cnbm/basic/dto/PlatformDTO.java index 58ec213..8a6d859 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/dto/PlatformDTO.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/dto/PlatformDTO.java @@ -31,7 +31,7 @@ public class PlatformDTO implements Serializable { private String code; @ApiModelProperty(value = "站台分组") - private String group; + private String platformGroup; @ApiModelProperty(value = "1 可用，0 不可用") private Integer status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureDTO.java b/ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureDTO.java index 7c02a4b..5fcf4a5 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureDTO.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureDTO.java @@ -38,7 +38,7 @@ public class WorkingProcedureDTO implements Serializable { @ApiModelProperty(value = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"") private String machineId; - @ApiModelProperty(value = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"") + @ApiModelProperty(value = "机台id对应名称") private String machineName; @ApiModelProperty(value = "1 可用，0 不可用") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java b/ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java index 3433bcf..121e53d 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java @@ -30,7 +30,7 @@ public class Platform implements Serializable { private String code; @ApiModelProperty("站台分组") - private String group; + private String platformGroup; @ApiModelProperty("1 可用，0 不可用") private Integer status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java index 49283f4..6414557 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java @@ -20,7 +20,7 @@ public class PlatformExcel { @Excel(name = "站台编码") private String code; @Excel(name = "站台分组") - private String group; + private String platformGroup; @Excel(name = "1 可用，0 不可用") private Integer status; @Excel(name = "备注") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java index 8c96f86..06399d7 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java @@ -1,8 +1,16 @@ package com.cnbm.basic.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.cnbm.basic.dto.MachineDTO; +import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.Machine; +import com.cnbm.common.page.PageData; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; /** * 机台表 @@ -12,5 +20,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface MachineMapper extends BaseDao { - + PageData page(Page page, @Param("param") Map params); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java index fdfc792..830d29b 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java @@ -17,5 +17,5 @@ import java.util.Map; */ @Mapper public interface ProductMapper extends BaseDao { - IPage page(Map params); +// IPage page(Map params); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java index 00cc9c7..774b8ae 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java @@ -24,5 +24,5 @@ public interface IFactoryService extends CrudService { void delete(Long[] ids); - void changeStatus(Long id); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java index 303bd02..8c90524 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java @@ -1,5 +1,6 @@ package com.cnbm.basic.service; +import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.page.PageData; import com.cnbm.common.service.CrudService; import com.cnbm.basic.dto.MachineDTO; @@ -16,6 +17,8 @@ import java.util.Map; public interface IMachineService extends CrudService { PageData page (Map params); + PageData page1 (Map params); + MachineDTO get(Long id); void save(MachineDTO dto); @@ -24,5 +27,5 @@ public interface IMachineService extends CrudService { void delete(Long[] ids); - void changeStatus(Long id); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java index ccbf37e..dc580ac 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java @@ -24,5 +24,5 @@ public interface IMeasureToolService extends CrudService { void delete(Long[] ids); - void changeStatus(Long id); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java index bef0aa7..d162a62 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java @@ -24,5 +24,5 @@ public interface IProductTypeService extends CrudService { void update(UnitDTO dto); - void changeStatus(Long id); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java index 208b727..277f6e8 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java @@ -25,7 +25,7 @@ public interface IWorkingProcedureService extends CrudService getWorkingProcedureByProductId(Long productId); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureTypeService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureTypeService.java index 3c805cd..409b67d 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureTypeService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureTypeService.java @@ -24,5 +24,5 @@ public interface IWorkingProcedureTypeService extends CrudService implements IMachineService { +public class MachineServiceImpl extends CrudServiceImpl implements IMachineService { + + @Autowired + private MachineMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -37,24 +44,43 @@ public class MachineServiceImpl extends CrudServiceImpl page (Map params){ + public PageData page (Map params) { IPage page = baseDao.selectPage( getPage(params, "id", true), getWrapper(params) ); PageData machineDTOPageData = getPageData(page, MachineDTO.class); - if(machineDTOPageData.getTotal()!=0){ - for(MachineDTO machineDTO:machineDTOPageData.getList()){ - String platform_name = platformServiceImpl.selectById(machineDTO.getPlatformId()).getName(); - machineDTO.setPlatformName(platform_name); + + if (!machineDTOPageData.getList().isEmpty()) { + + for (MachineDTO machineDTO : machineDTOPageData.getList()) { + Platform platform = platformService.selectById(machineDTO.getPlatformId()); + String platformName = null; + if (platformName != null) { + platformName = platform.getName(); + + } + machineDTO.setPlatformName(platformName); } } return machineDTOPageData; } + @Override + public PageData page1 (Map params){ +// IPage page = baseDao.selectPage( +// getPage(params, "id", true), +// getWrapper(params) +// ); + return mapper.page(new Page<>(Integer.parseInt(params.get("page").toString()), Integer.parseInt(params.get("limit").toString())), + params); + } + + + @Override public MachineDTO get(Long id) { Machine entity = baseDao.selectById(id); @@ -84,14 +110,12 @@ public class MachineServiceImpl extends CrudServiceImpl implements IProductService { - //@Autowired - //ProductMapper mapper; + @Autowired + ProductMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -59,10 +60,15 @@ public class ProductServiceImpl extends CrudServiceImpl productDTOPageData = getPageData(page,ProductDTO.class); - if(productDTOPageData.getTotal()!=0){ + + if(!productDTOPageData.getList().isEmpty()){ for(ProductDTO productDTO:productDTOPageData.getList()){ - String productType = productTypeService.selectById(productDTO.getProductTypeId()).getName(); - productDTO.setProductType(productType); + ProductType productType = productTypeService.selectById(productDTO.getProductTypeId()); + String productTypeName = null; + if (productType!=null){ + productTypeName = productType.getName(); + } + productDTO.setProductType(productTypeName); } } return productDTOPageData; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java index 41fe626..e58e7f6 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java @@ -50,11 +50,6 @@ public class ProductTypeServiceImpl extends CrudServiceImpl page (Map params){ - //QueryWrapper wrapper = new QueryWrapper<>(); - //wrapper.eq("id",params.get("id")); - //IPage page = productTypeMapper.page(getPage(params, Constant.CREATE_DATE, false), params); - //return getPageData(page,ProductTypeDTO.class); - IPage page = baseDao.selectPage( getPage(params, "id", true), getWrapper(params) @@ -91,12 +86,12 @@ public class ProductTypeServiceImpl extends CrudServiceImpl @Override @Transactional(rollbackFor = Exception.class) - public void changeStatus(Long id) { + public boolean changeStatus(Long id) { //改变状态 开启1 关闭0 Unit entity = baseDao.selectById(id); Integer status = 1 - entity.getStatus(); entity.setStatus(status); - updateById(entity); + return updateById(entity); } } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java index a9c287f..051e59f 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.cnbm.basic.entity.ProductWorkingprocedureRelation; +import com.cnbm.basic.entity.WorkingProcedureType; import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; @@ -58,12 +59,18 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl workingProcedureDTOPageData = getPageData(page, WorkingProcedureDTO.class); - if(workingProcedureDTOPageData.getTotal()!=0){ + if(workingProcedureDTOPageData.getList().isEmpty()){ for(WorkingProcedureDTO workingProcedureDTO:workingProcedureDTOPageData.getList()){ //工序类型 id,关联working_procedure_type表 - String workingProcedureTypeName = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()).getName(); + WorkingProcedureType workingProcedureType = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()); + String workingProcedureTypeName = null; + if(workingProcedureType!=null){ + workingProcedureTypeName = workingProcedureType.getName(); + } workingProcedureDTO.setWorkingProcedureTypeName(workingProcedureTypeName); - //机台 + + //机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，"id1,id2,... + //String machineNameList = null; if(StringUtils.isNotBlank(workingProcedureDTO.getMachineId())){ String[] machineIdList = workingProcedureDTO.getMachineId().split(","); ArrayList machineList = new ArrayList<>(); @@ -71,11 +78,14 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl machineQueryWrapper = new QueryWrapper<>(); //machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId); String machineName = machineServiceImpl.selectById(machineId).getName(); - machineList.add(machineName); + if(machineName!=null) { + machineList.add(machineName); + } } String machineNameList = String.join(",", machineList); workingProcedureDTO.setMachineName(machineNameList); } + } } return workingProcedureDTOPageData; @@ -110,12 +120,12 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl + + + + + + + + + + -- 2.45.2