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

Merge pull request 'mapper' (#6) from yanyang into master

Browse Source 
Reviewed-on: #6
This commit is contained in:
闫阳 2022-08-03 16:54:20 +08:00
commit 959b1a0b77
40 changed files with 324 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java
View File

@ -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<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<FactoryDTO> 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();
}

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

@ -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<PageData<MachineDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
@ -55,6 +58,22 @@ public class MachineController {
return new Result<PageData<MachineDTO>>().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<PageData<MachineVo>> page2(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MachineVo> page = machineService.page1(params);
return new Result<PageData<MachineVo>>().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<String, Object> params, HttpServletResponse response) throws Exception {
List<MachineDTO> 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);
}

22
ym-baisc/src/main/java/com/cnbm/basic/controller/MeasureToolController.java
View File

@ -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<PageData<MeasureToolDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<MeasureToolDTO> 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();
}

20
ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java
View File

@ -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<PageData<PlatformDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<PlatformDTO> 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();
}

17
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
View File

@ -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<PageData<ProductDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductDTO> 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());

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

@ -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<PageData<ProductFactoryRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductFactoryRelationDTO> list = productFactoryRelationService.list(params);

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

@ -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<PageData<ProductFeaturesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductFeaturesDTO> list = productFeaturesService.list(params);

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

@ -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<PageData<ProductFeaturesHisDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductFeaturesHisDTO> list = productFeaturesHisService.list(params);

22
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductTypeController.java
View File

@ -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<PageData<ProductTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductTypeDTO> 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();
}

15
ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java
View File

@ -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<PageData<ProductWorkingprocedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.list(params);
@ -116,7 +117,7 @@ public class ProductWorkingprocedureRelationController {
@GetMapping("{productId}")
@ApiOperation("查询所有工序 依据产品id")
@LogOperation("查询所有工序 依据产品id")
//@LogOperation("查询所有工序 依据产品id")
public Result<List<ProductWorkingprocedureRelationDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.getWorkingprocedureByProductId(productId);
return new Result<List<ProductWorkingprocedureRelationDTO>>().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){

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

@ -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<PageData<ShiftDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<ShiftDTO> list = shiftService.list(params);

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

@ -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<PageData<TeamDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<TeamDTO> list = teamService.list(params);

20
ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java
View File

@ -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<PageData<UnitDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<UnitDTO> 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();
}

24
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java
View File

@ -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<PageData<WorkingProcedureDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<WorkingProcedureDTO> 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<List<WorkingProcedureDTO>> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){
List<WorkingProcedureDTO> list = workingProcedureService.getWorkingProcedureByProductId(productId);
return new Result<List<WorkingProcedureDTO>>().ok(list);

20
ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java
View File

@ -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<PageData<WorkingProcedureTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> 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<String, Object> params, HttpServletResponse response) throws Exception {
List<WorkingProcedureTypeDTO> 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();
}

2
ym-baisc/src/main/java/com/cnbm/basic/dto/PlatformDTO.java
View File

@ -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;

2
ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureDTO.java
View File

@ -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 不可用")

2
ym-baisc/src/main/java/com/cnbm/basic/entity/Platform.java
View File

@ -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;

2
ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java
View File

@ -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 = "备注")

10
ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java
View File

@ -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<Machine> {
PageData<MachineVo> page(Page<?> page, @Param("param") Map<String, Object> params);
}

2
ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductMapper.java
View File

@ -17,5 +17,5 @@ import java.util.Map;
*/
@Mapper
public interface ProductMapper extends BaseDao<Product> {
IPage<ProductDTO> page(Map<String, Object> params);
// IPage<ProductDTO> page(Map<String, Object> params);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java
View File

@ -24,5 +24,5 @@ public interface IFactoryService extends CrudService<Factory, FactoryDTO> {
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

5
ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java
View File

@ -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<Machine, MachineDTO> {
PageData<MachineDTO> page (Map<String, Object> params);
PageData<MachineVo> page1 (Map<String, Object> params);
MachineDTO get(Long id);
void save(MachineDTO dto);
@ -24,5 +27,5 @@ public interface IMachineService extends CrudService<Machine, MachineDTO> {
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IMeasureToolService.java
View File

@ -24,5 +24,5 @@ public interface IMeasureToolService extends CrudService<MeasureTool, MeasureToo
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java
View File

@ -24,5 +24,5 @@ public interface IPlatformService extends CrudService<Platform, PlatformDTO> {
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java
View File

@ -24,5 +24,5 @@ public interface IProductTypeService extends CrudService<ProductType, ProductTyp
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java
View File

@ -22,5 +22,5 @@ public interface IUnitService extends CrudService<Unit, UnitDTO> {
void update(UnitDTO dto);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java
View File

@ -25,7 +25,7 @@ public interface IWorkingProcedureService extends CrudService<WorkingProcedure,
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
List<WorkingProcedureDTO> getWorkingProcedureByProductId(Long productId);
}

2
ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureTypeService.java
View File

@ -24,5 +24,5 @@ public interface IWorkingProcedureTypeService extends CrudService<WorkingProcedu
void delete(Long[] ids);
void changeStatus(Long id);
boolean changeStatus(Long id);
}

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java
View File

@ -82,12 +82,12 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
Factory entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
}

46
ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java
View File

@ -3,6 +3,9 @@ package com.cnbm.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cnbm.basic.entity.Platform;
import com.cnbm.basic.vo.MachineVo;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.MachineDTO;
@ -10,6 +13,7 @@ import com.cnbm.basic.mapper.MachineMapper;
import com.cnbm.basic.entity.Machine;
import com.cnbm.basic.service.IMachineService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -25,7 +29,10 @@ import java.util.Map;
* @since 2022-07-15
*/
@Service
public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine, MachineDTO> implements IMachineService {
public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine, MachineDTO> implements IMachineService {
@Autowired
private MachineMapper mapper;
@Override
public QueryWrapper<Machine> getWrapper(Map<String, Object> params){
@ -37,24 +44,43 @@ public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine,
}
@Autowired
private PlatformServiceImpl platformServiceImpl;
private PlatformServiceImpl platformService;
@Override
public PageData<MachineDTO> page (Map<String, Object> params){
public PageData<MachineDTO> page (Map<String, Object> params) {
IPage<Machine> page = baseDao.selectPage(
getPage(params, "id", true),
getWrapper(params)
);
PageData<MachineDTO> 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<MachineVo> page1 (Map<String, Object> params){
// IPage<Machine> 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<MachineMapper, Machine,
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
Machine entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
//return updateById(entity);
return updateById(entity);
}
}

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java
View File

@ -70,12 +70,12 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
MeasureTool entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
}

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java
View File

@ -74,12 +74,12 @@ public class PlatformServiceImpl extends CrudServiceImpl<PlatformMapper, Platfor
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
Platform entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}

16
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cnbm.basic.entity.ProductType;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@ -28,8 +29,8 @@ import java.util.Map;
@Service
public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product, ProductDTO> implements IProductService {
//@Autowired
//ProductMapper mapper;
@Autowired
ProductMapper mapper;
@Override
public QueryWrapper<Product> getWrapper(Map<String, Object> params){
@ -59,10 +60,15 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
getWrapper(params)
);
PageData<ProductDTO> 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;

9
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java
View File

@ -50,11 +50,6 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
@Override
public PageData<ProductTypeDTO> page (Map<String, Object> params){
//QueryWrapper<ProductTypeDTO> wrapper = new QueryWrapper<>();
//wrapper.eq("id",params.get("id"));
//IPage<ProductTypeDTO> page = productTypeMapper.page(getPage(params, Constant.CREATE_DATE, false), params);
//return getPageData(page,ProductTypeDTO.class);
IPage<ProductType> page = baseDao.selectPage(
getPage(params, "id", true),
getWrapper(params)
@ -91,12 +86,12 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
ProductType entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
}

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java
View File

@ -65,11 +65,11 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
@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);
}
}

22
ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java
View File

@ -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<WorkingProcedur
getWrapper(params)
);
PageData<WorkingProcedureDTO> 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<String> machineList = new ArrayList<>();
@ -71,11 +78,14 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
//QueryWrapper<Machine> 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<WorkingProcedur
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
WorkingProcedure entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
@Autowired

4
ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java
View File

@ -74,12 +74,12 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
public boolean changeStatus(Long id) {
//改变状态 开启1 关闭0
WorkingProcedureType entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
return updateById(entity);
}
}

45
ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java Normal file
View File

@ -0,0 +1,45 @@
package com.cnbm.basic.vo;
import com.cnbm.basic.dto.MachineDTO;
import com.cnbm.common.page.PageData;
import com.cnbm.common.vo.CommonVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 机台表
*
* @author yanyang
* @since 2022-08-02
*/
@Data
@ApiModel(value = "机台表DTO对象")
public class MachineVo extends MachineDTO {
// private static final long serialVersionUID = 1L;
// @ApiModelProperty(value = "ID")
// private Long id;
//
// @ApiModelProperty(value = "机台名")
// private String name;
//
// @ApiModelProperty(value = "机台编码")
// private String code;
//
// @ApiModelProperty(value = "机台id，关联platform id")
// private Long platformId;
@ApiModelProperty(value = "机台名称，关联platform id")
private String platformName;
// @ApiModelProperty(value = "1 可用，0 不可用")
// private Integer status;
//
// @ApiModelProperty(value = "备注")
// private String remark;
}

16
ym-baisc/src/main/resources/MachineMapper.xml
View File

@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cnbm.basic.mapper.MachineMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.cnbm.basic.dto.MachineDTO">
<id column="ID" property="id" />
<result column="CODE" property="code" />
<result column="NAME" property="name" />
<result column="REMARK" property="remark" />
<result column="STATUS" property="status" />
<result column="platformName" property="platformName" />
</resultMap>
<select id="page" resultMap="BaseResultMap">
select m.id,m.code,m.name,m.remark,m.status,p.name as platformName
from machine m
LEFT JOIN platform p ON p.id=m.platform_id
<where>
</where>
</select>
</mapper>