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

Compare commits

base: CaiXiang:bac1ec5b70a7322bdeffe73a9f6ec8f647acd6a2
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:ylc
..
compare: CaiXiang:297d5f04ea12c5bda7e9fe543b42f6b95098e2cd
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:ylc

No commits in common. "bac1ec5b70a7322bdeffe73a9f6ec8f647acd6a2" and "297d5f04ea12c5bda7e9fe543b42f6b95098e2cd" have entirely different histories.
bac1ec5b70 ... 297d5f04ea

127 changed files with 649 additions and 4281 deletions
Show Stats Expand all files Collapse all files

1
pom.xml
View File

@ -16,7 +16,6 @@
<module>ym-schedule-task</module>
<module>ym-influx</module>
<module>ym-quality-planning</module>
<module>ym-process-inspection</module>
</modules>
<packaging>pom</packaging>

1
ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java
View File

@ -73,7 +73,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/webjars/**",
"/websocket/**",
"/influx/**",
"/processInspection/**",
"/captcha").anonymous()
// .antMatchers("/testCors").hasAuthority("system:dept:list222")
// 除上面外的所有请求全部需要鉴权认证

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

@ -48,7 +48,7 @@ public class FactoryController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:factory:page')")
@PreAuthorize("@ex.hasAuthority('code:factory:page')")
public Result<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<FactoryDTO> page = factoryService.page(params);
@ -57,7 +57,7 @@ public class FactoryController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:factory:info')")
@PreAuthorize("@ex.hasAuthority('code:factory:info')")
public Result<FactoryDTO> get(@PathVariable("id") Long id){
FactoryDTO data = factoryService.get(id);
@ -67,7 +67,7 @@ public class FactoryController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:factory:save')")
@PreAuthorize("@ex.hasAuthority('code:factory:save')")
public Result save(@RequestBody FactoryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class FactoryController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:factory:update')")
@PreAuthorize("@ex.hasAuthority('code:factory:update')")
public Result update(@RequestBody FactoryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class FactoryController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:factory:delete')")
@PreAuthorize("@ex.hasAuthority('code:factory:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class FactoryController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:factory:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -48,7 +48,7 @@ public class MachineController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:machine:page')")
@PreAuthorize("@ex.hasAuthority('code:machine:page')")
public Result<PageData<MachineDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MachineDTO> page = machineService.page(params);
@ -57,7 +57,7 @@ public class MachineController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:machine:info')")
@PreAuthorize("@ex.hasAuthority('code:machine:info')")
public Result<MachineDTO> get(@PathVariable("id") Long id){
MachineDTO data = machineService.get(id);
@ -67,7 +67,7 @@ public class MachineController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:machine:save')")
@PreAuthorize("@ex.hasAuthority('code:machine:save')")
public Result save(@RequestBody MachineDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class MachineController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:machine:update')")
@PreAuthorize("@ex.hasAuthority('code:machine:update')")
public Result update(@RequestBody MachineDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class MachineController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:machine:delete')")
@PreAuthorize("@ex.hasAuthority('code:machine:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class MachineController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:machine:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -48,7 +48,7 @@ public class MeasureToolController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:measureTool:page')")
@PreAuthorize("@ex.hasAuthority('code:measureTool:page')")
public Result<PageData<MeasureToolDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<MeasureToolDTO> page = measureToolService.page(params);
@ -57,7 +57,7 @@ public class MeasureToolController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:measureTool:info')")
@PreAuthorize("@ex.hasAuthority('code:measureTool:info')")
public Result<MeasureToolDTO> get(@PathVariable("id") Long id){
MeasureToolDTO data = measureToolService.get(id);
@ -67,7 +67,7 @@ public class MeasureToolController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:measureTool:save')")
@PreAuthorize("@ex.hasAuthority('code:measureTool:save')")
public Result save(@RequestBody MeasureToolDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class MeasureToolController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:measureTool:update')")
@PreAuthorize("@ex.hasAuthority('code:measureTool:update')")
public Result update(@RequestBody MeasureToolDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class MeasureToolController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:measureTool:delete')")
@PreAuthorize("@ex.hasAuthority('code:measureTool:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class MeasureToolController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:measureTool:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, MeasureToolExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -48,7 +48,7 @@ public class PlatformController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:platform:page')")
@PreAuthorize("@ex.hasAuthority('code:platform:page')")
public Result<PageData<PlatformDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<PlatformDTO> page = platformService.page(params);
@ -57,7 +57,7 @@ public class PlatformController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:platform:info')")
@PreAuthorize("@ex.hasAuthority('code:platform:info')")
public Result<PlatformDTO> get(@PathVariable("id") Long id){
PlatformDTO data = platformService.get(id);
@ -67,7 +67,7 @@ public class PlatformController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:platform:save')")
@PreAuthorize("@ex.hasAuthority('code:platform:save')")
public Result save(@RequestBody PlatformDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class PlatformController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:platform:update')")
@PreAuthorize("@ex.hasAuthority('code:platform:update')")
public Result update(@RequestBody PlatformDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class PlatformController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:platform:delete')")
@PreAuthorize("@ex.hasAuthority('code:platform:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class PlatformController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:platform:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -1,125 +0,0 @@
package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
import com.cnbm.common.utils.Result;
import com.cnbm.common.validator.AssertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.excel.ProductExcel;
import com.cnbm.basic.service.IProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 产品 表 前端控制器
*
* @author why
* @since 2022-07-11
*/
@RestController
@RequestMapping("/code/product")
@Api(tags="产品 表")
public class ProductController {
@Autowired
private IProductService productService;
@GetMapping("page")
@ApiOperation("分页")
@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)
})
//@PreAuthorize("@ex.hasAuthority('code:product:page')")
public Result<PageData<ProductDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductDTO> page = productService.page(params);
return new Result<PageData<ProductDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:product:info')")
public Result<ProductDTO> get(@PathVariable("id") Long id){
ProductDTO data = productService.get(id);
return new Result<ProductDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:product:save')")
public Result save(@RequestBody ProductDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
productService.save(dto);
return new Result();
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:product:update')")
public Result update(@RequestBody ProductDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
productService.update(dto);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:product:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
productService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, ProductExcel.class);
}
@GetMapping("status")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
productService.changeStatus(id);
return new Result();
}
}

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

@ -1,116 +0,0 @@
package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
import com.cnbm.common.utils.Result;
import com.cnbm.common.validator.AssertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.basic.dto.ProductFactoryRelationDTO;
import com.cnbm.basic.excel.ProductFactoryRelationExcel;
import com.cnbm.basic.service.IProductFactoryRelationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 产品-工厂 关系表 前端控制器
*
* @author why
* @since 2022-07-27
*/
@RestController
@RequestMapping("/code/productFactoryRelation")
@Api(tags="产品-工厂 关系表")
public class ProductFactoryRelationController {
@Autowired
private IProductFactoryRelationService productFactoryRelationService;
@GetMapping("page")
@ApiOperation("分页")
@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)
})
//@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:page')")
public Result<PageData<ProductFactoryRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductFactoryRelationDTO> page = productFactoryRelationService.page(params);
return new Result<PageData<ProductFactoryRelationDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:info')")
public Result<ProductFactoryRelationDTO> get(@PathVariable("id") Long id){
ProductFactoryRelationDTO data = productFactoryRelationService.get(id);
return new Result<ProductFactoryRelationDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:save')")
public Result save(@RequestBody ProductFactoryRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
productFactoryRelationService.save(dto);
return new Result();
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:update')")
public Result update(@RequestBody ProductFactoryRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
productFactoryRelationService.update(dto);
return new Result();
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:productFactoryRelation:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
productFactoryRelationService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, ProductFactoryRelationExcel.class);
}
}

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

@ -48,7 +48,7 @@ public class ProductFeaturesController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:page')")
@PreAuthorize("@ex.hasAuthority('code:productFeatures:page')")
public Result<PageData<ProductFeaturesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductFeaturesDTO> page = productFeaturesService.page(params);
@ -57,7 +57,7 @@ public class ProductFeaturesController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:info')")
@PreAuthorize("@ex.hasAuthority('code:productFeatures:info')")
public Result<ProductFeaturesDTO> get(@PathVariable("id") Long id){
ProductFeaturesDTO data = productFeaturesService.get(id);
@ -67,7 +67,7 @@ public class ProductFeaturesController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:save')")
@PreAuthorize("@ex.hasAuthority('code:productFeatures:save')")
public Result save(@RequestBody ProductFeaturesDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class ProductFeaturesController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:update')")
@PreAuthorize("@ex.hasAuthority('code:productFeatures:update')")
public Result update(@RequestBody ProductFeaturesDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class ProductFeaturesController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:delete')")
@PreAuthorize("@ex.hasAuthority('code:productFeatures:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,7 +106,7 @@ public class ProductFeaturesController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:productFeatures:export')")
@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);

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

@ -48,7 +48,7 @@ public class ProductFeaturesHisController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:page')")
@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:page')")
public Result<PageData<ProductFeaturesHisDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductFeaturesHisDTO> page = productFeaturesHisService.page(params);
@ -57,7 +57,7 @@ public class ProductFeaturesHisController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:info')")
@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:info')")
public Result<ProductFeaturesHisDTO> get(@PathVariable("id") Long id){
ProductFeaturesHisDTO data = productFeaturesHisService.get(id);
@ -67,7 +67,7 @@ public class ProductFeaturesHisController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')")
@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')")
public Result save(@RequestBody ProductFeaturesHisDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class ProductFeaturesHisController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')")
@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')")
public Result update(@RequestBody ProductFeaturesHisDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class ProductFeaturesHisController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')")
@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,7 +106,7 @@ public class ProductFeaturesHisController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:export')")
@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);

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

@ -114,7 +114,7 @@ public class ProductTypeController {
ExcelUtils.exportExcelToTarget(response, null, list, ProductTypeExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -1,7 +1,6 @@
package com.cnbm.basic.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.basic.dto.WorkingProcedureDTO;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
@ -36,7 +35,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/code/productWorkingprocedureRelation")
@Api(tags="产品-工序 关系表")
@Api(tags="工序 表")
public class ProductWorkingprocedureRelationController {
@Autowired
private IProductWorkingprocedureRelationService productWorkingprocedureRelationService;
@ -49,7 +48,7 @@ public class ProductWorkingprocedureRelationController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:page')")
@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:page')")
public Result<PageData<ProductWorkingprocedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductWorkingprocedureRelationDTO> page = productWorkingprocedureRelationService.page(params);
@ -58,17 +57,17 @@ public class ProductWorkingprocedureRelationController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:info')")
@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:info')")
public Result<ProductWorkingprocedureRelationDTO> get(@PathVariable("id") Long id){
ProductWorkingprocedureRelationDTO data = productWorkingprocedureRelationService.get(id);
return new Result<ProductWorkingprocedureRelationDTO>().ok(data);
}
@PostMapping("save")
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')")
@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')")
public Result save(@RequestBody ProductWorkingprocedureRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -81,7 +80,7 @@ public class ProductWorkingprocedureRelationController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')")
@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')")
public Result update(@RequestBody ProductWorkingprocedureRelationDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -94,7 +93,7 @@ public class ProductWorkingprocedureRelationController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')")
@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -107,30 +106,11 @@ public class ProductWorkingprocedureRelationController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, ProductWorkingprocedureRelationExcel.class);
}
@GetMapping("{productId}")
@ApiOperation("查询所有工序 依据产品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);
}
@PostMapping("batchInsertWorkingprocedure")
@ApiOperation("添加工序流程")
@LogOperation("添加工序流程")
//@PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:batchInsertWorkingprocedure')")
public Result batchInsertWorkingprocedure(@RequestBody ProductWorkingprocedureRelationDTO[] lists){
productWorkingprocedureRelationService.batchInsertWorkingprocedure(lists);
return new Result();
}
}

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

@ -48,7 +48,7 @@ public class ShiftController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:shift:page')")
@PreAuthorize("@ex.hasAuthority('code:shift:page')")
public Result<PageData<ShiftDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ShiftDTO> page = shiftService.page(params);
@ -57,7 +57,7 @@ public class ShiftController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:shift:info')")
@PreAuthorize("@ex.hasAuthority('code:shift:info')")
public Result<ShiftDTO> get(@PathVariable("id") Long id){
ShiftDTO data = shiftService.get(id);
@ -67,7 +67,7 @@ public class ShiftController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:shift:save')")
@PreAuthorize("@ex.hasAuthority('code:shift:save')")
public Result save(@RequestBody ShiftDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class ShiftController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:shift:update')")
@PreAuthorize("@ex.hasAuthority('code:shift:update')")
public Result update(@RequestBody ShiftDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class ShiftController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:shift:delete')")
@PreAuthorize("@ex.hasAuthority('code:shift:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,7 +106,7 @@ public class ShiftController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:shift:export')")
@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);

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

@ -48,7 +48,7 @@ public class TeamController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:team:page')")
@PreAuthorize("@ex.hasAuthority('code:team:page')")
public Result<PageData<TeamDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<TeamDTO> page = teamService.page(params);
@ -57,7 +57,7 @@ public class TeamController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:team:info')")
@PreAuthorize("@ex.hasAuthority('code:team:info')")
public Result<TeamDTO> get(@PathVariable("id") Long id){
TeamDTO data = teamService.get(id);
@ -67,7 +67,7 @@ public class TeamController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:team:save')")
@PreAuthorize("@ex.hasAuthority('code:team:save')")
public Result save(@RequestBody TeamDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class TeamController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:team:update')")
@PreAuthorize("@ex.hasAuthority('code:team:update')")
public Result update(@RequestBody TeamDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class TeamController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:team:delete')")
@PreAuthorize("@ex.hasAuthority('code:team:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,7 +106,7 @@ public class TeamController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:team:export')")
@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);

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

@ -48,7 +48,7 @@ public class UnitController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:unit:page')")
@PreAuthorize("@ex.hasAuthority('code:unit:page')")
public Result<PageData<UnitDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<UnitDTO> page = unitService.page(params);
@ -57,7 +57,7 @@ public class UnitController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:unit:info')")
@PreAuthorize("@ex.hasAuthority('code:unit:info')")
public Result<UnitDTO> get(@PathVariable("id") Long id){
UnitDTO data = unitService.get(id);
@ -67,7 +67,7 @@ public class UnitController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:unit:save')")
@PreAuthorize("@ex.hasAuthority('code:unit:save')")
public Result save(@RequestBody UnitDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class UnitController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:unit:update')")
@PreAuthorize("@ex.hasAuthority('code:unit:update')")
public Result update(@RequestBody UnitDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class UnitController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:unit:delete')")
@PreAuthorize("@ex.hasAuthority('code:unit:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class UnitController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:unit:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

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

@ -48,7 +48,7 @@ public class WorkingProcedureController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:page')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedure:page')")
public Result<PageData<WorkingProcedureDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WorkingProcedureDTO> page = workingProcedureService.page(params);
@ -57,7 +57,7 @@ public class WorkingProcedureController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:info')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedure:info')")
public Result<WorkingProcedureDTO> get(@PathVariable("id") Long id){
WorkingProcedureDTO data = workingProcedureService.get(id);
@ -67,7 +67,7 @@ public class WorkingProcedureController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')")
public Result save(@RequestBody WorkingProcedureDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class WorkingProcedureController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')")
public Result update(@RequestBody WorkingProcedureDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class WorkingProcedureController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class WorkingProcedureController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedure:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){
@ -122,12 +122,4 @@ public class WorkingProcedureController {
return new Result();
}
@GetMapping("getWorkingprocedureByProductId")
@ApiOperation("查询所有工序 依据产品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);
}
}

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

@ -48,7 +48,7 @@ public class WorkingProcedureTypeController {
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:page')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:page')")
public Result<PageData<WorkingProcedureTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WorkingProcedureTypeDTO> page = workingProcedureTypeService.page(params);
@ -57,7 +57,7 @@ public class WorkingProcedureTypeController {
@GetMapping("{id}")
@ApiOperation("信息")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:info')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:info')")
public Result<WorkingProcedureTypeDTO> get(@PathVariable("id") Long id){
WorkingProcedureTypeDTO data = workingProcedureTypeService.get(id);
@ -67,7 +67,7 @@ public class WorkingProcedureTypeController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')")
public Result save(@RequestBody WorkingProcedureTypeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -80,7 +80,7 @@ public class WorkingProcedureTypeController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')")
public Result update(@RequestBody WorkingProcedureTypeDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -93,7 +93,7 @@ public class WorkingProcedureTypeController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')")
@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
@ -106,14 +106,14 @@ public class WorkingProcedureTypeController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
//@PreAuthorize("@ex.hasAuthority('code:workingProcedureType:export')")
@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);
ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class);
}
@GetMapping("status")
@GetMapping("{statusId}")
@ApiOperation("改变状态")
@LogOperation("改变状态")
public Result changeStatus(@PathVariable("id") Long id){

14
ym-baisc/src/main/java/com/cnbm/basic/dto/FactoryDTO.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 工厂 表
@ -22,7 +24,7 @@ public class FactoryDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "工厂 名")
private String name;
@ -40,16 +42,16 @@ public class FactoryDTO implements Serializable {
private String type;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -58,7 +60,7 @@ public class FactoryDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -67,6 +69,6 @@ public class FactoryDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

16
ym-baisc/src/main/java/com/cnbm/basic/dto/MachineDTO.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 机台表
@ -22,7 +24,7 @@ public class MachineDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "机台名")
private String name;
@ -31,22 +33,22 @@ public class MachineDTO implements Serializable {
private String code;
@ApiModelProperty(value = "机台id，关联platform id")
private Long platformId;
private BigDecimal platformId;
@ApiModelProperty(value = "机台名称，关联platform id")
private String platformName;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -55,7 +57,7 @@ public class MachineDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -64,6 +66,6 @@ public class MachineDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

14
ym-baisc/src/main/java/com/cnbm/basic/dto/MeasureToolDTO.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 量具表
@ -22,7 +24,7 @@ public class MeasureToolDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "量具 名")
private String name;
@ -34,16 +36,16 @@ public class MeasureToolDTO implements Serializable {
private String type;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -52,7 +54,7 @@ public class MeasureToolDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -61,6 +63,6 @@ public class MeasureToolDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

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

@ -7,6 +7,8 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 站点表
@ -22,7 +24,7 @@ public class PlatformDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "站台名")
private String name;
@ -34,16 +36,16 @@ public class PlatformDTO implements Serializable {
private String group;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -52,7 +54,7 @@ public class PlatformDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -61,6 +63,6 @@ public class PlatformDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

85
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductDTO.java
View File

@ -1,85 +0,0 @@
package com.cnbm.basic.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
@Data
@ApiModel(value = "产品 表DTO对象")
public class ProductDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "ID")
private Long id;
@ApiModelProperty(value = "产品 名")
private String name;
@ApiModelProperty(value = "产品 编码")
private String code;
@ApiModelProperty(value = "产品 规格")
private String specifications;
@ApiModelProperty(value = "产品 图纸")
private String drawing;
@ApiModelProperty(value = "描述")
private String descs;
@ApiModelProperty(value = "产品类型id,关联product_type表")
private Long productTypeId;
@ApiModelProperty(value = "产品类型 名,product_type表")
private String productType;
@ApiModelProperty(value = "单位 id，关联unit表")
private Long unitId;
@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private String inspectionStage;
@ApiModelProperty(value = "检验标准")
private String inspectionStandard;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
}

63
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFactoryRelationDTO.java
View File

@ -1,63 +0,0 @@
package com.cnbm.basic.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
@Data
@ApiModel(value = "产品-工厂 关系表DTO对象")
public class ProductFactoryRelationDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "ID")
private Long id;
@ApiModelProperty(value = "产品id,关联product表")
private Long productId;
@ApiModelProperty(value = "工厂id,关联 factory 表")
private Long factoryId;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
}

36
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesDTO.java
View File

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 产品特性 表
*
@ -21,16 +24,16 @@ public class ProductFeaturesDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty(value = "量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@ApiModelProperty(value = "单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@ApiModelProperty(value = "产品特性 名")
private String name;
@ -39,10 +42,10 @@ public class ProductFeaturesDTO implements Serializable {
private String code;
@ApiModelProperty(value = "产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@ApiModelProperty(value = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@ApiModelProperty(value = "产品特性 规格")
private String specifications;
@ -57,22 +60,25 @@ public class ProductFeaturesDTO implements Serializable {
private Float usl;
@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@ApiModelProperty(value = "分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@ApiModelProperty(value = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@ApiModelProperty(value = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@ApiModelProperty(value = "采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty(value = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@ApiModelProperty(value = "目标cpk")
private Float targetCpk;
@ -84,10 +90,10 @@ public class ProductFeaturesDTO implements Serializable {
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -96,7 +102,7 @@ public class ProductFeaturesDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -105,6 +111,6 @@ public class ProductFeaturesDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

38
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductFeaturesHisDTO.java
View File

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 产品特性 历史表
*
@ -21,13 +24,13 @@ public class ProductFeaturesHisDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "产品特性id,关联product_features表")
private Long productFeaturesId;
private BigDecimal productFeaturesId;
@ApiModelProperty(value = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty(value = "产品特性 名")
private String name;
@ -36,16 +39,16 @@ public class ProductFeaturesHisDTO implements Serializable {
private String code;
@ApiModelProperty(value = "产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@ApiModelProperty(value = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@ApiModelProperty(value = "量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@ApiModelProperty(value = "单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@ApiModelProperty(value = "产品特性 规格")
private String specifications;
@ -60,22 +63,25 @@ public class ProductFeaturesHisDTO implements Serializable {
private Float usl;
@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@ApiModelProperty(value = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@ApiModelProperty(value = "分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@ApiModelProperty(value = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@ApiModelProperty(value = "采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty(value = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@ApiModelProperty(value = "目标cpk")
private Float targetCpk;
@ -87,10 +93,10 @@ public class ProductFeaturesHisDTO implements Serializable {
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -99,7 +105,7 @@ public class ProductFeaturesHisDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -108,6 +114,6 @@ public class ProductFeaturesHisDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductTypeDTO.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ -20,7 +21,7 @@ public class ProductTypeDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "产品类型 名")
private String name;
@ -32,16 +33,16 @@ public class ProductTypeDTO implements Serializable {
private String desc;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -50,7 +51,7 @@ public class ProductTypeDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -59,6 +60,6 @@ public class ProductTypeDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

26
ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java
View File

@ -7,6 +7,8 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 工序 表
@ -22,31 +24,31 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty(value = "工序id,关联 working_procedure 表")
private Long workingProcedureId;
@ApiModelProperty(value = "工序名称,关联 working_procedure 表")
private String workingProcedureName;
private BigDecimal workingProcedureId;
@ApiModelProperty(value = "顺序，工序是有先后顺序的。")
private Integer order;
private BigDecimal order;
@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -55,7 +57,7 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -64,6 +66,6 @@ public class ProductWorkingprocedureRelationDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/dto/ShiftDTO.java
View File

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 班次 表
*
@ -21,7 +24,7 @@ public class ShiftDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "班次 名")
private String name;
@ -33,16 +36,16 @@ public class ShiftDTO implements Serializable {
private String descs;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -51,7 +54,7 @@ public class ShiftDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -60,6 +63,6 @@ public class ShiftDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/dto/TeamDTO.java
View File

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 班组 表
*
@ -21,7 +24,7 @@ public class TeamDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "班组 名")
private String name;
@ -33,16 +36,16 @@ public class TeamDTO implements Serializable {
private String descs;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -51,7 +54,7 @@ public class TeamDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -60,6 +63,6 @@ public class TeamDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/dto/UnitDTO.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ -22,7 +23,7 @@ public class UnitDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "单位 名")
private String name;
@ -31,19 +32,19 @@ public class UnitDTO implements Serializable {
private String code;
@ApiModelProperty(value = "单位类型，1 可计数，2 不可计数")
private Integer type;
private BigDecimal type;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -52,7 +53,7 @@ public class UnitDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -61,6 +62,6 @@ public class UnitDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

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

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 工序 表
*
@ -21,7 +24,7 @@ public class WorkingProcedureDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "工序 名")
private String name;
@ -30,7 +33,7 @@ public class WorkingProcedureDTO implements Serializable {
private String code;
@ApiModelProperty(value = "工序类型 id,关联working_procedure_type表")
private Long workingProcedureTypeId;
private BigDecimal workingProcedureTypeId;
@ApiModelProperty(value = "工序类型 名,关联working_procedure_type表")
private String workingProcedureTypeName;
@ -42,16 +45,16 @@ public class WorkingProcedureDTO implements Serializable {
private String machineName;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -60,7 +63,7 @@ public class WorkingProcedureDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -69,6 +72,6 @@ public class WorkingProcedureDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/dto/WorkingProcedureTypeDTO.java
View File

@ -7,6 +7,9 @@ import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* 工序类型表 表
*
@ -21,7 +24,7 @@ public class WorkingProcedureTypeDTO implements Serializable {
@ApiModelProperty(value = "ID")
private Long id;
private BigDecimal id;
@ApiModelProperty(value = "工序类型 名")
private String name;
@ -30,16 +33,16 @@ public class WorkingProcedureTypeDTO implements Serializable {
private String code;
@ApiModelProperty(value = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ -48,7 +51,7 @@ public class WorkingProcedureTypeDTO implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ -57,6 +60,6 @@ public class WorkingProcedureTypeDTO implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Factory.java
View File

@ -1,6 +1,7 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +22,7 @@ public class Factory implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("工厂 名")
private String name;
@ -39,16 +40,16 @@ public class Factory implements Serializable {
private String type;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -57,7 +58,7 @@ public class Factory implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -66,7 +67,7 @@ public class Factory implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/Machine.java
View File

@ -1,6 +1,7 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +22,7 @@ public class Machine implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("机台名")
private String name;
@ -30,19 +31,19 @@ public class Machine implements Serializable {
private String code;
@ApiModelProperty("机台id，关联platform id")
private Long platformId;
private BigDecimal platformId;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -51,7 +52,7 @@ public class Machine implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -60,7 +61,7 @@ public class Machine implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/MeasureTool.java
View File

@ -2,6 +2,7 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -23,7 +24,7 @@ public class MeasureTool implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("量具 名")
private String name;
@ -35,16 +36,16 @@ public class MeasureTool implements Serializable {
private String type;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -53,7 +54,7 @@ public class MeasureTool implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -62,7 +63,7 @@ public class MeasureTool implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

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

@ -1,6 +1,7 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +22,7 @@ public class Platform implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("站台名")
private String name;
@ -33,16 +34,16 @@ public class Platform implements Serializable {
private String group;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -51,7 +52,7 @@ public class Platform implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -60,7 +61,7 @@ public class Platform implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

84
ym-baisc/src/main/java/com/cnbm/basic/entity/Product.java
View File

@ -1,84 +0,0 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 产品 表
* </p>
*
* @author why
* @since 2022-07-11
*/
@Data
@ApiModel(value = "Product对象", description = "产品 表")
public class Product implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("产品 名")
private String name;
@ApiModelProperty("产品 编码")
private String code;
@ApiModelProperty("产品 规格")
private String specifications;
@ApiModelProperty("产品 图纸")
private String drawing;
@ApiModelProperty("描述")
private String descs;
@ApiModelProperty("产品类型id,关联product_type表")
private Long productTypeId;
@ApiModelProperty("单位 id，关联unit表")
private Long unitId;
@ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private String inspectionStage;
@ApiModelProperty("检验标准")
private String inspectionStandard;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty("创建人")
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
}

65
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFactoryRelation.java
View File

@ -1,65 +0,0 @@
package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 产品-工厂 关系表
* </p>
*
* @author why
* @since 2022-07-27
*/
@Data
@TableName("product_factory_relation")
@ApiModel(value = "ProductFactoryRelation对象", description = "产品-工厂 关系表")
public class ProductFactoryRelation implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("产品id,关联product表")
private Long productId;
@ApiModelProperty("工厂id,关联 factory 表")
private Long factoryId;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty("创建人")
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
}

34
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeatures.java
View File

@ -2,6 +2,7 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -23,16 +24,16 @@ public class ProductFeatures implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty("量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@ApiModelProperty("单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@ApiModelProperty("产品特性 名")
private String name;
@ -41,10 +42,10 @@ public class ProductFeatures implements Serializable {
private String code;
@ApiModelProperty("产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@ApiModelProperty("缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@ApiModelProperty("产品特性 规格")
private String specifications;
@ -59,22 +60,25 @@ public class ProductFeatures implements Serializable {
private Float usl;
@ApiModelProperty("工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@ApiModelProperty("分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty("是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@ApiModelProperty("样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@ApiModelProperty("采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty("小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@ApiModelProperty("目标cpk")
private Float targetCpk;
@ -86,10 +90,10 @@ public class ProductFeatures implements Serializable {
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -98,7 +102,7 @@ public class ProductFeatures implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -107,7 +111,7 @@ public class ProductFeatures implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

36
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductFeaturesHis.java
View File

@ -2,6 +2,7 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -23,13 +24,13 @@ public class ProductFeaturesHis implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("产品特性id,关联product_features表")
private Long productFeaturesId;
private BigDecimal productFeaturesId;
@ApiModelProperty("产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty("产品特性 名")
private String name;
@ -38,16 +39,16 @@ public class ProductFeaturesHis implements Serializable {
private String code;
@ApiModelProperty("产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@ApiModelProperty("缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@ApiModelProperty("量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@ApiModelProperty("单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@ApiModelProperty("产品特性 规格")
private String specifications;
@ -62,22 +63,25 @@ public class ProductFeaturesHis implements Serializable {
private Float usl;
@ApiModelProperty("工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty("是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@ApiModelProperty("分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@ApiModelProperty("样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@ApiModelProperty("采样频率，只用于展示")
private String samplingFrequency;
@ApiModelProperty("小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@ApiModelProperty("目标cpk")
private Float targetCpk;
@ -89,10 +93,10 @@ public class ProductFeaturesHis implements Serializable {
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -101,7 +105,7 @@ public class ProductFeaturesHis implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -110,7 +114,7 @@ public class ProductFeaturesHis implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductType.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -24,7 +25,7 @@ public class ProductType implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("产品类型 名")
private String name;
@ -36,16 +37,16 @@ public class ProductType implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -54,7 +55,7 @@ public class ProductType implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -63,7 +64,7 @@ public class ProductType implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

23
ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java
View File

@ -2,10 +2,10 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
/**
@ -24,28 +24,31 @@ public class ProductWorkingprocedureRelation implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("产品id,关联product表")
private Long productId;
private BigDecimal productId;
@ApiModelProperty("工序id,关联 working_procedure 表")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@ApiModelProperty("顺序，工序是有先后顺序的。")
private Integer order;
private BigDecimal order;
@ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -54,7 +57,7 @@ public class ProductWorkingprocedureRelation implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -63,7 +66,7 @@ public class ProductWorkingprocedureRelation implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Shift.java
View File

@ -1,6 +1,7 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +22,7 @@ public class Shift implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("班次 名")
private String name;
@ -33,16 +34,16 @@ public class Shift implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -51,7 +52,7 @@ public class Shift implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -60,7 +61,7 @@ public class Shift implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/Team.java
View File

@ -1,6 +1,7 @@
package com.cnbm.basic.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -21,7 +22,7 @@ public class Team implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("班组 名")
private String name;
@ -33,16 +34,16 @@ public class Team implements Serializable {
private String descs;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -51,7 +52,7 @@ public class Team implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -60,7 +61,7 @@ public class Team implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/Unit.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -22,7 +23,7 @@ public class Unit implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("单位 名")
private String name;
@ -31,19 +32,19 @@ public class Unit implements Serializable {
private String code;
@ApiModelProperty("单位类型，1 可计数，2 不可计数")
private Integer type;
private BigDecimal type;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -52,7 +53,7 @@ public class Unit implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -61,7 +62,7 @@ public class Unit implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/entity/WorkingProcedure.java
View File

@ -2,6 +2,7 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -23,7 +24,7 @@ public class WorkingProcedure implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("工序 名")
private String name;
@ -32,22 +33,22 @@ public class WorkingProcedure implements Serializable {
private String code;
@ApiModelProperty("工序类型 id,关联working_procedure_type表")
private Long workingProcedureTypeId;
private BigDecimal workingProcedureTypeId;
@ApiModelProperty("机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
private String machineId;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -56,7 +57,7 @@ public class WorkingProcedure implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -65,7 +66,7 @@ public class WorkingProcedure implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/entity/WorkingProcedureType.java
View File

@ -2,6 +2,7 @@ package com.cnbm.basic.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -23,7 +24,7 @@ public class WorkingProcedureType implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
private BigDecimal id;
@ApiModelProperty("工序类型 名")
private String name;
@ -32,16 +33,16 @@ public class WorkingProcedureType implements Serializable {
private String code;
@ApiModelProperty("1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@ApiModelProperty("创建人")
private Long creatorId;
private BigDecimal creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ -50,7 +51,7 @@ public class WorkingProcedureType implements Serializable {
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
private BigDecimal updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ -59,7 +60,7 @@ public class WorkingProcedureType implements Serializable {
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java
View File

@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
@ -16,7 +17,7 @@ import java.util.Date;
@Data
public class FactoryExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "工厂 名")
private String name;
@Excel(name = "工厂 编码")
@ -28,24 +29,24 @@ public class FactoryExcel {
@Excel(name = "工厂类型，1-内部工厂；2-供应商")
private String type;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

17
ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 机台表
@ -14,32 +17,32 @@ import java.time.LocalDateTime;
@Data
public class MachineExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "机台名")
private String name;
@Excel(name = "机台编码")
private String code;
@Excel(name = "机台id，关联platform id")
private Long platformId;
private BigDecimal platformId;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/MeasureToolExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 量具表
@ -14,7 +17,7 @@ import java.time.LocalDateTime;
@Data
public class MeasureToolExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "量具 名")
private String name;
@Excel(name = "量具 编码")
@ -22,24 +25,24 @@ public class MeasureToolExcel {
@Excel(name = "量具类型；计量型=1 计数型=2")
private String type;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

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

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 站点表
@ -14,7 +17,7 @@ import java.time.LocalDateTime;
@Data
public class PlatformExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "站台名")
private String name;
@Excel(name = "站台编码")
@ -22,24 +25,24 @@ public class PlatformExcel {
@Excel(name = "站台分组")
private String group;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

57
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductExcel.java
View File

@ -1,57 +0,0 @@
package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
@Data
public class ProductExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "产品 名")
private String name;
@Excel(name = "产品 编码")
private String code;
@Excel(name = "产品 规格")
private String specifications;
@Excel(name = "产品 图纸")
private String drawing;
@Excel(name = "描述")
private String descs;
@Excel(name = "产品类型id,关联product_type表")
private Long productTypeId;
@Excel(name = "单位 id，关联unit表")
private Long unitId;
@Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;; 如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private String inspectionStage;
@Excel(name = "检验标准")
private String inspectionStandard;
@Excel(name = "1 可用，0 不可用")
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

43
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFactoryRelationExcel.java
View File

@ -1,43 +0,0 @@
package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
@Data
public class ProductFactoryRelationExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "产品id,关联product表")
private Long productId;
@Excel(name = "工厂id,关联 factory 表")
private Long factoryId;
@Excel(name = "1 可用，0 不可用")
private Integer status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

35
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 产品特性 表
@ -14,21 +17,21 @@ import java.time.LocalDateTime;
@Data
public class ProductFeaturesExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@Excel(name = "量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@Excel(name = "单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@Excel(name = "产品特性 名")
private String name;
@Excel(name = "产品特性 编码")
private String code;
@Excel(name = "产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@Excel(name = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@Excel(name = "产品特性 规格")
private String specifications;
@Excel(name = "检验参数 规格下线")
@ -38,17 +41,19 @@ public class ProductFeaturesExcel {
@Excel(name = "检验参数 规格上线")
private Float usl;
@Excel(name = "工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@Excel(name = "分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@Excel(name = "是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@Excel(name = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@Excel(name = "采样频率，只用于展示")
private String samplingFrequency;
@Excel(name = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@Excel(name = "目标cpk")
private Float targetCpk;
@Excel(name = "目标cpk")
@ -56,20 +61,20 @@ public class ProductFeaturesExcel {
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

37
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductFeaturesHisExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 产品特性 历史表
@ -14,23 +17,23 @@ import java.time.LocalDateTime;
@Data
public class ProductFeaturesHisExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "产品特性id,关联product_features表")
private Long productFeaturesId;
private BigDecimal productFeaturesId;
@Excel(name = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@Excel(name = "产品特性 名")
private String name;
@Excel(name = "产品特性 编码")
private String code;
@Excel(name = "产品特性类型：1 计量型；2 计数型")
private Integer type;
private BigDecimal type;
@Excel(name = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
private Integer defectLevel;
private BigDecimal defectLevel;
@Excel(name = "量具id，关联measure_tool表")
private Long measureToolId;
private BigDecimal measureToolId;
@Excel(name = "单位 id，关联unit表")
private Long unitId;
private BigDecimal unitId;
@Excel(name = "产品特性 规格")
private String specifications;
@Excel(name = "检验参数 规格下线")
@ -40,17 +43,19 @@ public class ProductFeaturesHisExcel {
@Excel(name = "检验参数 规格上线")
private Float usl;
@Excel(name = "工序id，关联 working_procedure 表id")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@Excel(name = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@Excel(name = "是否需要spc分析，1 yes;0 no")
private Integer isSpc;
private BigDecimal isSpc;
@Excel(name = "分析图形，关联control_graph表id")
private Long controlGraphId;
private BigDecimal controlGraphId;
@Excel(name = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
private Integer sampleSize;
private BigDecimal sampleSize;
@Excel(name = "采样频率，只用于展示")
private String samplingFrequency;
@Excel(name = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
private Integer decimalPlaces;
private BigDecimal decimalPlaces;
@Excel(name = "目标cpk")
private Float targetCpk;
@Excel(name = "目标cpk")
@ -58,20 +63,20 @@ public class ProductFeaturesHisExcel {
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

13
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductTypeExcel.java
View File

@ -3,6 +3,7 @@ package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -14,7 +15,7 @@ import java.time.LocalDateTime;
@Data
public class ProductTypeExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "产品类型 名")
private String name;
@Excel(name = "产品类型 编码")
@ -22,24 +23,24 @@ public class ProductTypeExcel {
@Excel(name = "描述")
private String desc;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

23
ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序 表
@ -14,32 +17,34 @@ import java.time.LocalDateTime;
@Data
public class ProductWorkingprocedureRelationExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "产品id,关联product表")
private Long productId;
private BigDecimal productId;
@Excel(name = "工序id,关联 working_procedure 表")
private Long workingProcedureId;
private BigDecimal workingProcedureId;
@Excel(name = "顺序，工序是有先后顺序的。")
private Integer order;
private BigDecimal order;
@Excel(name = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
private BigDecimal inspectionStage;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/ShiftExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 班次 表
@ -14,7 +17,7 @@ import java.time.LocalDateTime;
@Data
public class ShiftExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "班次 名")
private String name;
@Excel(name = "班次 编码")
@ -22,24 +25,24 @@ public class ShiftExcel {
@Excel(name = "班次 描述")
private String descs;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/TeamExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 班组 表
@ -14,7 +17,7 @@ import java.time.LocalDateTime;
@Data
public class TeamExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "班组 名")
private String name;
@Excel(name = "班组 编码")
@ -22,24 +25,24 @@ public class TeamExcel {
@Excel(name = "班组 描述")
private String descs;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java
View File

@ -3,6 +3,7 @@ package com.cnbm.basic.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -14,32 +15,32 @@ import java.time.LocalDateTime;
@Data
public class UnitExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "单位 名")
private String name;
@Excel(name = "单位 编码")
private String code;
@Excel(name = "单位类型，1 可计数，2 不可计数")
private Integer type;
private BigDecimal type;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

17
ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序 表
@ -14,34 +17,34 @@ import java.time.LocalDateTime;
@Data
public class WorkingProcedureExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "工序 名")
private String name;
@Excel(name = "工序 编码")
private String code;
@Excel(name = "工序类型 id,关联working_procedure_type表")
private Long workingProcedureTypeId;
private BigDecimal workingProcedureTypeId;
@Excel(name = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
private String machineId;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

15
ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java
View File

@ -4,6 +4,9 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.Date;
/**
* 工序类型表 表
@ -14,30 +17,30 @@ import java.time.LocalDateTime;
@Data
public class WorkingProcedureTypeExcel {
@Excel(name = "ID")
private Long id;
private BigDecimal id;
@Excel(name = "工序类型 名")
private String name;
@Excel(name = "工序类型 编码")
private String code;
@Excel(name = "1 可用，0 不可用")
private Integer status;
private BigDecimal status;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
private BigDecimal valid;
@Excel(name = "创建人")
private Long creatorId;
private BigDecimal creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
private BigDecimal updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
private BigDecimal version;
}

16
ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductFactoryRelationMapper.java
View File

@ -1,16 +0,0 @@
package com.cnbm.basic.mapper;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.basic.entity.ProductFactoryRelation;
import org.apache.ibatis.annotations.Mapper;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
@Mapper
public interface ProductFactoryRelationMapper extends BaseDao<ProductFactoryRelation> {
}

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

@ -1,21 +0,0 @@
package com.cnbm.basic.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.basic.entity.Product;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
@Mapper
public interface ProductMapper extends BaseDao<Product> {
IPage<ProductDTO> page(Map<String, Object> params);
}

28
ym-baisc/src/main/java/com/cnbm/basic/service/IProductFactoryRelationService.java
View File

@ -1,28 +0,0 @@
package com.cnbm.basic.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.ProductFactoryRelationDTO;
import com.cnbm.basic.entity.ProductFactoryRelation;
import java.util.Map;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
public interface IProductFactoryRelationService extends CrudService<ProductFactoryRelation, ProductFactoryRelationDTO> {
PageData<ProductFactoryRelationDTO> page (Map<String, Object> params);
ProductFactoryRelationDTO get(Long id);
void save(ProductFactoryRelationDTO dto);
void update(ProductFactoryRelationDTO dto);
void delete(Long[] ids);
}

27
ym-baisc/src/main/java/com/cnbm/basic/service/IProductService.java
View File

@ -1,27 +0,0 @@
package com.cnbm.basic.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.entity.Product;
import java.util.Map;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
public interface IProductService extends CrudService<Product, ProductDTO> {
PageData<ProductDTO> page (Map<String, Object> params);
ProductDTO get(Long id);
void save(ProductDTO dto);
void update(ProductDTO dto);
void changeStatus(Long id);
}

6
ym-baisc/src/main/java/com/cnbm/basic/service/IProductWorkingprocedureRelationService.java
View File

@ -1,12 +1,10 @@
package com.cnbm.basic.service;
import com.cnbm.basic.dto.WorkingProcedureDTO;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
import java.util.List;
import java.util.Map;
/**
@ -25,8 +23,4 @@ public interface IProductWorkingprocedureRelationService extends CrudService<Pro
void update(ProductWorkingprocedureRelationDTO dto);
void delete(Long[] ids);
List<ProductWorkingprocedureRelationDTO> getWorkingprocedureByProductId(Long productId);
void batchInsertWorkingprocedure(ProductWorkingprocedureRelationDTO[] lists);
}

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

@ -5,7 +5,6 @@ import com.cnbm.common.service.CrudService;
import com.cnbm.basic.dto.WorkingProcedureDTO;
import com.cnbm.basic.entity.WorkingProcedure;
import java.util.List;
import java.util.Map;
/**
@ -26,6 +25,4 @@ public interface IWorkingProcedureService extends CrudService<WorkingProcedure,
void delete(Long[] ids);
void changeStatus(Long id);
List<WorkingProcedureDTO> getWorkingProcedureByProductId(Long productId);
}

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

@ -85,8 +85,9 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
Factory entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

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

@ -87,8 +87,9 @@ public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine,
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
Machine entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

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

@ -73,8 +73,9 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
MeasureTool entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

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

@ -77,8 +77,9 @@ public class PlatformServiceImpl extends CrudServiceImpl<PlatformMapper, Platfor
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
Platform entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

74
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java
View File

@ -1,74 +0,0 @@
package com.cnbm.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.ProductFactoryRelationDTO;
import com.cnbm.basic.mapper.ProductFactoryRelationMapper;
import com.cnbm.basic.entity.ProductFactoryRelation;
import com.cnbm.basic.service.IProductFactoryRelationService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Map;
/**
* 产品-工厂 关系表
*
* @author why
* @since 2022-07-27
*/
@Service
public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFactoryRelationMapper, ProductFactoryRelation, ProductFactoryRelationDTO> implements IProductFactoryRelationService {
@Override
public QueryWrapper<ProductFactoryRelation> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
QueryWrapper<ProductFactoryRelation> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
return wrapper;
}
@Override
public PageData<ProductFactoryRelationDTO> page (Map<String, Object> params){
IPage<ProductFactoryRelation> page = baseDao.selectPage(
getPage(params, "id", true),
getWrapper(params)
);
return getPageData(page, ProductFactoryRelationDTO.class);
}
@Override
public ProductFactoryRelationDTO get(Long id) {
ProductFactoryRelation entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ProductFactoryRelationDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ProductFactoryRelationDTO dto) {
ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductFactoryRelationDTO dto) {
ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(Long[] ids) {
//删除
deleteBatchIds(Arrays.asList(ids));
}
}

14
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java
View File

@ -2,8 +2,6 @@ package com.cnbm.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.basic.dto.ProductFeaturesHisDTO;
import com.cnbm.basic.entity.ProductFeaturesHis;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.ProductFeaturesDTO;
@ -12,7 +10,6 @@ import com.cnbm.basic.entity.ProductFeatures;
import com.cnbm.basic.service.IProductFeaturesService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -59,22 +56,11 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
insert(entity);
}
@Autowired
private ProductFeaturesHisServiceImpl productFeaturesHisServiceImpl;
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductFeaturesDTO dto) {
//当产品特性出现update的时候，就会把旧数据 全量备份到这张表
ProductFeatures oentity = baseDao.selectById(dto.getId());
ProductFeaturesHisDTO history = ConvertUtils.sourceToTarget(oentity, ProductFeaturesHisDTO.class);
history.setProductFeaturesId(oentity.getId());
history.setId(null);
productFeaturesHisServiceImpl.save(history);
//更新
ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
updateById(entity);
}
}

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

@ -1,101 +0,0 @@
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.cnbm.basic.entity.ProductType;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.ProductDTO;
import com.cnbm.basic.mapper.ProductMapper;
import com.cnbm.basic.entity.Product;
import com.cnbm.basic.service.IProductService;
import com.cnbm.common.utils.ConvertUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Map;
/**
* 产品 表
*
* @author why
* @since 2022-07-11
*/
@Service
public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product, ProductDTO> implements IProductService {
//@Autowired
//ProductMapper mapper;
@Override
public QueryWrapper<Product> getWrapper(Map<String, Object> params){
String name = (String)params.get("name");
String code = (String)params.get("code");
//检验阶段
String inspection_stage = (String)params.get("inspection_stage");
QueryWrapper<Product> wrapper = new QueryWrapper<>();
wrapper.like(StringUtils.isNotBlank(name), "name", name);
wrapper.like(StringUtils.isNotBlank(code), "code", code);
wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
wrapper.eq(ObjectUtils.isNotNull(params.get("product_type_id")), "product_type_id", params.get("product_type_id"));
wrapper.eq(StringUtils.isNotBlank(inspection_stage), "inspection_stage", inspection_stage);
return wrapper;
}
@Autowired
private ProductTypeServiceImpl productTypeService;
@Override
public PageData<ProductDTO> page (Map<String, Object> params){
//IPage<ProductDTO> page = mapper.page(params);
//return getPageData(page, ProductDTO.class);
IPage<Product> page = baseDao.selectPage(
getPage(params, "id", true),
getWrapper(params)
);
PageData<ProductDTO> productDTOPageData = getPageData(page,ProductDTO.class);
if(productDTOPageData.getTotal()!=0){
for(ProductDTO productDTO:productDTOPageData.getList()){
String productType = productTypeService.selectById(productDTO.getProductTypeId()).getName();
productDTO.setProductType(productType);
}
}
return productDTOPageData;
}
@Override
public ProductDTO get(Long id) {
Product entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ProductDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ProductDTO dto) {
Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductDTO dto) {
Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
Product entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
updateById(entity);
}
}

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

@ -94,8 +94,9 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
ProductType entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

43
ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java
View File

@ -2,10 +2,6 @@ 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.cnbm.basic.dto.WorkingProcedureDTO;
import com.cnbm.basic.entity.WorkingProcedure;
import com.cnbm.basic.mapper.ProductMapper;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
@ -13,16 +9,10 @@ import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper;
import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
import com.cnbm.basic.service.IProductWorkingprocedureRelationService;
import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@ -73,37 +63,4 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(Long[] ids) {
//删除
deleteBatchIds(Arrays.asList(ids));
}
@Autowired
private WorkingProcedureServiceImpl workingProcedureServiceImpl;
@Override
public List<ProductWorkingprocedureRelationDTO> getWorkingprocedureByProductId(Long productId){
QueryWrapper<ProductWorkingprocedureRelation> wrapper = new QueryWrapper<>();
wrapper.eq(ObjectUtils.isNotNull(productId), "product_id", productId);
List<ProductWorkingprocedureRelation> relationList = baseDao.selectList(wrapper);
List<ProductWorkingprocedureRelationDTO> dtoList = ConvertUtils.sourceToTarget(relationList, ProductWorkingprocedureRelationDTO.class);
//设置工序名称
for (ProductWorkingprocedureRelationDTO dto:dtoList){
String workingProcedureName = workingProcedureServiceImpl.selectById(dto.getWorkingProcedureId()).getName();
dto.setWorkingProcedureName(workingProcedureName);
}
return dtoList;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void batchInsertWorkingprocedure(ProductWorkingprocedureRelationDTO[] lists) {
for(ProductWorkingprocedureRelationDTO dto:lists){
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
save(dto);
}
}
}

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

@ -68,8 +68,9 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
Unit entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}
}

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

@ -3,8 +3,8 @@ 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.cnbm.basic.entity.ProductWorkingprocedureRelation;
import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper;
import com.cnbm.basic.entity.Machine;
import com.cnbm.basic.entity.ProductType;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.basic.dto.WorkingProcedureDTO;
@ -63,7 +63,6 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
//工序类型 id,关联working_procedure_type表
String workingProcedureTypeName = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()).getName();
workingProcedureDTO.setWorkingProcedureTypeName(workingProcedureTypeName);
//机台
if(StringUtils.isNotBlank(workingProcedureDTO.getMachineId())){
String[] machineIdList = workingProcedureDTO.getMachineId().split(",");
ArrayList<String> machineList = new ArrayList<>();
@ -113,26 +112,10 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
WorkingProcedure entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}
@Autowired
private ProductWorkingprocedureRelationMapper mapper;
@Override
public List<WorkingProcedureDTO> getWorkingProcedureByProductId(Long productId){
QueryWrapper<ProductWorkingprocedureRelation> wrapper = new QueryWrapper<>();
wrapper.eq(ObjectUtils.isNotNull(productId), "product_id", productId);
List<ProductWorkingprocedureRelation> productWorkingprocedureRelationList = mapper.selectList(wrapper);
List<WorkingProcedureDTO> workingProcedureDTOList = new ArrayList<>();
for (ProductWorkingprocedureRelation productWorkingprocedureRelation:productWorkingprocedureRelationList){
WorkingProcedureDTO workingProcedureDTO = get(productWorkingprocedureRelation.getWorkingProcedureId());
workingProcedureDTOList.add(workingProcedureDTO);
}
return workingProcedureDTOList;
}
}

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

@ -77,8 +77,9 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
public void changeStatus(Long id) {
//改变状态 开启1 关闭0
WorkingProcedureType entity = baseDao.selectById(id);
Integer status = 1 - entity.getStatus();
entity.setStatus(status);
BigDecimal status = entity.getStatus();
BigDecimal one = new BigDecimal("1");
entity.setStatus(one.subtract(status));
updateById(entity);
}

5
ym-baisc/src/main/resources/ProductFactoryRelationMapper.xml
View File

@ -1,5 +0,0 @@
<?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.ProductFactoryRelationMapper">
</mapper>

5
ym-baisc/src/main/resources/ProductMapper.xml
View File

@ -1,5 +0,0 @@
<?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.ProductMapper">
</mapper>

5
ym-baisc/src/main/resources/WorkingProcedureMapper.xml
View File

@ -1,5 +0,0 @@
<?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.WorkingProcedureMapper">
</mapper>

20
ym-common/src/main/java/com/cnbm/common/spc/math/Math.java
View File

@ -2,7 +2,6 @@ package com.cnbm.common.spc.math;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.List;
public class Math {
@ -18,7 +17,7 @@ public class Math {
// }
//8.1 10.6 9.8 9.0 9.4 9.3 10.2 11.7
Double[] d = new Double[8];
double[] d = new double[8];
d[0] = new Double(8.1) ;
d[1] = new Double(10.6);
d[2] = new Double(9.8);
@ -33,12 +32,12 @@ public class Math {
}
//平均值
public static double getMean(Double...numbers) {
public static double getMean(double...numbers) {
return format(getSum(numbers) / numbers.length);
}
//极差
public static double range(Double[] in) {
public static double range(double[] in) {
if (in == null) {
throw new NumberFormatException();
}
@ -52,14 +51,14 @@ public class Math {
//return Mutil.subtract(max, min);
}
public static double format(Double value) {
public static double format(double value) {
DecimalFormat df = new DecimalFormat("0.00");//创建一个df对象，传入0.00表示构造一个保留小数点后两位的df对象
df.setRoundingMode(RoundingMode.HALF_UP);//设置规则，这里采用的也是四舍五入规则
return Double.parseDouble(df.format(value));//返回value（在返回之前使用df对象的格式化方法将数据格式化）
}
//方差s^2=[(x1-x)^2 +...(xn-x)^2]/n 或者s^2=[(x1-x)^2 +...(xn-x)^2]/(n-1)
public static double Variance(Double[] x) {
public static double Variance(double[] x) {
int m=x.length;
double sum=0;
for(int i=0;i<m;i++){//求和
@ -73,10 +72,8 @@ public class Math {
return format(dVar/m);
}
//标准差σ=sqrt(s^2)
public static StandardDiviation StandardDiviation(Double[] x) {
public static double StandardDiviation(double[] x) {
int m=x.length;
double sum=0;
for(int i=0;i<m;i++){//求和
@ -87,12 +84,13 @@ public class Math {
for(int i=0;i<m;i++){//求方差
dVar+=(x[i]-dAve)*(x[i]-dAve);
}
return new StandardDiviation(format(java.lang.Math.sqrt(dVar/(m-1))),format(java.lang.Math.sqrt(dVar/(m))));
return format(java.lang.Math.sqrt(dVar/(m-1)));
//return Math.sqrt(dVar/m);
}
//前n项和
public static double getSum(Double...numbers) {
public static double getSum(double...numbers) {
double sum = 0.0;
for (double i : numbers) {

21
ym-common/src/main/java/com/cnbm/common/spc/math/StandardDiviation.java
View File

@ -1,21 +0,0 @@
package com.cnbm.common.spc.math;
import lombok.Data;
/**
* @Desc: ""
* @Author: caixiang
* @DATE: 2022/7/25 15:23
*/
@Data
public class StandardDiviation {
//标准差
private Double normal;
//总体标准差
private Double totality;
public StandardDiviation(Double normal, Double totality) {
this.normal = normal;
this.totality = totality;
}
}

105
ym-common/src/main/java/com/cnbm/common/vo/ApiErrorCode.java
View File

@ -1,105 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
/**
* REST API 错误码
*
* @author jiff
* @date 2018/11/1
* @since 1.0
*/
public enum ApiErrorCode implements IErrorCode {
/**
* 成功
*/
SUCCESSFUL(CODE_SUCCESSFUL, "成功"),
/**
* 失败
*/
FAILED(CODE_FAILED, "失败"),
/**
* 无效的请求参数
*/
//INVALID_PARAMETER(CODE_INVALID_PARAMETER, "无效的请求参数"),
INVALID_PARAMETER(CODE_INVALID_PARAMETER, "Invalid request parameter"),
/**
* 数据未授权
*/
FORBIDDEN_DATA(CODE_FORBIDDEN_DATA, "数据未授权"),
/**
* 用户已存在
*/
USER_EXISTENT(CODE_USER_EXISTENT, "用户已存在"),
/**
* 用户不存在
*/
//USER_NON_EXISTENT(CODE_USER_NON_EXISTENT, "用户不存在"),
USER_NON_EXISTENT(CODE_USER_NON_EXISTENT, "User does not exist"),
/**
* 用户已停用
*/
USER_DISABLED(CODE_FAILED, "用户已停用"),
/**
* 用户不存在或密码错误
*/
USER_NON_EXISTENT_OR_INVALID_PASSWORD(CODE_FAILED, "The user does not exist or the password is wrong"),
//USER_NON_EXISTENT_OR_INVALID_PASSWORD(CODE_FAILED, "用户不存在或密码错误"),
/**
* 密码错误
*/
//INVALID_PASSWORD(CODE_FAILED, "密码错误"),
INVALID_PASSWORD(CODE_FAILED, "Wrong password"),
/**
* 电话号码不能为空
*/
MOBILE_IS_EMPTY(CODE_FAILED, "手机号码不能为空"),
/**
* 用户未登录
*/
UNAUTHORIZED(CODE_UNAUTHORIZED, "用户未登录"),
/**
* 用户未授权
*/
FORBIDDEN(CODE_FORBIDDEN, "用户未授权");
private final int code;
private final String msg;
ApiErrorCode(final int code, final String msg) {
this.code = code;
this.msg = msg;
}
public static ApiErrorCode fromCode(int code) {
ApiErrorCode[] apiErrorCodes = ApiErrorCode.values();
for (ApiErrorCode apiErrorCode : apiErrorCodes) {
if (apiErrorCode.getCode() == code) {
return apiErrorCode;
}
}
return SUCCESSFUL;
}
@Override
public int getCode() {
return code;
}
@Override
public String getMsg() {
return msg;
}
@Override
public String toString() {
return String.format(" ErrorCode:{code=%s, msg=%s} ", code, msg);
}
}

78
ym-common/src/main/java/com/cnbm/common/vo/CommonVo.java
View File

@ -1,78 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
/**
* 公共视图对象
*
* @author jiff
* @date 2018/11/9
* @since 1.0
*/
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Data
@ApiModel("公共视图对象")
public class CommonVo {
/**
* 启用状态:0 、停用，1、启用
*/
@ApiModelProperty(value = "启用状态:0 、停用，1、启用", example = "1", position = Integer.MAX_VALUE - 1)
private Integer enabled;
/**
* 备注
*/
@ApiModelProperty(value = "备注", position = Integer.MAX_VALUE - 1)
private String remark;
/**
* 创建人
*/
@ApiModelProperty(value = "创建人", example = "1", position = Integer.MAX_VALUE)
private Long creatorId;
/**
* 创建人姓名
*/
@ApiModelProperty(value = "创建人姓名", example = "ulabcare", position = Integer.MAX_VALUE)
private String creatorName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", position = Integer.MAX_VALUE)
private LocalDateTime createTime;
/**
* 更新人
*/
@ApiModelProperty(value = "更新人", example = "1", position = Integer.MAX_VALUE)
private Long updaterId;
/**
* 更新人姓名
*/
@ApiModelProperty(value = "更新人姓名", example = "ulabcare", position = Integer.MAX_VALUE)
private String updaterName;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", position = Integer.MAX_VALUE)
private LocalDateTime updateTime;
}

24
ym-common/src/main/java/com/cnbm/common/vo/DictDataVo.java
View File

@ -1,24 +0,0 @@
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
*
* </P>
*
* @author FanYi
* @date 2020/7/6
* @since 1.0
*/
@ApiModel("字典值对象")
@Data
public class DictDataVo {
@ApiModelProperty("字典编码")
private String code;
@ApiModelProperty("字典名称")
private String name;
}

63
ym-common/src/main/java/com/cnbm/common/vo/IErrorCode.java
View File

@ -1,63 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
/**
* api错误码定义
*
* @author jiff
* @date 2018/11/1
* @since 1.0
*/
public interface IErrorCode {
/**
* 成功
*/
int CODE_SUCCESSFUL = 0;
/**
* 失败
*/
int CODE_FAILED = 1;
/**
* 无效的请求参数
*/
int CODE_INVALID_PARAMETER = 2;
/**
* 数据未授权
*/
int CODE_FORBIDDEN_DATA = 9;
/**
* 用户已存在
*/
int CODE_USER_EXISTENT = 10;
/**
* 用户不存在
*/
int CODE_USER_NON_EXISTENT = 11;
/**
* 用户未登录
*/
int CODE_UNAUTHORIZED = 401;
/**
* 用户未授权
*/
int CODE_FORBIDDEN = 403;
/**
* 错误编码：0、成功 否则失败
*
* @return 错误码：0、成功 否则失败
*/
int getCode();
/**
* 错误描述
*
* @return 错误描述
*/
String getMsg();
}

33
ym-common/src/main/java/com/cnbm/common/vo/IdListVo.java
View File

@ -1,33 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* 主键列表对象
*
* @author jiff
* @date 2018/11/14
* @since 1.0
*/
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Data
@Builder
@ApiModel("主键列表视图对象")
public class IdListVo {
@ApiModelProperty(value = "主键列表", required = true, example = "[1]", notes = "根据实际接口返回不同对象的主键列表")
private List<Long> ids;
}

32
ym-common/src/main/java/com/cnbm/common/vo/IdVo.java
View File

@ -1,32 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 主键对象
*
* @author jiff
* @date 2018/11/7
* @since 1.0
*/
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@Data
@Builder
@ApiModel("主键视图对象")
public class IdVo {
@ApiModelProperty(value = "主键", required = true, example = "1", notes = "根据实际接口返回不同对象的主键")
private Long id;
}

102
ym-common/src/main/java/com/cnbm/common/vo/R.java
View File

@ -1,102 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* 处理结果类
*
* @param <T> 返回的数据类型
* @author jiff
* @date 2018/11/7
* @since 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel("处理结果类")
@Accessors
public class R<T> implements Serializable {
@NonNull
@ApiModelProperty(value = "结果码", example = "0")
private int code = IErrorCode.CODE_SUCCESSFUL;
@ApiModelProperty(value = "结果说明", example = "成功")
private String msg;
@ApiModelProperty(value = "业务数据")
private T data;
public R<T> code(int code) {
this.code = code;
return this;
}
public R<T> msg(String msg) {
this.msg = msg;
return this;
}
public R<T> data(T data) {
this.data = data;
return this;
}
public boolean ok() {
return code == IErrorCode.CODE_SUCCESSFUL;
}
public static <T> R<T> failed() {
return failed("系统错误！");
}
public static <T> R<T> failed(String msg) {
return failed(ApiErrorCode.FAILED.getCode(), msg);
}
public static <T> R<T> failed(int code, String msg) {
return failed(code, msg, null);
}
public static <T> R<T> failed(int code, String msg, T data) {
return r(code == ApiErrorCode.SUCCESSFUL.getCode() ? ApiErrorCode.FAILED.getCode() : code, msg, data);
}
public static <T> R<T> failed(IErrorCode errorCode) {
return r(errorCode, null);
}
public static <T> R<T> r(IErrorCode errorCode, T data) {
return r(errorCode.getCode(), errorCode.getMsg(), data);
}
public static <T> R<T> r(int code, String msg, T data) {
return new R<T>().code(code).msg(msg).data(data);
}
public static <T> R<T> unauthorized() {
return failed(ApiErrorCode.UNAUTHORIZED);
}
public static <T> R<T> forbidden() {
return failed(ApiErrorCode.FORBIDDEN);
}
public static <T> R<T> ok(T data) {
return new R<T>().data(data);
}
public static <T> R<T> ok(String msg, T data) {
return new R<T>().msg(msg).data(data);
}
}

26
ym-common/src/main/java/com/cnbm/common/vo/SelectVo.java
View File

@ -1,26 +0,0 @@
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </P>
*
* @author FanYi
* @date 2020/7/6
* @since 1.0
*/
@ApiModel("下拉选择列表对象")
@Data
public class SelectVo {
@ApiModelProperty("key值，用于传给后端")
private Object k;
@ApiModelProperty("value值，用于前端显示")
private Object v;
}

26
ym-common/src/main/java/com/cnbm/common/vo/SmsSignCodeVo.java
View File

@ -1,26 +0,0 @@
package com.cnbm.common.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
*
* </P>
*
* @author FanYi
* @date 2020/4/28
* @since 1.0
*/
@Data
public class SmsSignCodeVo {
private Long sceneId;
private String signName;
private String templateCode;
private Integer templateType;
private String templateContent;
}

30
ym-common/src/main/java/com/cnbm/common/vo/WhetherVo.java
View File

@ -1,30 +0,0 @@
/*
* Copyright (c) 2018.
* http://www.ulabcare.com
*/
package com.cnbm.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 是否对象
*
* @author jiff
* @date 2018/11/11
* @since 1.0
*/
@Data
@Accessors(chain = true)
@Builder
@ApiModel("是否对象")
public class WhetherVo {
@ApiModelProperty(value = "是否：true、是，false、否", required = true, example = "true")
private Boolean whether;
}

6
ym-gateway/pom.xml
View File

@ -42,12 +42,6 @@
<artifactId>ym-quality-planning</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.cnbm</groupId>
<artifactId>ym-process-inspection</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-actuator-autoconfigure</artifactId>-->

16
ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java
View File

@ -128,22 +128,6 @@ public class SwaggerConfig {
.securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
}
@Bean
public Docket processInspectionApi() {
return new Docket(DocumentationType.SWAGGER_2)
.groupName("ym-process-inspection")
.apiInfo(apiInfos("过程检验", "过程检验模块"))
.useDefaultResponseMessages(true)
.forCodeGeneration(false)
.select()
.apis(RequestHandlerSelectors.basePackage("com.cnbm.processInspection"))
.paths(PathSelectors.any())
.build()
.securityContexts(Arrays.asList(securityContext()))
// ApiKey的name需与SecurityReference的reference保持一致
.securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
}
/**
* 创建该API的基本信息（这些基本信息会展现在文档页面中）
* 访问地址：http://ip:port/swagger-ui.html

2
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
View File

@ -27,7 +27,7 @@ public class CodeGenerator {
@Test
public void test(){
mybatisPlusGenerator(new String[]{"product_features"});
mybatisPlusGenerator(new String[]{"product_type"});
}
public static void mybatisPlusGenerator(String[] include){

76
ym-influx/src/main/java/com/cnbm/influx/Main.java
View File

@ -2,7 +2,6 @@ package com.cnbm.influx;
import com.cnbm.influx.config.InfluxClient;
import com.cnbm.influx.param.QueryDataParam;
import com.cnbm.influx.param.PageInfo;
import com.cnbm.influx.param.Range;
import com.cnbm.influx.param.Tag;
@ -49,23 +48,23 @@ public class Main {
// InfluxClient.Client.insert(event,"ASProcessCompleteEvent");
// Point point = Point.measurement("ASProcessCompleteEvent")
// .addTag("transationId", "112311")
// .addTag("argName", "argName11")
// .addField("argValue", 3D)
// .time(Instant.now().toEpochMilli(), WritePrecision.MS);
//
//
// Point point2 = Point.measurement("ASProcessCompleteEvent")
// .addTag("transationId", "222312")
// .addTag("argName", "argName11")
// .addField("argValue", 4D)
// .time(Instant.now().toEpochMilli(), WritePrecision.MS);
// List<Point> list = new ArrayList<>();
// list.add(point);
// list.add(point2);
//
// writeApi.writePoints(list);
Point point = Point.measurement("ASProcessCompleteEvent")
.addTag("transationId", "112311")
.addTag("argName", "argName11")
.addField("argValue", 3D)
.time(Instant.now().toEpochMilli(), WritePrecision.MS);
Point point2 = Point.measurement("ASProcessCompleteEvent")
.addTag("transationId", "222312")
.addTag("argName", "argName11")
.addField("argValue", 4D)
.time(Instant.now().toEpochMilli(), WritePrecision.MS);
List<Point> list = new ArrayList<>();
list.add(point);
list.add(point2);
writeApi.writePoints(list);
//todo api.writeMeasurements(WritePrecision.NS, Arrays.asList(new H2OFeetMeasurement("coyote_creek", 15.0D, null, Instant.ofEpochSecond(0, 15)), new H2OFeetMeasurement("coyote_creek", 16.0D, null, Instant.ofEpochSecond(0, 16))));
// List<Event> events = new ArrayList<>();
@ -105,24 +104,23 @@ public class Main {
// }
String flux = "from(bucket:\"mytest\") |> range(start: -6000000000000000m)";
flux += "|> filter(fn: (r) =>\n" +
" r._measurement == \"ASProcessCompleteEvent\" and \n" +
// " r._field == \"type\" and \n" + //对应 Field key
" r.argName == \"arg3\"\n" + //对应 Tags key (Tag 信息无法在FluxRecord 里面获取。)
" )";
QueryApi queryApi = influxDBClient.getQueryApi();
List<FluxTable> tables = queryApi.query(flux);
for (FluxTable fluxTable : tables) {
List<FluxRecord> records = fluxTable.getRecords();
for (FluxRecord fluxRecord : records) {
Double o = (Double)fluxRecord.getValueByKey("_value");
System.out.println("time: "+fluxRecord.getTime() +" key:"+fluxRecord.getField()+" value: " + fluxRecord.getValueByKey("_value")+" measurement: " + fluxRecord.getMeasurement());
// System.out.println("time: "+fluxRecord.getTime() +" key:"++" value: " + fluxRecord.getValueByKey("_value")+" measurement: " + fluxRecord.getMeasurement());
}
}
// String flux = "from(bucket:\"mytest\") |> range(start: -60m)";
// flux += "|> filter(fn: (r) =>\n" +
// " r._measurement == \"ASProcessCompleteEvent\" and \n" +
//// " r._field == \"type\" and \n" + //对应 Field key
// " r.argName == \"arg3\"\n" + //对应 Tags key (Tag 信息无法在FluxRecord 里面获取。)
// " )";
// QueryApi queryApi = influxDBClient.getQueryApi();
//
// List<FluxTable> tables = queryApi.query(flux);
// for (FluxTable fluxTable : tables) {
// List<FluxRecord> records = fluxTable.getRecords();
// for (FluxRecord fluxRecord : records) {
// System.out.println("time: "+fluxRecord.getTime() +" key:"+fluxRecord.getField()+" value: " + fluxRecord.getValueByKey("_value")+" measurement: " + fluxRecord.getMeasurement());
//// System.out.println("time: "+fluxRecord.getTime() +" key:"++" value: " + fluxRecord.getValueByKey("_value")+" measurement: " + fluxRecord.getMeasurement());
//
// }
// }
// from(bucket: "mytest")
@ -182,7 +180,7 @@ public class Main {
private static List<FluxTable> query(QueryDataParam param,InfluxDBClient influxDBClient){
String measurement = param.getMeasurement();
List<String> dropedTagName = param.getDropedTagNames();
String dropedTagName = param.getDropedTagName();
Range range = param.getRange();
String bucket = param.getBucket();
String tagName = param.getTag().getTagName();
@ -193,9 +191,7 @@ public class Main {
flux += "|> range(start: "+range.getBegin().toString()+",stop:"+range.getEnd().toString()+") \n";
flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\") \n";
flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\") \n";
for(String dropName:dropedTagName){
flux += "|> drop(columns: [\""+ dropName +"\"]) \n";
}
flux += "|> drop(columns: [\""+dropedTagName+"\"]) \n";
flux += "|> sort(columns: [\"_time\"], desc: true) \n";
if(pageInfo!=null){
flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";

8
ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
View File

@ -78,7 +78,6 @@ public enum InfluxClient {
public void insert(Event event, String measurement){
Point point = Point.measurement(measurement)
.addTag("transationId", event.getTransationId())
.addTag("inspectionSheetId", event.getInspectionSheetId())
.addTag("argName", event.getArgName())
.addField("argValue", event.getArgValue())
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
@ -93,7 +92,6 @@ public enum InfluxClient {
for(Event event:events){
Point point = Point.measurement(measurement)
.addTag("transationId", event.getTransationId())
.addTag("inspectionSheetId", event.getInspectionSheetId())
.addTag("argName", event.getArgName())
.addField("argValue", event.getArgValue())
.time(event.getTime().toEpochMilli(), WritePrecision.MS);
@ -105,7 +103,7 @@ public enum InfluxClient {
public List<FluxTable> query(QueryDataParam param){
String measurement = param.getMeasurement();
List<String> dropedTagNames = param.getDropedTagNames();
String dropedTagName = param.getDropedTagName();
Range range = param.getRange();
String bucket = param.getBucket();
String tagName = param.getTag().getTagName();
@ -116,9 +114,7 @@ public enum InfluxClient {
flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")";
flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")";
flux += "|> filter(fn: (r) => r[\""+tagName+"\"] == \""+tagValue+"\")";
for(String dropName:dropedTagNames){
flux += "|> drop(columns: [\""+dropName+"\"])";
}
flux += "|> drop(columns: [\""+dropedTagName+"\"])";
flux += "|> sort(columns: [\"_time\"], desc: true)";
if(pageInfo!=null){
flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")";

Some files were not shown because too many files have changed in this diff Show More